From 715817c37264ef67b34ec98de7a9fc0b06aeadbc Mon Sep 17 00:00:00 2001
From: Jakub Raczek <jraczek@objectivity.co.uk>
Date: Tue, 9 Feb 2021 12:07:36 +0100
Subject: [PATCH] Renamed keyword  assert to Condition according to review

---
 .../uk/co/objectivity/test/db/DBTestCompare.java   |  7 ++++---
 .../beans/{AssertType.java => ConditionType.java}  |  2 +-
 .../co/objectivity/test/db/beans/xml/Compare.java  |  6 +++---
 .../db/beans/xml/{Assert.java => Condition.java}   | 14 +++++++-------
 4 files changed, 15 insertions(+), 14 deletions(-)
 rename src/main/java/uk/co/objectivity/test/db/beans/{AssertType.java => ConditionType.java} (99%)
 rename src/main/java/uk/co/objectivity/test/db/beans/xml/{Assert.java => Condition.java} (85%)

diff --git a/src/main/java/uk/co/objectivity/test/db/DBTestCompare.java b/src/main/java/uk/co/objectivity/test/db/DBTestCompare.java
index 9b3d061..47a23b4 100644
--- a/src/main/java/uk/co/objectivity/test/db/DBTestCompare.java
+++ b/src/main/java/uk/co/objectivity/test/db/DBTestCompare.java
@@ -44,6 +44,7 @@
 import uk.co.objectivity.test.db.beans.TestParams;
 import uk.co.objectivity.test.db.beans.TestResults;
 import uk.co.objectivity.test.db.beans.xml.Compare;
+import uk.co.objectivity.test.db.beans.xml.Condition;
 import uk.co.objectivity.test.db.utils.Printer;
 import uk.co.objectivity.test.db.utils.SavedTimes;
 import uk.co.objectivity.test.db.utils.TCMessages;
@@ -88,12 +89,12 @@ public void testSQLResults() {
 
             // assertions
             if (compare.getCompareMode() == CompareMode.NMB_OF_RESULTS) {
-                List<uk.co.objectivity.test.db.beans.xml.Assert> assertList = compare.getAssertions();
+                List<Condition> assertList = compare.getAssertions();
                 if (assertList != null) {
                     logInfo2All("Rows count:" + testResults.getNmbOfRows(), tcMsgs);
                     TestResults effFinalTR = testResults;
-                    assertList.forEach(a -> logInfo2All(a.getAssertType().name() + " " + a.getValue(), tcMsgs));
-                    assertList.forEach(a -> a.getAssertType().assertByType(effFinalTR.getNmbOfRows(), a.getValue()));
+                    assertList.forEach(a -> logInfo2All(a.getConditionType().name() + " " + a.getValue(), tcMsgs));
+                    assertList.forEach(a -> a.getConditionType().assertByType(effFinalTR.getNmbOfRows(), a.getValue()));
                     int p = getIndexByName(testParams.getTestName());
                     if (p >= 0) {
                         savedTimesList.get(p).setTestResult("Passed");
diff --git a/src/main/java/uk/co/objectivity/test/db/beans/AssertType.java b/src/main/java/uk/co/objectivity/test/db/beans/ConditionType.java
similarity index 99%
rename from src/main/java/uk/co/objectivity/test/db/beans/AssertType.java
rename to src/main/java/uk/co/objectivity/test/db/beans/ConditionType.java
index 38739d9..d48be2d 100644
--- a/src/main/java/uk/co/objectivity/test/db/beans/AssertType.java
+++ b/src/main/java/uk/co/objectivity/test/db/beans/ConditionType.java
@@ -25,7 +25,7 @@
 
 import org.testng.Assert;
 
-public enum AssertType {
+public enum ConditionType {
     EQ, NE, LT, LE, GE, GT;
 
     public void assertByType(Integer actual, Integer expected) throws AssertionError {
diff --git a/src/main/java/uk/co/objectivity/test/db/beans/xml/Compare.java b/src/main/java/uk/co/objectivity/test/db/beans/xml/Compare.java
index 99d818f..5eaf22e 100644
--- a/src/main/java/uk/co/objectivity/test/db/beans/xml/Compare.java
+++ b/src/main/java/uk/co/objectivity/test/db/beans/xml/Compare.java
@@ -69,7 +69,7 @@ public class Compare {
     private List<BeforeSqls> beforeSqls;
 
     @XmlElement(name = "assert")
-    private List<Assert> assertions;
+    private List<Condition> assertions;
 
     @XmlElement(name = "file")
     private File file;
@@ -150,11 +150,11 @@ public void setMinusQueryIndicatorOn(boolean minusQueryIndicatorOn) {
         this.minusQueryIndicatorOn = minusQueryIndicatorOn;
     }
 
-    public List<Assert> getAssertions() {
+    public List<Condition> getAssertions() {
         return assertions;
     }
 
-    public void setAssertions(List<Assert> assertions) {
+    public void setAssertions(List<Condition> assertions) {
         this.assertions = assertions;
     }
 
diff --git a/src/main/java/uk/co/objectivity/test/db/beans/xml/Assert.java b/src/main/java/uk/co/objectivity/test/db/beans/xml/Condition.java
similarity index 85%
rename from src/main/java/uk/co/objectivity/test/db/beans/xml/Assert.java
rename to src/main/java/uk/co/objectivity/test/db/beans/xml/Condition.java
index 2d8e831..f2607ea 100644
--- a/src/main/java/uk/co/objectivity/test/db/beans/xml/Assert.java
+++ b/src/main/java/uk/co/objectivity/test/db/beans/xml/Condition.java
@@ -27,23 +27,23 @@
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlValue;
 
-import uk.co.objectivity.test.db.beans.AssertType;
+import uk.co.objectivity.test.db.beans.ConditionType;
 
 @XmlAccessorType(XmlAccessType.FIELD)
-public class Assert {
+public class Condition {
 
     @XmlAttribute(name = "type")
-    private AssertType assertType;
+    private ConditionType conditionType;
 
     @XmlValue
     private Integer value;
 
-    public AssertType getAssertType() {
-        return assertType;
+    public ConditionType getConditionType() {
+        return conditionType;
     }
 
-    public void setAssertType(AssertType assertType) {
-        this.assertType = assertType;
+    public void setConditionType(ConditionType conditionType) {
+        this.conditionType = conditionType;
     }
 
     public Integer getValue() {