additional tests for coverage and added comma for json format.

Author: The-inside-man

core-api/src/main/java/com/optimizely/ab/config/audience/AndCondition.java

@@ -77,7 +77,7 @@ public String getOperandOrId() {
     @Override
     public String toJson() {
         StringBuilder s = new StringBuilder();
-        s.append("[\"and\"");
+        s.append("[\"and\", ");
         for (int i = 0; i < conditions.size(); i++) {
             s.append(conditions.get(i).toJson());
             if (i < conditions.size() - 1)

core-api/src/main/java/com/optimizely/ab/config/audience/OrCondition.java

@@ -75,7 +75,7 @@ public String getOperandOrId() {
     @Override
     public String toJson() {
         StringBuilder s = new StringBuilder();
-        s.append("[\"or\"");
+        s.append("[\"or\", ");
         for (int i = 0; i < conditions.size(); i++) {
             s.append(conditions.get(i).toJson());
             if (i < conditions.size() - 1)

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

@@ -57,6 +57,21 @@ public void initialize() {
         testTypedUserAttributes.put("null_val", null);
     }
 
+    @Test
+    public void nullConditionTest() throws Exception {
+        NullCondition nullCondition = new NullCondition();
+        assertEquals(null, nullCondition.toJson());
+        assertEquals(null, nullCondition.getOperandOrId());
+    }
+
+    @Test
+    public void emptyConditionTest() throws Exception {
+        EmptyCondition emptyCondition = new EmptyCondition();
+        assertEquals(null, emptyCondition.toJson());
+        assertEquals(null, emptyCondition.getOperandOrId());
+        assertEquals(true, emptyCondition.evaluate(null, null));
+    }
+
     /**
      * Verify that UserAttribute.toJson returns a json represented string of conditions.
      */
@@ -67,11 +82,14 @@ public void userAttributeConditionsToJson() throws Exception {
         assertEquals(testInstance.toJson(), expectedConditionJsonString);
     }
 
+    /**
+     * Verify that AndCondition.toJson returns a json represented string of conditions.
+     */
     @Test
-    public void userAttributeConditionsToJsonWithComma() throws Exception {
+    public void andConditionsToJsonWithComma() throws Exception {
         UserAttribute testInstance1 = new UserAttribute("browser_type", "custom_attribute", "true", "safari");
         UserAttribute testInstance2 = new UserAttribute("browser_type", "custom_attribute", "true", "safari");
-        String expectedConditionJsonString = "[\"and\"[\"or\"{\"name\":\"browser_type\", \"type\":\"custom_attribute\", \"match\":\"true\", \"value\":\"safari\"}, {\"name\":\"browser_type\", \"type\":\"custom_attribute\", \"match\":\"true\", \"value\":\"safari\"}]]";
+        String expectedConditionJsonString = "[\"and\", [\"or\", {\"name\":\"browser_type\", \"type\":\"custom_attribute\", \"match\":\"true\", \"value\":\"safari\"}, {\"name\":\"browser_type\", \"type\":\"custom_attribute\", \"match\":\"true\", \"value\":\"safari\"}]]";
         List<Condition> userConditions = new ArrayList<>();
         userConditions.add(testInstance1);
         userConditions.add(testInstance2);
@@ -82,6 +100,23 @@ public void userAttributeConditionsToJsonWithComma() throws Exception {
         assertEquals(andCondition.toJson(), expectedConditionJsonString);
     }
 
+    /**
+     * Verify that orCondition.toJson returns a json represented string of conditions.
+     */
+    @Test
+    public void orConditionsToJsonWithComma() throws Exception {
+        UserAttribute testInstance1 = new UserAttribute("browser_type", "custom_attribute", "true", "safari");
+        UserAttribute testInstance2 = new UserAttribute("browser_type", "custom_attribute", "true", "safari");
+        String expectedConditionJsonString = "[\"or\", [\"and\", {\"name\":\"browser_type\", \"type\":\"custom_attribute\", \"match\":\"true\", \"value\":\"safari\"}, {\"name\":\"browser_type\", \"type\":\"custom_attribute\", \"match\":\"true\", \"value\":\"safari\"}]]";
+        List<Condition> userConditions = new ArrayList<>();
+        userConditions.add(testInstance1);
+        userConditions.add(testInstance2);
+        AndCondition andCondition = new AndCondition(userConditions);
+        List<Condition> andConditions = new ArrayList<>();
+        andConditions.add(andCondition);
+        OrCondition orCondition = new OrCondition(andConditions);
+        assertEquals(orCondition.toJson(), expectedConditionJsonString);
+    }
 
     /**
      * Verify that UserAttribute.evaluate returns true on exact-matching visitor attribute data.