Merge branch 'develop' into feature/#144-missing-attributes

BasisHub · May 22, 2019 · 7c27b24 · 7c27b24
2 parents 478f173 + dc7d930
commit 7c27b24
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/test/java/com/basiscomponents/db/datarowtest/DataRowMatchesTest.java b/src/test/java/com/basiscomponents/db/datarowtest/DataRowMatchesTest.java
@@ -12,33 +12,33 @@
 public class DataRowMatchesTest {
 	@Test
 	public void testPositive() throws ParseException {
-		DataRow dataRow = DataRowProvider.buildSampleDataRow(false);
+		DataRow dataRow = DataRowProvider.buildStringOnlyDataRow();
 		DataRow filter = new DataRow();
-		filter.setFieldValue(DataRowProvider.STRINGFIELD, "Value");
+		filter.setFieldValue(DataRowProvider.STRINGFIELD, DataRowProvider.STRINGFIELD_VALUE);
 		assertTrue(dataRow.matches(filter));
 	}
 
 	@Test
 	public void testNegative() throws ParseException {
-		DataRow dataRow = DataRowProvider.buildSampleDataRow(false);
+		DataRow dataRow = DataRowProvider.buildStringOnlyDataRow();
 		DataRow filter = new DataRow();
 		filter.setFieldValue(DataRowProvider.STRINGFIELD, "This is not the value, you are looking for");
 		assertFalse(dataRow.matches(filter));
 	}
 
 	@Test
 	public void testNonExistingFields() throws ParseException {
-		DataRow dataRow = DataRowProvider.buildSampleDataRow(false);
+		DataRow dataRow = DataRowProvider.buildStringOnlyDataRow();
 		DataRow filter = new DataRow();
 		filter.setFieldValue("Not a field in existance", "should not be compared");
 		assertTrue(dataRow.matches(filter));// not sure if it should behave like this
 	}
 
 	@Test
 	public void testRegex() throws ParseException {
-		DataRow dataRow = DataRowProvider.buildSampleDataRow(false);
+		DataRow dataRow = DataRowProvider.buildStringOnlyDataRow();
 		DataRow filter = new DataRow();
 		filter.setFieldValue(DataRowProvider.STRINGFIELD, "regex:[A-Z][a-z]*");
-		assertTrue(dataRow.matches(filter));
+		assertFalse(dataRow.matches(filter));
 	}
 }
diff --git a/src/test/java/com/basiscomponents/db/util/DataRowProvider.java b/src/test/java/com/basiscomponents/db/util/DataRowProvider.java
@@ -1,12 +1,12 @@
 package com.basiscomponents.db.util;
 
+import com.basiscomponents.db.DataRow;
+
 import java.sql.Date;
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.util.Calendar;
 
-import com.basiscomponents.db.DataRow;
-
 public class DataRowProvider {
 	public static final String STRINGFIELD = "STRINGFIELD";
 	public static final String SCD_STRINGFIELD = "SCD_STRINGFIELD";
@@ -28,6 +28,7 @@ public class DataRowProvider {
 	public static final String NESTEDDATAROW2 = "NESTEDDATAROW2";
 	public static final String NESTEDRESULTSET1 = "NESTEDRESULTSET1";
 	public static final String NESTEDRESULTSET2 = "NESTEDRESULTSET2";
+	public static final String STRINGFIELD_VALUE ="1337";
 
 //	public static final String BYTEFIELD = "BYTEFIELD";
 //	public static final String SCD_BYTEFIELD = "SCD_BYTEFIELD";
@@ -189,7 +190,7 @@ public static DataRow buildSampleDataRowMinMax() {
 	public static DataRow buildStringOnlyDataRow() {
 		DataRow dr = new DataRow();
 		try {
-			dr.setFieldValue(STRINGFIELD, "1337");
+			dr.setFieldValue(STRINGFIELD, STRINGFIELD_VALUE);
 			dr.setFieldValue(SCD_STRINGFIELD, "StringValue");
 			dr.setFieldValue(TRD_STRINGFIELD, "4StringValue2");
 			dr.setFieldValue(FRT_STRINGFIELD, "");