subschema test 2

Signed-off-by: Atharva Joshi <[email protected]>

Author: Atharva Joshi

server/src/main/java/io/pravega/schemaregistry/rules/jsoncompatibility/SubSchemaComparator.java

@@ -6,7 +6,7 @@
 import static io.pravega.schemaregistry.rules.jsoncompatibility.BreakingChangesStore.*;
 
 public class SubSchemaComparator {
-    JsonCompatibilityChecker jsonCompatibilityChecker = new JsonCompatibilityChecker();
+    JsonCompatibilityChecker jsonCompatibilityChecker;
 
     public void setJsonCompatibilityChecker() {
         this.jsonCompatibilityChecker = new JsonCompatibilityChecker();

server/src/test/java/io/pravega/schemaregistry/rules/jsoncompatibility/JsonCompatibilityCheckerTest.java

@@ -33,26 +33,10 @@ public void testEqualCase() {
                 "}\n" +
                 "}\n" +
                 "}\n";
-        String y = "{\n" +
-                "\"type\": \"object\",\n" +
-                "\"properties\": {\n" +
-                "\"name\": { \"type\": \"string\" },\n" +
-                "\"credit_card\": { \"type\": \"number\" }\n" +
-                "},\n" +
-                "\"required\": [\"name\"],\n" +
-                "\"dependencies\": {\n" +
-                "\"credit_card\": {\n" +
-                "\"properties\": {\n" +
-                "\"billing_address\": { \"type\": \"string\" }\n" +
-                "},\n" +
-                "\"required\": [\"billing_address\"]\n" +
-                "}\n" +
-                "}\n" +
-                "}\n";
         SchemaInfo toValidate = new SchemaInfo("toValidate", SerializationFormat.Json, ByteBuffer.wrap(x.getBytes()),
                 ImmutableMap.of());
         List<SchemaInfo> toValidateAgainst = new ArrayList<>();
-        SchemaInfo schemaInfo1 = new SchemaInfo("toValidate", SerializationFormat.Json, ByteBuffer.wrap(y.getBytes()),
+        SchemaInfo schemaInfo1 = new SchemaInfo("toValidate", SerializationFormat.Json, ByteBuffer.wrap(x.getBytes()),
                 ImmutableMap.of());
         toValidateAgainst.add(schemaInfo1);
         Assert.assertTrue(jsonCompatibilityChecker.canRead(toValidate, toValidateAgainst));

server/src/test/java/io/pravega/schemaregistry/rules/jsoncompatibility/JsonCompatibilityCheckerUtilsTest.java

@@ -125,13 +125,43 @@ public void testArrayComparisionOnlyAddition() throws IOException {
 
     @Test
     public void testHasSubSchema() throws IOException {
-        String x1 = "{\n" +
+        String x = "{\n" +
                 "\"anyOf\": [\n" +
                 "{ \"type\": \"string\" },\n" +
                 "{ \"type\": \"number\" }\n" +
                 "]\n" +
                 "}\n";
-        JsonNode node  = objectMapper.readTree(ByteBuffer.wrap(x1.getBytes()).array());
+        JsonNode node  = objectMapper.readTree(ByteBuffer.wrap(x.getBytes()).array());
+        Assert.assertTrue(jsonCompatibilityCheckerUtils.hasSubSchema(node));
+        x = "{\n" +
+                "\"oneOf\": [\n" +
+                "{ \"type\": \"string\" },\n" +
+                "{ \"type\": \"number\" }\n" +
+                "]\n" +
+                "}\n";
+        node  = objectMapper.readTree(ByteBuffer.wrap(x.getBytes()).array());
+        Assert.assertTrue(jsonCompatibilityCheckerUtils.hasSubSchema(node));
+        x = "{\n" +
+                "\"allOf\": [\n" +
+                "{ \"type\": \"string\" },\n" +
+                "{ \"type\": \"number\" }\n" +
+                "]\n" +
+                "}\n";
+        node  = objectMapper.readTree(ByteBuffer.wrap(x.getBytes()).array());
         Assert.assertTrue(jsonCompatibilityCheckerUtils.hasSubSchema(node));
+        x = "{\n" +
+                "\"type\": \"object\",\n" +
+                "\"properties\": {\n" +
+                "\"name\": { \"type\": \"string\" },\n" +
+                "\"credit_card\": { \"type\": \"number\" },\n" +
+                "\"billing_address\": { \"type\": \"string\" }\n" +
+                "},\n" +
+                "\"required\": [\"name\"],\n" +
+                "\"dependencies\": {\n" +
+                "\"credit_card\": [\"billing_address\"]\n" +
+                "}\n" +
+                "}\n";
+        node  = objectMapper.readTree(ByteBuffer.wrap(x.getBytes()).array());
+        Assert.assertFalse(jsonCompatibilityCheckerUtils.hasSubSchema(node));
     }
 }