Nit fixes and checking if listener is getting called

Author: mnoman09

core-api/src/main/java/com/optimizely/ab/notification/DecisionInfoEnums.java

@@ -18,14 +18,14 @@
 
 public class DecisionInfoEnums {
     public enum FeatureVariableDecisionInfo {
-        SOURCE_EXPERIMENT_KEY("source_experiment_key"),
-        SOURCE_VARIATION_KEY("source_variation_key"),
         FEATURE_KEY("feature_key"),
         FEATURE_ENABLED("feature_enabled"),
+        SOURCE("source"),
+        SOURCE_EXPERIMENT_KEY("source_experiment_key"),
+        SOURCE_VARIATION_KEY("source_variation_key"),
         VARIABLE_KEY("variable_key"),
         VARIABLE_TYPE("variable_type"),
-        VARIABLE_VALUE("variable_value"),
-        SOURCE("source");
+        VARIABLE_VALUE("variable_value");
 
         private final String key;
 

core-api/src/main/java/com/optimizely/ab/notification/DecisionNotificationListenerInterface.java

@@ -25,8 +25,8 @@ public interface DecisionNotificationListenerInterface {
      * onDecision called when an activate was triggered
      *
      * @param type         - The notification type.
-     * @param userId       - The userId passed into activate.
-     * @param attributes   - The filtered attribute list passed into activate
+     * @param userId       - The userId passed to the API.
+     * @param attributes   - The attribute map passed to the API.
      * @param decisionInfo - The decision information containing all parameters passed in API.
      */
     void onDecision(@Nonnull String type,

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

@@ -2629,6 +2629,8 @@ public void getVariationWithInvalidDatafile() throws Exception {
 
     //======== Notification listeners ========//
 
+    boolean isListenerCalled = false;
+
     /**
      * Helper method to return decisionListener
      **/
@@ -2648,6 +2650,7 @@ public void onDecision(@Nonnull String type, @Nonnull String userId, @Nonnull Ma
                 for (Map.Entry<String, ?> entry : decisionInfo.entrySet()) {
                     assertEquals(testDecisionInfo.get(entry.getKey()), entry.getValue());
                 }
+                isListenerCalled = true;
             }
         };
     }
@@ -2662,7 +2665,7 @@ public void onDecision(@Nonnull String type, @Nonnull String userId, @Nonnull Ma
     @Test
     public void getFeatureVariableWithListenerUserInExperimentFeatureOn() throws Exception {
         assumeTrue(datafileVersion >= Integer.parseInt(ProjectConfig.Version.V4.toString()));
-
+        isListenerCalled = false;
         final String validFeatureKey = FEATURE_MULTI_VARIATE_FEATURE_KEY;
         String validVariableKey = VARIABLE_FIRST_LETTER_KEY;
         String expectedValue = "F";
@@ -2697,6 +2700,9 @@ public void getFeatureVariableWithListenerUserInExperimentFeatureOn() throws Exc
             Collections.singletonMap(ATTRIBUTE_HOUSE_KEY, AUDIENCE_GRYFFINDOR_VALUE)),
             expectedValue);
 
+        // Verify that listener being called
+        assertTrue(isListenerCalled);
+
         assertTrue(optimizely.notificationCenter.removeNotificationListener(notificationId));
     }
 
@@ -2708,7 +2714,7 @@ public void getFeatureVariableWithListenerUserInExperimentFeatureOn() throws Exc
     @Test
     public void getFeatureVariableWithListenerUserInExperimentFeatureOff() {
         assumeTrue(datafileVersion >= Integer.parseInt(ProjectConfig.Version.V4.toString()));
-
+        isListenerCalled = false;
         final String validFeatureKey = FEATURE_MULTI_VARIATE_FEATURE_KEY;
         String validVariableKey = VARIABLE_FIRST_LETTER_KEY;
         String expectedValue = "H";
@@ -2743,6 +2749,9 @@ public void getFeatureVariableWithListenerUserInExperimentFeatureOff() {
             null),
             expectedValue);
 
+        // Verify that listener being called
+        assertTrue(isListenerCalled);
+
         assertTrue(optimizely.notificationCenter.removeNotificationListener(notificationId));
     }
 
@@ -2754,6 +2763,7 @@ public void getFeatureVariableWithListenerUserInExperimentFeatureOff() {
     public void getFeatureVariableWithListenerUserInRollOutFeatureOn() throws Exception {
         assumeTrue(datafileVersion >= Integer.parseInt(ProjectConfig.Version.V4.toString()));
 
+        isListenerCalled = false;
         final String validFeatureKey = FEATURE_SINGLE_VARIABLE_STRING_KEY;
         String validVariableKey = VARIABLE_STRING_VARIABLE_KEY;
         String expectedValue = "lumos";
@@ -2788,6 +2798,9 @@ public void getFeatureVariableWithListenerUserInRollOutFeatureOn() throws Except
             Collections.singletonMap(ATTRIBUTE_HOUSE_KEY, AUDIENCE_GRYFFINDOR_VALUE)),
             expectedValue);
 
+        // Verify that listener being called
+        assertTrue(isListenerCalled);
+
         assertTrue(optimizely.notificationCenter.removeNotificationListener(notificationId));
     }
 
