Some PR feedback changes.

Author: Mike Davis

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

@@ -568,21 +568,6 @@ public void activateWithUnknownExperimentKeyAndNoOpErrorHandler() throws Excepti
         assertNull(actualVariation);
     }
 
-    /**
-     * Verify that {@link Optimizely#activate(String, String)} handles the case where an unknown experiment
-     * (i.e., not in the config) is passed through and a {@link RaiseExceptionErrorHandler} is provided.
-     * DUPE? I think this is testing RaiseExceptionErrorHandler.
-     */
-    @Test
-    public void activateWithUnknownExperimentKeyAndRaiseExceptionErrorHandler() throws Exception {
-        thrown.expect(UnknownExperimentException.class);
-
-        Experiment unknownExperiment = createUnknownExperiment();
-
-        Optimizely optimizely = optimizelyBuilder.withErrorHandler(new RaiseExceptionErrorHandler()).build();
-        optimizely.activate(unknownExperiment.getKey(), testUserId);
-    }
-
     /**
      * Verify that {@link Optimizely#activate(String, String, Map)} passes through attributes.
      */
@@ -631,10 +616,9 @@ public void activateWithTypedAttributes() throws Exception {
      * Verify that {@link Optimizely#activate(String, String, Map<String, String>)} handles the case
      * where an unknown attribute (i.e., not in the config) is passed through.
      * <p>
-     * In this case, the activate call should not remove the unknown attribute from the given map.
+     * In this case, the eventual payload will NOT include the unknownAttribute
      */
     @Test
-    @Ignore("Kind of a silly test since the event factory strips these unknownAttributes out before sending.")
     @SuppressWarnings("unchecked")
     public void activateWithUnknownAttribute() throws Exception {
         Experiment activatedExperiment = validProjectConfig.getExperiments().get(0);
@@ -643,20 +627,14 @@ public void activateWithUnknownAttribute() throws Exception {
         Map<String, String> testUserAttributes = new HashMap<>();
         testUserAttributes.put("unknownAttribute", "dimValue");
 
-        if (datafileVersion >= 4) {
-            testUserAttributes.put(ATTRIBUTE_HOUSE_KEY, AUDIENCE_GRYFFINDOR_VALUE);
-        } else {
-            testUserAttributes.put("browser_type", "chrome");
-        }
-
         logbackVerifier.expectMessage(Level.INFO, "Activating user \"userId\" in experiment \"" +
             activatedExperiment.getKey() + "\".");
 
         Optimizely optimizely = optimizelyBuilder.withErrorHandler(new RaiseExceptionErrorHandler()).build();
         Variation actualVariation = optimizely.activate(activatedExperiment.getKey(), testUserId, testUserAttributes);
         assertThat(actualVariation, is(bucketedVariation));
 
-        eventHandler.expectImpression(activatedExperiment.getId(), actualVariation.getId(), testUserId, testUserAttributes);
+        eventHandler.expectImpression(activatedExperiment.getId(), actualVariation.getId(), testUserId);
     }
 
     /**
@@ -959,7 +937,6 @@ public void activateExperimentStatusPrecedesForcedVariation() throws Exception {
      * {@link EventHandler#dispatchEvent(LogEvent)} gracefully.
      */
     @Test
-    @Ignore("Not sure why this is broken")
     public void activateDispatchEventThrowsException() throws Exception {
         Experiment experiment = noAudienceProjectConfig.getExperiments().get(0);
 
@@ -1288,7 +1265,6 @@ public void trackEventWithNoValidExperiments() throws Exception {
      * {@link EventHandler#dispatchEvent(LogEvent)} gracefully.
      */
     @Test
-    @Ignore("Not sure why this is failing ATM.")
     public void trackDispatchEventThrowsException() throws Exception {
         EventType eventType = noAudienceProjectConfig.getEventTypes().get(0);
 
@@ -1305,7 +1281,6 @@ public void trackDispatchEventThrowsException() throws Exception {
      * dispatches events even if the event links only to launched experiments
      */
     @Test
-//    @Ignore("Is this a bug??")
     public void trackDoesNotSendEventWhenExperimentsAreLaunchedOnly() throws Exception {
         EventType eventType = datafileVersion >= 4 ?
             noAudienceProjectConfig.getEventNameMapping().get(EVENT_LAUNCHED_EXPERIMENT_ONLY_KEY) :

core-api/src/test/java/com/optimizely/ab/error/RaiseExceptionErrorHandlerTest.java

@@ -0,0 +1,36 @@
+/**
+ *
+ *    Copyright 2019 Optimizely and contributors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package com.optimizely.ab.error;
+
+import com.optimizely.ab.OptimizelyRuntimeException;
+import org.junit.Before;
+import org.junit.Test;
+
+public class RaiseExceptionErrorHandlerTest {
+
+    private RaiseExceptionErrorHandler errorHandler;
+
+    @Before
+    public void setUp() throws Exception {
+        errorHandler = new RaiseExceptionErrorHandler();
+    }
+
+    @Test(expected = OptimizelyRuntimeException.class)
+    public void handleError() {
+        errorHandler.handleError(new OptimizelyRuntimeException());
+    }
+}

core-api/src/test/java/com/optimizely/ab/event/NoopEventHandlerTest.java

@@ -1,6 +1,6 @@
 /**
  *
- *    Copyright 2016-2017, 2019 Optimizely and contributors
+ *    Copyright 2016-2017 Optimizely and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.