parse v4 additive json (#121)

* create expected project config v4 from test datafile
* revise v4 datafile. check jackson parsing works
* test GsonParsing works
* add test for json simple parsing
* add test for json config parsing

Author: wangjoshuah

core-api/src/test/java/com/optimizely/ab/config/ProjectConfigTestUtils.java

@@ -39,6 +39,7 @@
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
@@ -380,7 +381,7 @@ private static ProjectConfig generateNoAudienceProjectConfigV3() {
 
     private static final ProjectConfig VALID_PROJECT_CONFIG_V4 = generateValidProjectConfigV4();
     private static ProjectConfig generateValidProjectConfigV4() {
-        return null;
+        return ValidProjectConfigV4.generateValidProjectConfigV4();
     }
 
     private ProjectConfigTestUtils() { }
@@ -401,6 +402,10 @@ public static String noAudienceProjectConfigJsonV3() throws IOException {
         return Resources.toString(Resources.getResource("config/no-audience-project-config-v3.json"), Charsets.UTF_8);
     }
 
+    public static String validConfigJsonV4() throws IOException {
+        return Resources.toString(Resources.getResource("config/valid-project-config-v4.json"), Charsets.UTF_8);
+    }
+
     /**
      * @return the expected {@link ProjectConfig} for the json produced by {@link #validConfigJsonV2()} ()}
      */
@@ -506,7 +511,9 @@ private static void verifyTrafficAllocations(List<TrafficAllocation> actual,
             TrafficAllocation expectedDistribution = expected.get(i);
 
             assertThat(actualDistribution.getEntityId(), is(expectedDistribution.getEntityId()));
-            assertThat(actualDistribution.getEndOfRange(), is(expectedDistribution.getEndOfRange()));
+            assertEquals("expectedDistribution: " + expectedDistribution.toString() +
+                            "is not equal to the actualDistribution: " + actualDistribution.toString(),
+                    expectedDistribution.getEndOfRange(), actualDistribution.getEndOfRange());
         }
     }
 

core-api/src/test/java/com/optimizely/ab/config/ValidProjectConfigV4.java

@@ -24,8 +24,10 @@
 
 import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV2;
 import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV3;
+import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV4;
 import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV2;
 import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV3;
+import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV4;
 import static com.optimizely.ab.config.ProjectConfigTestUtils.verifyProjectConfig;
 
 /**
@@ -54,6 +56,15 @@ public void parseProjectConfigV3() throws Exception {
         verifyProjectConfig(actual, expected);
     }
 
+    @Test
+    public void parseProjectCOnfigV4() throws Exception {
+        GsonConfigParser parser = new GsonConfigParser();
+        ProjectConfig actual = parser.parseProjectConfig(validConfigJsonV4());
+        ProjectConfig expected = validProjectConfigV4();
+
+        verifyProjectConfig(actual, expected);
+    }
+
     /**
      * Verify that invalid JSON results in a {@link ConfigParseException} being thrown.
      */

core-api/src/test/java/com/optimizely/ab/config/parser/GsonConfigParserTest.java

@@ -24,8 +24,10 @@
 
 import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV2;
 import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV3;
+import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV4;
 import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV2;
 import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV3;
+import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV4;
 import static com.optimizely.ab.config.ProjectConfigTestUtils.verifyProjectConfig;
 
 /**
@@ -54,6 +56,15 @@ public void parseProjectConfigV3() throws Exception {
         verifyProjectConfig(actual, expected);
     }
 
+    @Test
+    public void parseProjectConfigV4() throws Exception {
+        JacksonConfigParser parser = new JacksonConfigParser();
+        ProjectConfig actual = parser.parseProjectConfig(validConfigJsonV4());
+        ProjectConfig expected = validProjectConfigV4();
+
+        verifyProjectConfig(actual, expected);
+    }
+
     /**
      * Verify that invalid JSON results in a {@link ConfigParseException} being thrown.
      */

core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java

@@ -24,9 +24,11 @@
 import org.junit.rules.ExpectedException;
 
 import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV2;
+import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV4;
 import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV2;
 import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV3;
 import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV3;
+import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV4;
 import static com.optimizely.ab.config.ProjectConfigTestUtils.verifyProjectConfig;
 
 /**
@@ -55,6 +57,15 @@ public void parseProjectConfigV3() throws Exception {
         verifyProjectConfig(actual, expected);
     }
 
+    @Test
+    public void parseProjectConfigV4() throws Exception {
+        JsonConfigParser parser = new JsonConfigParser();
+        ProjectConfig actual = parser.parseProjectConfig(validConfigJsonV4());
+        ProjectConfig expected = validProjectConfigV4();
+
+        verifyProjectConfig(actual, expected);
+    }
+
     /**
      * Verify that invalid JSON results in a {@link ConfigParseException} being thrown.
      */

core-api/src/test/java/com/optimizely/ab/config/parser/JsonConfigParserTest.java

@@ -24,9 +24,11 @@
 import org.junit.rules.ExpectedException;
 
 import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV2;
+import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV4;
 import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV2;
 import static com.optimizely.ab.config.ProjectConfigTestUtils.validConfigJsonV3;
 import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV3;
+import static com.optimizely.ab.config.ProjectConfigTestUtils.validProjectConfigV4;
 import static com.optimizely.ab.config.ProjectConfigTestUtils.verifyProjectConfig;
 
 /**
@@ -55,6 +57,15 @@ public void parseProjectConfigV3() throws Exception {
         verifyProjectConfig(actual, expected);
     }
 
+    @Test
+    public void parseProjectConfigV4() throws Exception {
+        JsonSimpleConfigParser parser = new JsonSimpleConfigParser();
+        ProjectConfig actual = parser.parseProjectConfig(validConfigJsonV4());
+        ProjectConfig expected = validProjectConfigV4();
+
+        verifyProjectConfig(actual, expected);
+    }
+
     /**
      * Verify that invalid JSON results in a {@link ConfigParseException} being thrown.
      */

core-api/src/test/java/com/optimizely/ab/config/parser/JsonSimpleConfigParserTest.java

@@ -207,7 +207,7 @@
       "trafficAllocation": [
         {
           "entityId": "1647582435",
-          "endOfRang": 8000
+          "endOfRange": 8000
         }
       ],
       "audienceIds": [],
@@ -385,27 +385,6 @@
           "defaultValue": "arry"
         }
       ]
-    },
-    {
-      "id": "3072915611",
-      "key": "launched_experiment",
-      "layerId": "3587821424",
-      "status": "Launched",
-      "variations": [
-        {
-          "id": "1647582435",
-          "key": "launch_control",
-          "variables": []
-        }
-      ],
-      "trafficAllocation": [
-        {
-          "entityId": "1647582435",
-          "endOfRange": 8000
-        }
-      ],
-      "audienceIds": [],
-      "forcedVariations": {}
     }
   ],
   "liveVariables": []