Updates versions and fixes some warnings

Josh Deffibaugh · Josh Deffibaugh · commit d6c17bc69a07 · 2016-09-30T15:31:47.000-07:00
diff --git a/android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/DataFileLoaderTest.java b/android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/DataFileLoaderTest.java
@@ -61,7 +61,7 @@ public void existingDataFileWhenRequestingFromClient() throws MalformedURLExcept
         when(dataFileClient.request(url)).thenReturn("");
         when(dataFileCache.exists()).thenReturn(false);
         when(dataFileCache.save("")).thenReturn(true);
-        String dataFile = task.doInBackground(null);
+        String dataFile = task.doInBackground();
         assertEquals("", dataFile);
         verify(dataFileClient).request(url);
         verify(dataFileCache).save("");
@@ -77,7 +77,7 @@ public void existingDataFileWhenRequestingFromClientFailsToDelete() throws Malfo
         when(dataFileClient.request(url)).thenReturn("");
         when(dataFileCache.exists()).thenReturn(true);
         when(dataFileCache.delete()).thenReturn(false);
-        String dataFile = task.doInBackground(null);
+        String dataFile = task.doInBackground();
         assertEquals(null, dataFile);
         verify(logger).warn("Unable to delete old data file");
     }
@@ -92,7 +92,7 @@ public void existingDataFileWhenRequestingFromClientFailsToSave() throws Malform
         when(dataFileClient.request(url)).thenReturn("");
         when(dataFileCache.exists()).thenReturn(false);
         when(dataFileCache.save("")).thenReturn(false);
-        String dataFile = task.doInBackground(null);
+        String dataFile = task.doInBackground();
         assertEquals(null, dataFile);
         verify(logger).warn("Unable to save new data file");
     }
