Merge pull request #215 from andersonf/bugfix/214-if-then-else

#214 - Fix conditional of validation (if-then-else)

Author: stevehu

src/main/java/com/networknt/schema/IfValidator.java

@@ -54,7 +54,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
         Set<ValidationMessage> ifErrors = ifSchema.validate(node, rootNode, at);
         if (ifErrors.isEmpty() && thenSchema != null) {
             errors.addAll(thenSchema.validate(node, rootNode, at));
-        } else if (thenSchema != null && elseSchema != null) {
+        } else if (!ifErrors.isEmpty() && elseSchema != null) {
             errors.addAll(elseSchema.validate(node, rootNode, at));
         }
 

src/test/java/com/networknt/schema/V201909JsonSchemaTest.java

@@ -309,12 +309,6 @@ public void testFormatValidator() throws Exception {
     }
 
     @Test
-    public void testIfValidator() throws Exception {
-        runTestFile("draft2019-09/if.json");
-    }
-
-    @Test
-    @Ignore
     public void testIfThenElseValidator() throws Exception {
         runTestFile("draft2019-09/if-then-else.json");
     }

src/test/java/com/networknt/schema/V7JsonSchemaTest.java

@@ -305,12 +305,6 @@ public void testFormatValidator() throws Exception {
     }
 
     @Test
-    public void testIfValidator() throws Exception {
-        runTestFile("draft7/if.json");
-    }
-
-    @Test
-    @Ignore
     public void testIfThenElseValidator() throws Exception {
         runTestFile("draft7/if-then-else.json");
     }