Remaining PR feedback.

Author: Mike Davis

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

@@ -25,6 +25,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.optimizely.ab.config.ProjectConfig.RESERVED_ATTRIBUTE_PREFIX;
 import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -133,7 +134,7 @@ public void dispatchEvent(LogEvent logEvent) throws Exception {
                             event.getKey(),
                             visitor.getVisitorId(),
                             visitor.getAttributes().stream()
-                                .filter(attribute -> !attribute.getKey().startsWith("$"))
+                                .filter(attribute -> !attribute.getKey().startsWith(RESERVED_ATTRIBUTE_PREFIX))
                                 .collect(Collectors.toMap(Attribute::getKey, Attribute::getValue))
                         );
 
@@ -145,15 +146,15 @@ public void dispatchEvent(LogEvent logEvent) throws Exception {
     }
 
     private static class CanonicalEvent {
-        private String experimentKey;
-        private String variationKey;
+        private String experimentId;
+        private String variationId;
         private String eventName;
         private String visitorId;
         private Map<String, ?> attributes;
 
-        public CanonicalEvent(String experimentKey, String variationKey, String eventName, String visitorId, Map<String, ?> attributes) {
-            this.experimentKey = experimentKey;
-            this.variationKey = variationKey;
+        public CanonicalEvent(String experimentId, String variationId, String eventName, String visitorId, Map<String, ?> attributes) {
+            this.experimentId = experimentId;
+            this.variationId = variationId;
             this.eventName = eventName;
             this.visitorId = visitorId;
             this.attributes = attributes;
@@ -164,23 +165,23 @@ public boolean equals(Object o) {
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
             CanonicalEvent that = (CanonicalEvent) o;
-            return Objects.equals(experimentKey, that.experimentKey) &&
-                Objects.equals(variationKey, that.variationKey) &&
+            return Objects.equals(experimentId, that.experimentId) &&
+                Objects.equals(variationId, that.variationId) &&
                 Objects.equals(eventName, that.eventName) &&
                 Objects.equals(visitorId, that.visitorId) &&
                 Objects.equals(attributes, that.attributes);
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(experimentKey, variationKey, eventName, visitorId, attributes);
+            return Objects.hash(experimentId, variationId, eventName, visitorId, attributes);
         }
 
         @Override
         public String toString() {
             return new StringJoiner(", ", CanonicalEvent.class.getSimpleName() + "[", "]")
-                .add("experimentKey='" + experimentKey + "'")
-                .add("variationKey='" + variationKey + "'")
+                .add("experimentId='" + experimentId + "'")
+                .add("variationId='" + variationId + "'")
                 .add("eventName='" + eventName + "'")
                 .add("visitorId='" + visitorId + "'")
                 .add("attributes=" + attributes)

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

@@ -1263,25 +1263,6 @@ public void trackDoesNotSendEventWhenExperimentsAreLaunchedOnly() throws Excepti
         eventHandler.expectConversion(eventType.getKey(), genericUserId);
     }
 
-    /**
-     * Verify that {@link Optimizely#track(String, String, Map)}
-     * dispatches log events when the tracked event links to both launched and running experiments.
-     *
-     * TODO Is this test needed? Feels unnecessary in a post EET world.
-     */
-    @Test
-    public void trackDispatchesWhenEventHasLaunchedAndRunningExperiments() throws Exception {
-        EventType eventType = datafileVersion >= 4 ?
-            noAudienceProjectConfig.getEventNameMapping().get(EVENT_BASIC_EVENT_KEY) :
-            noAudienceProjectConfig.getEventNameMapping().get("event_with_launched_and_running_experiments");
-
-        // The event has 1 launched experiment and 1 running experiment.
-        // It should send a track event with the running experiment
-        Optimizely optimizely = optimizelyBuilder.withConfig(noAudienceProjectConfig).build();
-        optimizely.track(eventType.getKey(), genericUserId);
-        eventHandler.expectConversion(eventType.getKey(), genericUserId);
-    }
-
     /**
      * Verify that an event is dispatched even if a user doesn't satisfy audience conditions for an experiment.
      */

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

@@ -20,6 +20,7 @@
 import com.optimizely.ab.notification.UpdateConfigNotification;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.concurrent.CountDownLatch;
@@ -102,6 +103,7 @@ public void testBlockingGetConfigWithDefault() throws Exception {
     }
 
     @Test
+    @Ignore("flaky")
     public void testBlockingGetConfigWithTimeout() throws Exception {
         testProjectConfigManager.start();
         assertNull(testProjectConfigManager.getConfig());