Merge branch 'master' into mnoman/getFeatVarListener

Author: mfahadahmed

core-api/src/test/java/com/optimizely/ab/OptimizelyTest.java

@@ -93,25 +93,16 @@ public class OptimizelyTest {
     public static Collection<Object[]> data() throws IOException {
         return Arrays.asList(new Object[][]{
             {
-                2,
                 validConfigJsonV2(),
                 noAudienceProjectConfigJsonV2(),
-                validProjectConfigV2(),
-                noAudienceProjectConfigV2()
             },
             {
-                3,
                 validConfigJsonV3(),
-                noAudienceProjectConfigJsonV3(),
-                validProjectConfigV3(),
-                noAudienceProjectConfigV3()
+                noAudienceProjectConfigJsonV3(),  // FIX-ME this is not a valid v3 datafile
             },
             {
-                4,
                 validConfigJsonV4(),
-                validConfigJsonV4(),
-                validProjectConfigV4(),
-                validProjectConfigV4()
+                validConfigJsonV4()
             }
         });
     }
@@ -148,16 +139,17 @@ public static Collection<Object[]> data() throws IOException {
     private ProjectConfig validProjectConfig;
     private ProjectConfig noAudienceProjectConfig;
 
-    public OptimizelyTest(int datafileVersion,
-                          String validDatafile,
-                          String noAudienceDatafile,
-                          ProjectConfig validProjectConfig,
-                          ProjectConfig noAudienceProjectConfig) {
-        this.datafileVersion = datafileVersion;
+    public OptimizelyTest(String validDatafile, String noAudienceDatafile) throws ConfigParseException {
         this.validDatafile = validDatafile;
         this.noAudienceDatafile = noAudienceDatafile;
-        this.validProjectConfig = validProjectConfig;
-        this.noAudienceProjectConfig = noAudienceProjectConfig;
+
+        this.validProjectConfig = new ProjectConfig.Builder().withDatafile(validDatafile).build();
+        this.noAudienceProjectConfig = new ProjectConfig.Builder().withDatafile(noAudienceDatafile).build();
+
+        // FIX-ME
+        //assertEquals(validProjectConfig.getVersion(), noAudienceProjectConfig.getVersion());
+
+        this.datafileVersion = Integer.parseInt(validProjectConfig.getVersion());
     }
 
     //======== activate tests ========//
@@ -191,7 +183,6 @@ public void activateEndToEnd() throws Exception {
             .withErrorHandler(mockErrorHandler)
             .build();
 
-
         when(mockEventFactory.createImpressionEvent(validProjectConfig, activatedExperiment, bucketedVariation, testUserId,
             testUserAttributes))
             .thenReturn(logEventToDispatch);
@@ -210,6 +201,9 @@ public void activateEndToEnd() throws Exception {
         logbackVerifier.expectMessage(Level.DEBUG, "Dispatching impression event to URL test_url with params " +
             testParams + " and payload \"{}\"");
 
+        // Force variation to null to get expected log output.
+        optimizely.setForcedVariation(activatedExperiment.getKey(), testUserId, null);
+
         // activate the experiment
         Variation actualVariation = optimizely.activate(activatedExperiment.getKey(), userId, testUserAttributes);
 
@@ -269,6 +263,9 @@ public void activateEndToEndWithTypedAudienceInt() throws Exception {
         logbackVerifier.expectMessage(Level.DEBUG, "Dispatching impression event to URL test_url with params " +
             testParams + " and payload \"{}\"");
 
+        // Force variation to null to get expected log output.
+        optimizely.setForcedVariation(activatedExperiment.getKey(), testUserId, null);
+
         // activate the experiment
         Variation actualVariation = optimizely.activate(activatedExperiment.getKey(), userId, testUserAttributes);
 
@@ -420,6 +417,9 @@ public void activateEndToEndWithTypedAudienceBool() throws Exception {
         logbackVerifier.expectMessage(Level.DEBUG, "Dispatching impression event to URL test_url with params " +
             testParams + " and payload \"{}\"");
 
+        // Force variation to null to get expected log output.
+        optimizely.setForcedVariation(activatedExperiment.getKey(), testUserId, null);
+
         // activate the experiment
         Variation actualVariation = optimizely.activate(activatedExperiment.getKey(), userId, testUserAttributes);
 
@@ -479,6 +479,9 @@ public void activateEndToEndWithTypedAudienceDouble() throws Exception {
         logbackVerifier.expectMessage(Level.DEBUG, "Dispatching impression event to URL test_url with params " +
             testParams + " and payload \"{}\"");
 
+        // Force variation to null to get expected log output.
+        optimizely.setForcedVariation(activatedExperiment.getKey(), testUserId, null);
+
         // activate the experiment
         Variation actualVariation = optimizely.activate(activatedExperiment.getKey(), userId, testUserAttributes);
 
@@ -587,6 +590,9 @@ public void activateEndToEndWithTypedAudienceWithAnd() throws Exception {
         logbackVerifier.expectMessage(Level.DEBUG, "Dispatching impression event to URL test_url with params " +
             testParams + " and payload \"{}\"");
 
+        // Force variation to null to get expected log output.
+        optimizely.setForcedVariation(activatedExperiment.getKey(), testUserId, null);
+
         // activate the experiment
         Variation actualVariation = optimizely.activate(activatedExperiment.getKey(), userId, testUserAttributes);
 
@@ -1540,6 +1546,9 @@ public void activateLaunchedExperimentDoesNotDispatchEvent() throws Exception {
         when(mockBucketer.bucket(launchedExperiment, testUserId))
             .thenReturn(launchedExperiment.getVariations().get(0));
 
+        // Force variation to launched experiment.
+        optimizely.setForcedVariation(launchedExperiment.getKey(), testUserId, expectedVariation.getKey());
+
         logbackVerifier.expectMessage(Level.INFO,
             "Experiment has \"Launched\" status so not dispatching event during activation.");
         Variation variation = optimizely.activate(launchedExperiment.getKey(), testUserId);