Merge branch 'weaken-access'

Author: Josh Deffibaugh

.idea/.name

@@ -36,7 +36,7 @@ config common for all modules.
   * `git clone [email protected]:optimizely/optimizely-ab-android-sdk.git`
 3. Create, or use an existing, Optimizely Custom Project 
   * put a file in `test-app/src/main/res/values/git_ignored_strings.xml`
-  * Give it this contents `<resources><string name="optly_project_id">{CUSTOM_RPOJECT_ID}</string></resources>`
+  * Give it this contents `<resources><string name="optly_project_id">{CUSTOM_PROJECT_ID}</string></resources>`
 4. Build the project (from the project root)
   * `./gradlew assemble`
 5. Run tests for all modules

.idea/copyright/Optimizely.xml

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016, Optimizely
  * <p/>
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,16 +40,14 @@
 import static org.mockito.Mockito.when;
 
 /**
- * Created by jdeffibaugh on 8/2/16 for Optimizely.
- *
  * Tests for {@link BackgroundWatchersCache}
  */
 @RunWith(JUnit4.class)
 public class BackgroundWatchersCacheTest {
 
-    BackgroundWatchersCache backgroundWatchersCache;
-    Cache cache;
-    Logger logger;
+    private BackgroundWatchersCache backgroundWatchersCache;
+    private Cache cache;
+    private Logger logger;
 
     @Before
     public void setup() {

.idea/gradle.xml

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016, Optimizely
  * <p/>
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,21 +42,18 @@
 import static org.mockito.Mockito.when;
 
 /**
- * Created by jdeffibaugh on 8/2/16 for Optimizely.
- *
  * Tests for {@link DataFileCache}
  */
 @RunWith(AndroidJUnit4.class)
 public class DataFileCacheTest {
 
-    DataFileCache dataFileCache;
-    Cache cache;
-    Logger logger;
+    private DataFileCache dataFileCache;
+    private Logger logger;
 
     @Before
     public void setup() {
         logger = mock(Logger.class);
-        cache = new Cache(InstrumentationRegistry.getTargetContext(), logger);
+        Cache cache = new Cache(InstrumentationRegistry.getTargetContext(), logger);
         dataFileCache = new DataFileCache("1", cache, logger);
     }
 

.idea/inspectionProfiles/Project_Default.xml

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016, Optimizely
  * <p/>
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +20,8 @@
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 import org.slf4j.Logger;
 
 import java.io.IOException;
@@ -36,16 +38,15 @@
 import static org.mockito.Mockito.when;
 
 /**
- * Created by jdeffibaugh on 8/2/16 for Optimizely.
- * <p/>
  * Tests for {@link DataFileClient}
  */
+@RunWith(JUnit4.class)
 public class DataFileClientTest {
 
-    DataFileClient dataFileClient;
-    Logger logger;
-    Client client;
-    HttpURLConnection urlConnection;
+    private DataFileClient dataFileClient;
+    private Logger logger;
+    private Client client;
+    private HttpURLConnection urlConnection;
 
     @Before
     public void setup() {

.idea/misc.xml

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016, Optimizely
  * <p/>
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,13 +19,15 @@
 import android.content.Intent;
 import android.support.test.InstrumentationRegistry;
 
+import com.optimizely.ab.android.shared.Cache;
+
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 import org.mockito.ArgumentCaptor;
 import org.slf4j.Logger;
 
-import java.util.Arrays;
-
 import static junit.framework.Assert.assertEquals;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
@@ -34,14 +36,13 @@
 import static org.mockito.Mockito.when;
 
 /**
- * Created by jdeffibaugh on 8/2/16 for Optimizely.
- *
  * Tests for {@link DataFileRescheduler}
  */
+@RunWith(JUnit4.class)
 public class DataFileReschedulerTest {
 
-    DataFileRescheduler dataFileRescheduler;
-    Logger logger;
+    private DataFileRescheduler dataFileRescheduler;
+    private Logger logger;
 
     @Before
     public void setup() {
@@ -83,30 +84,34 @@ public void receivedActionMyPackageReplaced() {
     @SuppressWarnings("ArraysAsListWithZeroOrOneArgument")
     @Test
     public void dispatchingOne() {
-        Context context = InstrumentationRegistry.getTargetContext();
         Context mockContext = mock(Context.class);
-        BackgroundWatchersCache backgroundWatchersCache = mock(BackgroundWatchersCache.class);
-        when(backgroundWatchersCache.getWatchingProjectIds()).thenReturn(Arrays.asList("1"));
+        Cache cache = new Cache(InstrumentationRegistry.getTargetContext(), logger);
+        BackgroundWatchersCache backgroundWatchersCache = new BackgroundWatchersCache(cache, logger);
+        backgroundWatchersCache.setIsWatching("1", true);
         Logger logger = mock(Logger.class);
         DataFileRescheduler.Dispatcher dispatcher = new DataFileRescheduler.Dispatcher(mockContext, backgroundWatchersCache, logger);
-        Intent intent = new Intent(context, DataFileService.class);
+        Intent intent = new Intent(mockContext, DataFileService.class);
         dispatcher.dispatch(intent);
         ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
         verify(mockContext).startService(captor.capture());
         assertEquals("1", captor.getValue().getStringExtra(DataFileService.EXTRA_PROJECT_ID));
         verify(logger).info("Rescheduled data file watching for project {}", "1");
+        cache.delete(BackgroundWatchersCache.BACKGROUND_WATCHERS_FILE_NAME);
     }
 
     @Test
     public void dispatchingMany() {
-        Context context = InstrumentationRegistry.getTargetContext();
         Context mockContext = mock(Context.class);
-        BackgroundWatchersCache backgroundWatchersCache = mock(BackgroundWatchersCache.class);
-        when(backgroundWatchersCache.getWatchingProjectIds()).thenReturn(Arrays.asList("1", "2", "3"));
+        Cache cache = new Cache(InstrumentationRegistry.getTargetContext(), logger);
+        BackgroundWatchersCache backgroundWatchersCache = new BackgroundWatchersCache(cache, logger);
+        backgroundWatchersCache.setIsWatching("1", true);
+        backgroundWatchersCache.setIsWatching("2", true);
+        backgroundWatchersCache.setIsWatching("3", true);
         Logger logger = mock(Logger.class);
         DataFileRescheduler.Dispatcher dispatcher = new DataFileRescheduler.Dispatcher(mockContext, backgroundWatchersCache, logger);
-        Intent intent = new Intent(context, DataFileService.class);
+        Intent intent = new Intent(mockContext, DataFileService.class);
         dispatcher.dispatch(intent);
         verify(mockContext, times(3)).startService(any(Intent.class));
+        cache.delete(BackgroundWatchersCache.BACKGROUND_WATCHERS_FILE_NAME);
     }
 }