@@ -125,7 +125,7 @@ public void handlesNullListener() {
     public void loadFromCache() {
         DataFileLoader.LoadDataFileFromCacheTask task = new DataFileLoader.LoadDataFileFromCacheTask(dataFileCache, dataFileLoadedListener);
 
-        task.doInBackground(null);
+        task.doInBackground();
         verify(dataFileCache).load();
     }
 
@@ -141,7 +141,6 @@ public void loadFromCacheNullDataFile() {
     public void getDataFile() {
         DataFileLoader.TaskChain taskChain = mock(DataFileLoader.TaskChain.class);
         DataFileLoader dataFileLoader = new DataFileLoader(taskChain, logger);
-        DataFileLoader.LoadDataFileFromCacheTask task = mock(DataFileLoader.LoadDataFileFromCacheTask.class);
         assertTrue(dataFileLoader.getDataFile("1", dataFileLoadedListener));
         verify(taskChain).start("1", dataFileLoadedListener);
         verify(logger).info("Refreshing data file");
diff --git a/android-sdk/src/main/java/com/optimizely/ab/android/sdk/DataFileCache.java b/android-sdk/src/main/java/com/optimizely/ab/android/sdk/DataFileCache.java
@@ -34,7 +34,7 @@
  */
 public class DataFileCache {
 
-    static final String OPTLY_DATA_FILE_NAME = "optly-data-file-%s.json";
+    private static final String OPTLY_DATA_FILE_NAME = "optly-data-file-%s.json";
 
     @NonNull private final Cache cache;
     @NonNull private final String projectId;
diff --git a/android-sdk/src/main/java/com/optimizely/ab/android/sdk/DataFileLoadedListener.java b/android-sdk/src/main/java/com/optimizely/ab/android/sdk/DataFileLoadedListener.java
@@ -15,9 +15,6 @@
  */
 package com.optimizely.ab.android.sdk;
 
-/**
- * Created by jdeffibaugh on 8/12/16 for Optimizely.
- */
 public interface DataFileLoadedListener {
 
     void onDataFileLoaded(String dataFile);
diff --git a/android-sdk/src/main/java/com/optimizely/ab/android/sdk/DataFileService.java b/android-sdk/src/main/java/com/optimizely/ab/android/sdk/DataFileService.java
@@ -27,7 +27,7 @@
 import org.slf4j.LoggerFactory;
 
 public class DataFileService extends Service {
-    public static String EXTRA_PROJECT_ID = "com.optimizely.ab.android.EXTRA_PROJECT_ID";
+    public static final String EXTRA_PROJECT_ID = "com.optimizely.ab.android.EXTRA_PROJECT_ID";
     @NonNull private final IBinder binder = new LocalBinder();
     Logger logger = LoggerFactory.getLogger(getClass());
     private boolean isBound;
diff --git a/build.gradle b/build.gradle
@@ -22,19 +22,19 @@ allprojects {
 }
 
 ext {
-    compile_sdk_version = 23
-    build_tools_version = "23.0.3"
+    compile_sdk_version = 24
+    build_tools_version = "24.0.3"
     min_sdk_version = 14
-    target_sdk_version = 23
+    target_sdk_version = 24
 
     java_core_ver = "0.1.71"
     android_logger_ver = "1.3.1"
-    support_annotations_ver = "23.0.1"
+    support_annotations_ver = "24.2.1"
     junit_ver = "4.12"
     mockito_ver = "1.10.19"
-    support_test_runner_ver = "0.4"
+    support_test_runner_ver = "0.5"
     dexmaker_ver = "1.2"
-    espresso_ver = "2.2.1"
+    espresso_ver = "2.2.2"
     version_name = "0.0.1"
     group_id = "com.optimizely.ab"
 }
diff --git a/event-handler/src/androidTest/java/com/optimizely/ab/android/event_handler/EventDispatcherTest.java b/event-handler/src/androidTest/java/com/optimizely/ab/android/event_handler/EventDispatcherTest.java
@@ -122,7 +122,6 @@ public void handleIntentSchedulesWhenNewEventFailsToSend() throws MalformedURLEx
     @Test
     public void getIntervalFromIntent() throws MalformedURLException {
         String url= "http://www.foo.com";
-        Event event = new Event(new URL(url), "");
 
         when(eventDAO.getEvents()).thenReturn(new LinkedList<Pair<Long, Event>>());
 
diff --git a/event-handler/src/androidTest/java/com/optimizely/ab/android/event_handler/OptlyEventHandlerTest.java b/event-handler/src/androidTest/java/com/optimizely/ab/android/event_handler/OptlyEventHandlerTest.java
@@ -27,6 +27,7 @@
 import org.slf4j.Logger;
 
 import java.net.MalformedURLException;
+import java.util.HashMap;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
@@ -57,28 +58,18 @@ public void setupEventHandler() {
 
     @Test
     public void dispatchEventSuccess() throws MalformedURLException {
-        optlyEventHandler.dispatchEvent(new LogEvent(null, url, null, requestBody));
+        optlyEventHandler.dispatchEvent(new LogEvent(LogEvent.RequestMethod.POST, url, new HashMap<String, String>(), requestBody));
         verify(context).startService(any(Intent.class));
         verify(logger).info("Sent url {} to the event handler service", "http://www.foo.com");
     }
 
-    @Test public void dispatchEventNullURL() {
-       optlyEventHandler.dispatchEvent(new LogEvent(null, null, null, requestBody));
-       verify(logger).error("Event dispatcher received a null url");
-    }
-
-    @Test public void dispatchEventNullParams() {
-        optlyEventHandler.dispatchEvent(new LogEvent(null, url, null, null));
-        verify(logger).error("Event dispatcher received a null request body");
-    }
-
     @Test public void dispatchEmptyUrlString() {
-        optlyEventHandler.dispatchEvent(new LogEvent(null, "", null, requestBody));
+        optlyEventHandler.dispatchEvent(new LogEvent(LogEvent.RequestMethod.POST, "", new HashMap<String, String>(), requestBody));
         verify(logger).error("Event dispatcher received an empty url");
     }
 
     @Test public void dispatchEmptyParams() {
-        optlyEventHandler.dispatchEvent(new LogEvent(null, url, null, ""));
+        optlyEventHandler.dispatchEvent(new LogEvent(LogEvent.RequestMethod.POST, url, new HashMap<String, String>(), requestBody));
         verify(context).startService(any(Intent.class));
         verify(logger).info("Sent url {} to the event handler service", "http://www.foo.com");
     }
diff --git a/event-handler/src/main/java/com/optimizely/ab/android/event_handler/EventDispatcher.java b/event-handler/src/main/java/com/optimizely/ab/android/event_handler/EventDispatcher.java
@@ -24,7 +24,6 @@
 import com.optimizely.ab.android.shared.OptlyStorage;
 import com.optimizely.ab.android.shared.ServiceScheduler;
 
-import org.json.JSONArray;
 import org.slf4j.Logger;
 
 import java.net.MalformedURLException;
@@ -115,7 +114,6 @@ private boolean dispatch() {
         Iterator<Pair<Long,Event>> iterator = events.iterator();
         while (iterator.hasNext()) {
             Pair<Long, Event> event = iterator.next();
-            JSONArray jsonArray = new JSONArray();
             boolean eventWasSent = eventClient.sendEvent(event.second);
             if (eventWasSent) {
                 iterator.remove();
diff --git a/event-handler/src/main/java/com/optimizely/ab/android/event_handler/EventIntentService.java b/event-handler/src/main/java/com/optimizely/ab/android/event_handler/EventIntentService.java
@@ -28,7 +28,7 @@
 
 public class EventIntentService extends IntentService {
     static final String EXTRA_URL = "com.optimizely.ab.android.EXTRA_URL";
-    static final String EXTRA_REQUEST_BODY = "com.optimizely.ab.andrdoid.EXTRA_REQUEST_BODY";
+    static final String EXTRA_REQUEST_BODY = "com.optimizely.ab.android.EXTRA_REQUEST_BODY";
     static final String EXTRA_INTERVAL = "com.optimizely.ab.android.EXTRA_INTERVAL";
     Logger logger = LoggerFactory.getLogger(EventIntentService.class);
     @Nullable EventDispatcher eventDispatcher;
diff --git a/shared/src/androidTest/java/com/optimizely/ab/android/shared/CacheTest.java b/shared/src/androidTest/java/com/optimizely/ab/android/shared/CacheTest.java
@@ -39,7 +39,7 @@
 @RunWith(AndroidJUnit4.class)
 public class CacheTest {
 
-    public static final String FILE_NAME = "foo.txt";
+    private static final String FILE_NAME = "foo.txt";
 
     Cache cache;
     Logger logger;
diff --git a/shared/src/main/java/com/optimizely/ab/android/shared/Client.java b/shared/src/main/java/com/optimizely/ab/android/shared/Client.java
@@ -34,7 +34,7 @@
  */
 public class Client {
 
-    static String LAST_MODIFIED_HEADER_KEY = "com.optimizely.ab.android.LAST_MODIFIED_HEADER";
+    static final String LAST_MODIFIED_HEADER_KEY = "com.optimizely.ab.android.LAST_MODIFIED_HEADER";
 
     @NonNull private final OptlyStorage optlyStorage;
     @NonNull private final Logger logger;
diff --git a/test-app/build.gradle b/test-app/build.gradle
@@ -31,15 +31,16 @@ dependencies {
     compile project(':android-sdk')
 //    compile 'com.optimizely.ab:android-sdk:0.0.1'
     compile 'com.google.code.gson:gson:2.6.2'
-    compile 'com.android.support:appcompat-v7:23.0.1'
-    compile 'com.android.support:design:23.0.1'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:design:24.2.1'
 
     testCompile "junit:junit:$junit_ver"
     testCompile "org.mockito:mockito-core:$mockito_ver"
     testCompile "com.noveogroup.android:android-logger:$android_logger_ver"
     testCompile project(':android-sdk')
 
-    androidTestCompile "com.android.support.test:runner:$support_test_runner_ver"
+    androidTestCompile("com.android.support.test:runner:$support_test_runner_ver")
+    androidTestCompile "com.android.support:support-annotations:24.2.1"
     // Set this dependency to use JUnit 4 rules
     androidTestCompile "com.android.support.test:rules:$support_test_runner_ver"
     // Set this dependency to build and run Espresso tests
diff --git a/test-app/src/main/java/com/optimizely/ab/android/test_app/MyIntentService.java b/test-app/src/main/java/com/optimizely/ab/android/test_app/MyIntentService.java
@@ -33,9 +33,7 @@ protected void onHandleIntent(Intent intent) {
             // Get Optimizely from the Intent that started this Service
             final OptimizelyManager optimizelyManager = ((MyApplication) getApplication()).getOptimizelyManager();
             AndroidOptimizely optimizely = optimizelyManager.getOptimizely();
-            if (optimizely != null) {
-                optimizely.track("goal_3", "user_1");
-            }
+            optimizely.track("goal_3", "user_1");
         }
     }
 }
diff --git a/test-app/src/main/java/com/optimizely/ab/android/test_app/SecondaryActivity.java b/test-app/src/main/java/com/optimizely/ab/android/test_app/SecondaryActivity.java
@@ -57,10 +57,7 @@ public void onStart() {
             super.onStart();
             final OptimizelyManager optimizelyManager = ((MyApplication) getActivity().getApplication()).getOptimizelyManager();
             AndroidOptimizely optimizely = optimizelyManager.getOptimizely();
-
-            if (optimizely != null) {
-                optimizely.track("goal_2", "user_1");
-            }
+            optimizely.track("goal_2", "user_1");
         }
     }
 }
diff --git a/test-app/src/main/res/layout/activity_main.xml b/test-app/src/main/res/layout/activity_main.xml
@@ -15,5 +15,5 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:text="Start Next Activity"/>
+        android:text="@string/start_next_activity"/>
 </RelativeLayout>
diff --git a/test-app/src/main/res/layout/activity_secondary.xml b/test-app/src/main/res/layout/activity_secondary.xml
@@ -14,5 +14,5 @@
         android:id="@+id/textView1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Next Activity"/>
+        android:text="@string/next_activity"/>
 </RelativeLayout>
diff --git a/test-app/src/main/res/values/strings.xml b/test-app/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
 <resources>
     <string name="app_name">Test App</string>
+    <string name="start_next_activity">Start Next Activity</string>
+    <string name="next_activity">Next Activity</string>
 </resources>
