Update official test suite

leadpony · Oct 31, 2020 · c4c3538 · c4c3538
1 parent b01000c
commit c4c3538
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 6 deletions.
diff --git a/JSON-Schema-Test-Suite b/JSON-Schema-Test-Suite
diff --git a/justify-tests/src/test/java/org/leadpony/justify/tests/extra/json/Draft04OfficialTest.java b/justify-tests/src/test/java/org/leadpony/justify/tests/extra/json/Draft04OfficialTest.java
@@ -67,9 +67,10 @@ public static Stream<TestCase> mandatory() {
     }
 
     private static final String[] OPTIONAL = {
-            "optional/bignum.json",
             // Draft-04 does not have the "regex" format.
+            "optional/bignum.json",
             "optional/ecmascript-regex.json",
+            "optional/float-overflow.json",
             "optional/non-bmp-regex.json",
             "optional/zeroTerminatedFloats.json",
 

diff --git a/justify-tests/src/test/java/org/leadpony/justify/tests/extra/json/Draft06OfficialTest.java b/justify-tests/src/test/java/org/leadpony/justify/tests/extra/json/Draft06OfficialTest.java
@@ -73,9 +73,10 @@ public static Stream<TestCase> mandatory() {
     }
 
     private static final String[] OPTIONAL = {
-            "optional/bignum.json",
             // Draft-06 does not have the "regex" format.
+            "optional/bignum.json",
             "optional/ecmascript-regex.json",
+            "optional/float-overflow.json",
             "optional/non-bmp-regex.json",
 
             "optional/format/date-time.json",

diff --git a/justify-tests/src/test/java/org/leadpony/justify/tests/extra/json/Draft07OfficialTest.java b/justify-tests/src/test/java/org/leadpony/justify/tests/extra/json/Draft07OfficialTest.java
@@ -77,6 +77,7 @@ public static Stream<TestCase> mandatory() {
             "optional/bignum.json",
             "optional/content.json",
             "optional/ecmascript-regex.json",
+            "optional/float-overflow.json",
             "optional/non-bmp-regex.json",
 
             "optional/format/date.json",

diff --git a/...fy-tests/src/test/java/org/leadpony/justify/tests/extra/json/Draft201909OfficialTest.java b/...fy-tests/src/test/java/org/leadpony/justify/tests/extra/json/Draft201909OfficialTest.java
@@ -84,6 +84,7 @@ public static Stream<TestCase> mandatory() {
             "optional/bignum.json",
             "optional/content.json",
             "optional/ecmascript-regex.json",
+            "optional/float-overflow.json",
             "optional/non-bmp-regex.json",
             "optional/refOfUnknownKeyword.json",
 

diff --git a/justify/src/main/java/org/leadpony/justify/internal/keyword/validation/Draft04Type.java b/justify/src/main/java/org/leadpony/justify/internal/keyword/validation/Draft04Type.java
@@ -15,9 +15,12 @@
  */
 package org.leadpony.justify.internal.keyword.validation;
 
+import java.math.BigDecimal;
 import java.util.Set;
 
 import jakarta.json.JsonValue;
+import jakarta.json.stream.JsonParser;
+
 import org.leadpony.justify.api.EvaluatorContext;
 import org.leadpony.justify.api.InstanceType;
 import org.leadpony.justify.api.SpecVersion;
@@ -47,10 +50,17 @@ protected Keyword map(JsonValue jsonValue, Set<InstanceType> types) {
     };
 
     private static InstanceType getNarrowType(InstanceType type, EvaluatorContext context) {
-        if (type == InstanceType.NUMBER
-                && context.getParser().isIntegralNumber()) {
+        if (type != InstanceType.NUMBER) {
+            return type;
+        }
+        JsonParser parser = context.getParser();
+        if (parser.isIntegralNumber()) {
             return InstanceType.INTEGER;
         } else {
+            BigDecimal value = parser.getBigDecimal();
+            if (value.scale() <= 0) {
+                return InstanceType.INTEGER;
+            }
             return type;
         }
     }

diff --git a/justify/src/main/java/org/leadpony/justify/internal/keyword/validation/Type.java b/justify/src/main/java/org/leadpony/justify/internal/keyword/validation/Type.java
@@ -131,7 +131,7 @@ protected InstanceType toNarrowType(InstanceType type, EvaluatorContext context)
             return InstanceType.INTEGER;
         } else {
             BigDecimal value = parser.getBigDecimal().stripTrailingZeros();
-            if (value.scale() == 0) {
+            if (value.scale() <= 0) {
                 return InstanceType.INTEGER;
             }
             return type;
+1 −0		README.md
+3 −1		bin/jsonschema_suite
+3 −1		index.js
+0 −0		remotes/baseUriChange/folderInteger.json
+3 −0		remotes/baseUriChangeFolder/folderInteger.json
+3 −0		remotes/baseUriChangeFolderInSubschema/folderInteger.json
+84 −0		tests/draft2019-09/const.json
+10 −0		tests/draft2019-09/enum.json
+30 −0		tests/draft2019-09/if-then-else.json
+11 −0		tests/draft2019-09/multipleOf.json
+0 −11		tests/draft2019-09/optional/ecmascript-regex.json
+13 −0		tests/draft2019-09/optional/float-overflow.json
+10 −0		tests/draft2019-09/optional/format/date-time.json
+10 −0		tests/draft2019-09/optional/format/date.json
+35 −0		tests/draft2019-09/optional/format/ipv6.json
+5 −0		tests/draft2019-09/optional/format/uri.json
+5 −5		tests/draft2019-09/refRemote.json
+15 −15		tests/draft2019-09/unevaluatedItems.json
+10 −0		tests/draft2019-09/uniqueItems.json
+10 −0		tests/draft3/optional/format/date-time.json
+15 −0		tests/draft3/optional/format/date.json
+8 −6		tests/draft3/ref.json
+1 −1		tests/draft3/refRemote.json
+10 −0		tests/draft3/uniqueItems.json
+10 −0		tests/draft4/enum.json
+11 −0		tests/draft4/multipleOf.json
+0 −11		tests/draft4/optional/ecmascript-regex.json
+13 −0		tests/draft4/optional/float-overflow.json
+10 −0		tests/draft4/optional/format/date-time.json
+35 −0		tests/draft4/optional/format/ipv6.json
+5 −0		tests/draft4/optional/format/uri.json
+8 −6		tests/draft4/ref.json
+3 −3		tests/draft4/refRemote.json
+10 −0		tests/draft4/uniqueItems.json
+84 −0		tests/draft6/const.json
+10 −0		tests/draft6/enum.json
+11 −0		tests/draft6/multipleOf.json
+0 −11		tests/draft6/optional/ecmascript-regex.json
+13 −0		tests/draft6/optional/float-overflow.json
+11 −1		tests/draft6/optional/format/date-time.json
+35 −0		tests/draft6/optional/format/ipv6.json
+5 −0		tests/draft6/optional/format/uri.json
+8 −6		tests/draft6/ref.json
+3 −3		tests/draft6/refRemote.json
+10 −0		tests/draft6/uniqueItems.json
+84 −0		tests/draft7/const.json
+10 −0		tests/draft7/enum.json
+30 −0		tests/draft7/if-then-else.json
+11 −0		tests/draft7/multipleOf.json
+0 −11		tests/draft7/optional/ecmascript-regex.json
+13 −0		tests/draft7/optional/float-overflow.json
+10 −0		tests/draft7/optional/format/date-time.json
+10 −0		tests/draft7/optional/format/date.json
+35 −0		tests/draft7/optional/format/ipv6.json
+5 −0		tests/draft7/optional/format/uri.json
+8 −6		tests/draft7/ref.json
+3 −3		tests/draft7/refRemote.json
+10 −0		tests/draft7/uniqueItems.json