polish

Author: chillaq

client/src/main/java/io/split/engine/evaluator/EvaluatorImp.java

@@ -117,7 +117,7 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu
 
             for (ParsedCondition parsedCondition : parsedSplit.parsedConditions()) {
 
-                if (!inRollout && parsedCondition.conditionType() == ConditionType.ROLLOUT) {
+                if (checkRollout(inRollout, parsedCondition)) {
 
                     if (parsedSplit.trafficAllocation() < 100) {
                         // if the traffic allocation is 100%, no need to do anything special.
@@ -159,6 +159,10 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu
         }
     }
 
+    private boolean checkRollout(boolean inRollout, ParsedCondition parsedCondition) {
+        return (!inRollout && parsedCondition.conditionType() == ConditionType.ROLLOUT);
+    }
+
     private String getBucketingKey(String bucketingKey, String matchingKey) {
         return (bucketingKey == null) ? matchingKey : bucketingKey;
     }

client/src/test/java/io/split/client/SplitClientIntegrationTest.java

@@ -528,7 +528,7 @@ public void splitClientMultiFactory() throws Exception {
                 .until(() -> "on_whitelist".equals(client2.getTreatment("admin", "push_test")));
 
         Awaitility.await()
-                .atMost(50L, TimeUnit.SECONDS)
+                .atMost(100L, TimeUnit.SECONDS)
                 .until(() -> "on_whitelist".equals(client3.getTreatment("admin", "push_test")));
 
         Awaitility.await()

client/src/test/java/io/split/engine/experiments/SplitParserTest.java

@@ -100,6 +100,7 @@ public void works() {
         compareParsed(actual, expected);
         assertTrue(expected.hashCode() != 0);
         assertTrue(expected.equals(expected));
+        Assert.assertEquals(expected.toString(), actual.toString());
     }
 
     @Test
@@ -730,6 +731,7 @@ private void compareParsed(ParsedSplit actual, ParsedSplit expected) {
         Assert.assertEquals(actual.configurations(), expected.configurations());
         Assert.assertEquals(actual.prerequisitesMatcher().toString(), expected.prerequisitesMatcher().toString());
     }
+
     private Split makeSplit(String name, int seed, List<Condition> conditions, long changeNumber) {
         return makeSplit(name, seed, conditions, changeNumber, null);
     }