chore: prepare for release and fix unit tests (#336)

* prepare for release

* one more check added

* fix tests

* fix tests

Author: thomaszurkan-optimizely

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Optimizely Android X SDK Changelog
 
+## 3.5.2
+June 18th, 2020
+
+Upgrade to latest stable build tools 29.0.3.
+
+### Bug Fixes
+* Cleanup scheduled jobs to ensure that there is no jobs delayed.[335](https://github.com/optimizely/android-sdk/pull/335)
+* Throttle datafile downloads to ensure there is a minimum of 1 minute between them.
+* Clarify dispatch intervals. [323](https://github.com/optimizely/android-sdk/pull/323)
+
 ## 3.5.1
 April 29th, 2020
 

datafile-handler/src/androidTest/java/com/optimizely/ab/android/datafile_handler/DatafileLoaderTest.java

@@ -184,9 +184,9 @@ public void debugLogged() throws IOException {
                 new DatafileLoader(datafileService, datafileClient, datafileCache, executor, logger);
 
         when(client.execute(any(Client.Request.class), anyInt(), anyInt())).thenReturn("{}");
+        when(cache.save(datafileCache.getFileName(), "{}")).thenReturn(true);
         when(cache.exists(datafileCache.getFileName())).thenReturn(true);
-        when(cache.delete(datafileCache.getFileName())).thenReturn(false);
-        when(cache.save(datafileCache.getFileName(), "{}")).thenReturn(false);
+        when(cache.load(datafileCache.getFileName())).thenReturn("{}");
 
         datafileLoader.getDatafile("debugLogged", datafileLoadedListener);
         datafileLoader.getDatafile("debugLogged", datafileLoadedListener);
@@ -201,6 +201,32 @@ public void debugLogged() throws IOException {
         verify(datafileLoadedListener, atLeast(1)).onDatafileLoaded("{}");
     }
 
+    @Test
+    public void downloadAllowedNoCache() throws IOException {
+        final ListeningExecutorService executor = MoreExecutors.newDirectExecutorService();
+        Cache cache = mock(Cache.class);
+        datafileCache = new DatafileCache("downloadAllowedNoCache", cache, logger);
+        DatafileLoader datafileLoader =
+                new DatafileLoader(datafileService, datafileClient, datafileCache, executor, logger);
+
+        when(client.execute(any(Client.Request.class), anyInt(), anyInt())).thenReturn("{}");
+        when(cache.save(datafileCache.getFileName(), "{}")).thenReturn(false);
+        when(cache.exists(datafileCache.getFileName())).thenReturn(false);
+        when(cache.load(datafileCache.getFileName())).thenReturn("{}");
+
+        datafileLoader.getDatafile("downloadAllowedNoCache", datafileLoadedListener);
+        datafileLoader.getDatafile("downloadAllowedNoCache", datafileLoadedListener);
+        try {
+            executor.awaitTermination(5, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            fail();
+        }
+
+        verify(logger, never()).debug("Last download happened under 1 minute ago. Throttled to be at least 1 minute apart.");
+        verify(datafileLoadedListener, atMost(2)).onDatafileLoaded("{}");
+        verify(datafileLoadedListener, atLeast(1)).onDatafileLoaded("{}");
+    }
+
     @Test
     public void debugLoggedMultiThreaded() throws IOException {
         final ListeningExecutorService executor = MoreExecutors.newDirectExecutorService();
@@ -212,6 +238,7 @@ public void debugLoggedMultiThreaded() throws IOException {
         when(client.execute(any(Client.Request.class), anyInt(), anyInt())).thenReturn("{}");
         when(cache.exists(datafileCache.getFileName())).thenReturn(true);
         when(cache.delete(datafileCache.getFileName())).thenReturn(true);
+        when(cache.exists(datafileCache.getFileName())).thenReturn(true);
         when(cache.load(datafileCache.getFileName())).thenReturn("{}");
         when(cache.save(datafileCache.getFileName(), "{}")).thenReturn(true);
 
@@ -268,9 +295,6 @@ public void allowDoubleDownload() throws IOException {
         setTestDownloadFrequency(datafileLoader, 1000L);
 
         when(client.execute(any(Client.Request.class), anyInt(), anyInt())).thenReturn("{}");
-        when(cache.exists(datafileCache.getFileName())).thenReturn(true);
-        when(cache.delete(datafileCache.getFileName())).thenReturn(false);
-        when(cache.save(datafileCache.getFileName(), "{}")).thenReturn(false);
 
         datafileLoader.getDatafile("allowDoubleDownload", datafileLoadedListener);
         try {

datafile-handler/src/main/java/com/optimizely/ab/android/datafile_handler/DatafileLoader.java

@@ -71,7 +71,7 @@ private boolean allowDownload(String url, DatafileLoadedListener datafileLoadedL
         long time = storage.getLong(url + datafileDownloadTime, 1);
         Date last = new Date(time);
         Date now = new Date();
-        if (now.getTime() - last.getTime() < minTimeBetweenDownloadsMilli) {
+        if (now.getTime() - last.getTime() < minTimeBetweenDownloadsMilli && datafileCache.exists()) {
             logger.debug("Last download happened under 1 minute ago. Throttled to be at least 1 minute apart.");
             if (datafileLoadedListener != null) {
                 notify(datafileLoadedListener, getCachedDatafile());