@@ -2799,6 +2812,7 @@ public void getFeatureVariableWithListenerUserInRollOutFeatureOn() throws Except
     public void getFeatureVariableWithListenerUserNotInRollOutFeatureOff() {
         assumeTrue(datafileVersion >= Integer.parseInt(ProjectConfig.Version.V4.toString()));
 
+        isListenerCalled = false;
         final String validFeatureKey = FEATURE_SINGLE_VARIABLE_BOOLEAN_KEY;
         String validVariableKey = VARIABLE_BOOLEAN_VARIABLE_KEY;
         Boolean expectedValue = true;
@@ -2833,6 +2847,9 @@ public void getFeatureVariableWithListenerUserNotInRollOutFeatureOff() {
             Collections.singletonMap(ATTRIBUTE_HOUSE_KEY, AUDIENCE_GRYFFINDOR_VALUE)),
             expectedValue);
 
+        // Verify that listener being called
+        assertTrue(isListenerCalled);
+
         assertTrue(optimizely.notificationCenter.removeNotificationListener(notificationId));
     }
 
@@ -2844,6 +2861,7 @@ public void getFeatureVariableWithListenerUserNotInRollOutFeatureOff() {
     public void getFeatureVariableIntegerWithListenerUserInRollOutFeatureOn() {
         assumeTrue(datafileVersion >= Integer.parseInt(ProjectConfig.Version.V4.toString()));
 
+        isListenerCalled = false;
         final String validFeatureKey = FEATURE_SINGLE_VARIABLE_INTEGER_KEY;
         String validVariableKey = VARIABLE_INTEGER_VARIABLE_KEY;
         int expectedValue = 7;
@@ -2877,6 +2895,9 @@ public void getFeatureVariableIntegerWithListenerUserInRollOutFeatureOn() {
             Collections.singletonMap(ATTRIBUTE_HOUSE_KEY, AUDIENCE_GRYFFINDOR_VALUE)),
             (long) expectedValue);
 
+        // Verify that listener being called
+        assertTrue(isListenerCalled);
+
         assertTrue(optimizely.notificationCenter.removeNotificationListener(notificationId));
     }
 
@@ -2888,6 +2909,7 @@ public void getFeatureVariableIntegerWithListenerUserInRollOutFeatureOn() {
     public void getFeatureVariableDoubleWithListenerUserInExperimentFeatureOn() throws Exception {
         assumeTrue(datafileVersion >= Integer.parseInt(ProjectConfig.Version.V4.toString()));
 
+        isListenerCalled = false;
         final String validFeatureKey = FEATURE_SINGLE_VARIABLE_DOUBLE_KEY;
         String validVariableKey = VARIABLE_DOUBLE_VARIABLE_KEY;
 
@@ -2921,6 +2943,9 @@ public void getFeatureVariableDoubleWithListenerUserInExperimentFeatureOn() thro
             Collections.singletonMap(ATTRIBUTE_HOUSE_KEY, AUDIENCE_SLYTHERIN_VALUE)),
             Math.PI, 2);
 
+        // Verify that listener being called
+        assertTrue(isListenerCalled);
+
         assertTrue(optimizely.notificationCenter.removeNotificationListener(notificationId));
     }