fix(OptimizelyConfig): add more tests for experiment audiences serialization (#420)

Author: jaeopt

.travis.yml

@@ -79,7 +79,7 @@ jobs:
         - pod repo update
         - pod install
         # install jq without cleaning up
-        - HOMEBREW_NO_INSTALL_CLEANUP=true brew install jq
+        - HOMEBREW_NO_INSTALL_CLEANUP=true brew update && brew install jq
         # preload simulator
         - Scripts/start_simulator.sh
       script:

Sources/Data Model/Audience/ConditionHolder.swift

@@ -170,7 +170,12 @@ extension Array where Element == ConditionHolder {
         // extract it first and join the rest of the array items with the logical op
         switch firstItem {
         case .logicalOp(.not):
-            result = (self.count < 2) ? "" : "NOT \(self[1].serialized)"
+            if self.count < 2 {
+                result = ""
+            } else {
+                let desc = self[1].serialized
+                return "NOT " + (self[1].isArray ? "(\(desc))" : desc)
+            }
         case .logicalOp(let op):
             result = self.enumerated()
                 .filter { $0.offset > 0 }

Tests/OptimizelyTests-DataModel/ExperimentTests.swift

@@ -170,6 +170,7 @@ extension ExperimentTests {
         ]
 
         let audiencesInput: [Any] = [
+            [],
             ["or", "1", "2"],
             ["and", "1", "2", "3"],
             ["not", "1"],
@@ -179,10 +180,13 @@ extension ExperimentTests {
             ["1", "2"],
             ["and", ["or", "1", "2"], "3"],
             ["and", ["or", "1", ["and", "2", "3"]], ["and", "11", ["or", "12", "13"]]],
+            ["not", ["and", "1", "2"]],
+            ["or", "1", "100000"],
             ["and", "and"]
         ]
 
         let audiencesOutput: [String] = [
+            "",
             "\"us\" OR \"female\"",
             "\"us\" AND \"female\" AND \"adult\"",
             "NOT \"us\"",
@@ -192,6 +196,8 @@ extension ExperimentTests {
             "\"us\" OR \"female\"",
             "(\"us\" OR \"female\") AND \"adult\"",
             "(\"us\" OR (\"female\" AND \"adult\")) AND (\"fr\" AND (\"male\" OR \"kid\"))",
+            "NOT (\"us\" AND \"female\")",
+            "\"us\" OR \"100000\"",
             ""
         ]