refactor(#1430): replace RealNumberFieldValueSource with LinearFieldV…

…alueSource
finos · Oct 21, 2019 · f1ca398 · f1ca398
1 parent 0011c29
commit f1ca398
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 168 deletions.
diff --git a/...ator/src/main/java/com/scottlogic/deg/generator/generation/FieldValueSourceEvaluator.java b/...ator/src/main/java/com/scottlogic/deg/generator/generation/FieldValueSourceEvaluator.java
@@ -66,21 +66,20 @@ private Optional<FieldValueSource> getSource(FieldType type, FieldSpec fieldSpec
 
     private FieldValueSource getRestrictionSource(FieldType type, FieldSpec fieldSpec) {
         switch (type) {
-            case DATETIME:
-                return getDateTimeSource(fieldSpec);
             case STRING:
                 return getStringSource(fieldSpec);
+            case DATETIME:
             case NUMERIC:
-                return getNumericSource(fieldSpec);
+                return getLinearSource(fieldSpec);
                 default:
                     throw new UnsupportedOperationException("unexpected type");
         }
     }
 
-    private FieldValueSource getNumericSource(FieldSpec fieldSpec) {
-        LinearRestrictions<BigDecimal> restrictions = (LinearRestrictions<BigDecimal>) fieldSpec.getRestrictions();
-
-        return new RealNumberFieldValueSource(restrictions, fieldSpec.getBlacklist());
+    private <T extends Comparable<T>> FieldValueSource getLinearSource(FieldSpec fieldSpec) {
+        LinearRestrictions<T> restrictions = (LinearRestrictions) fieldSpec.getRestrictions();
+        Set<T> blacklist = fieldSpec.getBlacklist().stream().map(d -> (T) d).collect(Collectors.toSet());
+        return new LinearFieldValueSource(restrictions, blacklist);
     }
 
     private FieldValueSource getStringSource(FieldSpec fieldSpec) {
@@ -94,10 +93,4 @@ private FieldValueSource getStringSource(FieldSpec fieldSpec) {
 
         return generator;
     }
-
-    private FieldValueSource getDateTimeSource(FieldSpec fieldSpec) {
-        LinearRestrictions<OffsetDateTime> restrictions = (LinearRestrictions<OffsetDateTime>) fieldSpec.getRestrictions();
-        Set<OffsetDateTime> blacklist = fieldSpec.getBlacklist().stream().map(d -> (OffsetDateTime) d).collect(Collectors.toSet());
-        return new LinearFieldValueSource(restrictions, blacklist);
-    }
 }
diff --git a/...ava/com/scottlogic/deg/generator/generation/fieldvaluesources/LinearFieldValueSource.java b/...ava/com/scottlogic/deg/generator/generation/fieldvaluesources/LinearFieldValueSource.java
@@ -21,6 +21,7 @@
 
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static com.scottlogic.deg.generator.utils.SetUtils.stream;
@@ -30,11 +31,11 @@ public class LinearFieldValueSource<T extends Comparable<T>> implements FieldVal
     private final LinearRestrictions<T> restrictions;
     private final Set<T> blacklist;
 
-    public LinearFieldValueSource(
-        LinearRestrictions<T> restrictions,
-        Set<T> blacklist) {
+    public LinearFieldValueSource(LinearRestrictions<T> restrictions, Set<T> blacklist) {
         this.restrictions = restrictions;
-        this.blacklist = blacklist;
+        this.blacklist = blacklist.stream()
+            .map(i -> restrictions.getGranularity().trimToGranularity(i))
+            .collect(Collectors.toSet());
     }
 
     @Override

diff --git a/...com/scottlogic/deg/generator/generation/fieldvaluesources/RealNumberFieldValueSource.java b/...com/scottlogic/deg/generator/generation/fieldvaluesources/RealNumberFieldValueSource.java
diff --git a/...src/test/java/com/scottlogic/deg/generator/generation/FieldValueSourceEvaluatorTests.java b/...src/test/java/com/scottlogic/deg/generator/generation/FieldValueSourceEvaluatorTests.java
@@ -203,7 +203,6 @@ void getFieldValueSources_fieldSpecContainsNumericRestrictionsWithMinAndMaxNull_
 
         final List<BigDecimal> expectedValues = Arrays.asList(
             new BigDecimal("-1E+20"),
-            new BigDecimal("0"),
             new BigDecimal("1E+20")
         );
         Assert.assertEquals(expectedValues, valuesFromResult);