Merge pull request #57 from optimizely/elliot/notification

Elliot/notification

Author: elliotykim

android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyClient.java

@@ -24,6 +24,7 @@
 import com.optimizely.ab.UnknownEventTypeException;
 import com.optimizely.ab.config.Experiment;
 import com.optimizely.ab.config.Variation;
+import com.optimizely.ab.notification.NotificationListener;
 
 import org.slf4j.Logger;
 
@@ -348,4 +349,47 @@ public void track(@NonNull String eventName,
             return null;
         }
     }
+
+    //======== Notification listeners ========//
+
+    /**
+     * Add a {@link NotificationListener} if it does not exist already.
+     * <p>
+     * Listeners are held by weak reference and may automatically be garbage collected. You may
+     * need to re-register them, for example if your Activity subclass implements the listener
+     * interface, you will need to re-register the listener on each onCreate.
+     *
+     * @param listener listener to add
+     */
+    public void addNotificationListener(@NonNull NotificationListener listener) {
+        if (optimizely != null) {
+            optimizely.addNotificationListener(listener);
+        } else {
+            logger.warn("Optimizely is not initialized, could not add notification listener");
+        }
+    }
+
+    /**
+     * Remove a {@link NotificationListener} if it exists.
+     *
+     * @param listener listener to remove
+     */
+    public void removeNotificationListener(@NonNull NotificationListener listener) {
+        if (optimizely != null) {
+            optimizely.removeNotificationListener(listener);
+        } else {
+            logger.warn("Optimizely is not initialized, could not remove notification listener");
+        }
+    }
+
+    /**
+     * Remove all {@link NotificationListener} instances.
+     */
+    public void clearNotificationListeners() {
+        if (optimizely != null) {
+            optimizely.clearNotificationListeners();
+        } else {
+            logger.warn("Optimizely is not initialized, could not clear notification listeners");
+        }
+    }
 }

android-sdk/src/test/java/com/optimizely/ab/android/sdk/OptimizelyClientTest.java

@@ -17,6 +17,9 @@
 package com.optimizely.ab.android.sdk;
 
 import com.optimizely.ab.Optimizely;
+import com.optimizely.ab.config.Experiment;
+import com.optimizely.ab.config.Variation;
+import com.optimizely.ab.notification.NotificationListener;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,6 +29,7 @@
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Map;
 
 import static junit.framework.Assert.assertTrue;
 import static junit.framework.Assert.assertFalse;
@@ -250,4 +254,80 @@ public void testBadGetVariableFloat() {
         verify(logger).warn("Optimizely is not initialized, could not get live variable {} " +
                 "for user {}", "test_key", "userId");
     }
+
+    //======== Notification listeners ========//
+
+    @Test
+    public void testGoodAddNotificationListener() {
+        OptimizelyClient optimizelyClient = new OptimizelyClient(optimizely, logger);
+        NotificationListener listener = new NotificationListener() {
+            @Override
+            public void onExperimentActivated(Experiment experiment,
+                                              String s,
+                                              Map<String, String> map,
+                                              Variation variation) {
+            }
+        };
+        optimizelyClient.addNotificationListener(listener);
+        verify(optimizely).addNotificationListener(listener);
+    }
+
+    @Test
+    public void testBadAddNotificationListener() {
+        OptimizelyClient optimizelyClient = new OptimizelyClient(null, logger);
+        NotificationListener listener = new NotificationListener() {
+            @Override
+            public void onExperimentActivated(Experiment experiment,
+                                              String s,
+                                              Map<String, String> map,
+                                              Variation variation) {
+            }
+        };
+        optimizelyClient.addNotificationListener(listener);
+        verify(logger).warn("Optimizely is not initialized, could not add notification listener");
+    }
+
+    @Test
+    public void testGoodRemoveNotificationListener() {
+        OptimizelyClient optimizelyClient = new OptimizelyClient(optimizely, logger);
+        NotificationListener listener = new NotificationListener() {
+            @Override
+            public void onExperimentActivated(Experiment experiment,
+                                              String s,
+                                              Map<String, String> map,
+                                              Variation variation) {
+            }
+        };
+        optimizelyClient.removeNotificationListener(listener);
+        verify(optimizely).removeNotificationListener(listener);
+    }
+
+    @Test
+    public void testBadRemoveNotificationListener() {
+        OptimizelyClient optimizelyClient = new OptimizelyClient(null, logger);
+        NotificationListener listener = new NotificationListener() {
+            @Override
+            public void onExperimentActivated(Experiment experiment,
+                                              String s,
+                                              Map<String, String> map,
+                                              Variation variation) {
+            }
+        };
+        optimizelyClient.removeNotificationListener(listener);
+        verify(logger).warn("Optimizely is not initialized, could not remove notification listener");
+    }
+
+    @Test
+    public void testGoodClearNotificationListeners() {
+        OptimizelyClient optimizelyClient = new OptimizelyClient(optimizely, logger);
+        optimizelyClient.clearNotificationListeners();
+        verify(optimizely).clearNotificationListeners();
+    }
+
+    @Test
+    public void testBadClearNotificationListeners() {
+        OptimizelyClient optimizelyClient = new OptimizelyClient(null, logger);
+        optimizelyClient.clearNotificationListeners();
+        verify(logger).warn("Optimizely is not initialized, could not clear notification listeners");
+    }
 }

build.gradle

@@ -33,7 +33,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files