Fix build (#332)

* update dependencies

* update build tools and circle yml

* update roboelectric, rollback support distribution until play service update their dependencies

* Fix KeepAliveTest

This CL fixes the KeepAliveTest to better handle the delay between
finishing a job and consumer going idle. I've also changed when
we save when a consumer is done. This would not have any effect on
real time but important for test stability.

Author: yigit

circle.yml

@@ -23,4 +23,10 @@ machine:
     version: openjdk8
 dependencies:
   pre:
-    - echo y | android update sdk --no-ui --all --filter "tools,android-25,build-tools-24.0.3,platform-tools,extra-android-m2repository,extra-google-m2repository,extra-google-google_play_services"
+    - echo y | android update sdk -u -a -t tools
+    - echo y | android update sdk -u -a -t platform-tools
+    - echo y | android update sdk -u -a -t build-tools-25.0.2
+    - echo y | android update sdk -u -a -t android-25
+    - echo y | android update sdk -u -a -t extra-google-m2repository
+    - echo y | android update sdk -u -a -t extra-android-m2repository
+    - echo y | android update sdk -u -a -t extra-google-google_play_services

jobqueue/build.gradle

@@ -27,7 +27,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
     }
 }
@@ -46,25 +46,26 @@ configurations {
 
 dependencies {
     testCompile 'junit:junit:4.12'
-    testCompile "org.robolectric:robolectric:3.2.2"
+    testCompile "org.robolectric:robolectric:3.3"
     testCompile 'org.hamcrest:hamcrest-core:1.3'
     testCompile 'org.easytesting:fest-util:1.2.5'
     testCompile 'org.easytesting:fest-reflect:1.4.1'
-    testCompile 'org.mockito:mockito-core:2.0.2-beta'
+    testCompile 'org.mockito:mockito-core:2.7.13'
 
     compile 'com.squareup.okio:okio:1.8.0'
 
     // use an old version since we only need a few util classes that were already there for a long
     // time. If app depends on a newer one, gradle will pick it for us.
     //noinspection GradleDependency
-    compile 'com.android.support:support-core-utils:25.0.1'
+    // remove when gms moves to individual libraries
+    compile 'com.android.support:support-v4:25.2.0'
     // build tools does not allow making this provided so we make it optional when pom is created
-    compile 'com.google.android.gms:play-services-gcm:10.0.1'
+    compile 'com.google.android.gms:play-services-gcm:10.2.0'
 }
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "24.0.3"
+    buildToolsVersion "25.0.2"
     buildTypes {
         debug {
             testCoverageEnabled = true
@@ -75,7 +76,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 9
+        minSdkVersion 14
         targetSdkVersion 25
     }
 

jobqueue/src/main/java/com/birbit/android/jobqueue/ConsumerManager.java

@@ -217,10 +217,11 @@ boolean handleIdle(@NonNull JobConsumerIdleMessage message) {
             return true;
         } else {
             long keepAliveTimeout = message.getLastJobCompleted() + consumerKeepAliveNs;
-            JqLog.d("keep alive: %s", keepAliveTimeout);
+            JqLog.v("keep alive: %s", keepAliveTimeout);
             final boolean tooMany = consumers.size() > minConsumerCount;
             boolean kill = !running || (tooMany && keepAliveTimeout < timer.nanoTime());
-            JqLog.d("Consumer idle, will kill? %s . isRunning: %s", kill, running);
+            JqLog.v("Consumer idle, will kill? %s. isRunning: %s. too many? %s timeout: %s now: %s",
+                    kill, running, tooMany, keepAliveTimeout, timer.nanoTime() );
             if (kill) {
                 CommandMessage command = factory.obtain(CommandMessage.class);
                 command.set(CommandMessage.QUIT);
@@ -341,7 +342,7 @@ static class Consumer implements Runnable {
 
         boolean hasJob;// controlled by the consumer controller to avoid multiple idle-job loops
 
-        long lastJobCompleted;
+        volatile long lastJobCompleted;
 
         static final MessagePredicate pokeMessagePredicate =
                 new MessagePredicate() {
@@ -358,7 +359,6 @@ public void handleMessage(Message message) {
                 switch (message.type) {
                     case RUN_JOB:
                         handleRunJob((RunJobMessage) message);
-                        lastJobCompleted = timer.nanoTime();
                         removePokeMessages();
                         break;
                     case COMMAND:
@@ -415,6 +415,8 @@ private void handleRunJob(RunJobMessage message) {
             resultMessage.setJobHolder(jobHolder);
             resultMessage.setResult(result);
             resultMessage.setWorker(this);
+            // update time here before posting the result
+            lastJobCompleted = timer.nanoTime();
             parentMessageQueue.post(resultMessage);
         }
     }

jobqueue/src/main/java/com/birbit/android/jobqueue/JobManager.java

@@ -203,9 +203,11 @@ public void waitUntilConsumersAreFinished() {
     private void waitUntilConsumersAreFinished(boolean stop) {
         assertNotInMainThread();
         final CountDownLatch latch = new CountDownLatch(1);
+        JqLog.v("adding no consumers listener.");
         jobManagerThread.consumerManager.addNoConsumersListener(new Runnable() {
             @Override
             public void run() {
+                JqLog.v("received no consumers callback");
                 latch.countDown();
                 jobManagerThread.consumerManager.removeNoConsumersListener(this);
             }

jobqueue/src/test/java/com/birbit/android/jobqueue/test/TestBase.java

@@ -62,40 +62,4 @@ private String prefix() {
             }
         });
     }
-
-    protected void enableCollectingDebug() {
-        ShadowLog.stream = System.out;
-        JqLog.setCustomLogger(new CustomLogger() {
-            private String TAG = "test_logger";
-            private StringBuffer logs = new StringBuffer();
-            @Override
-            public boolean isDebugEnabled() {
-                return true;
-            }
-
-            @Override
-            public void d(String text, Object... args) {
-                logs.append(Thread.currentThread().getName()).append("[d]:");
-                logs.append(String.format(text, args)).append("\n");
-            }
-
-            @Override
-            public void e(Throwable t, String text, Object... args) {
-                logs.append(Thread.currentThread().getName()).append("[e]:");
-                logs.append(String.format(text, args)).append("\n");
-            }
-
-            @Override
-            public void e(String text, Object... args) {
-                logs.append(Thread.currentThread().getName()).append("[e]:");
-                logs.append(String.format(text, args)).append("\n");
-            }
-
-            @Override
-            public void v(String text, Object... args) {
-                logs.append(Thread.currentThread().getName()).append("[v]:");
-                logs.append(String.format(text, args)).append("\n");
-            }
-        });
-    }
 }

jobqueue/src/test/java/com/birbit/android/jobqueue/test/jobmanager/JobManagerTestBase.java

@@ -6,6 +6,7 @@
 import android.os.Build;
 import android.support.annotation.NonNull;
 
+import com.birbit.android.jobqueue.BuildConfig;
 import com.birbit.android.jobqueue.JobManager;
 import com.birbit.android.jobqueue.JobManagerThreadRunnable;
 import com.birbit.android.jobqueue.RetryConstraint;
@@ -20,6 +21,7 @@
 import com.birbit.android.jobqueue.test.TestBase;
 import com.birbit.android.jobqueue.test.jobs.DummyJob;
 import com.birbit.android.jobqueue.test.timer.MockTimer;
+import com.birbit.android.jobqueue.testing.CollectLogsRule;
 
 import static org.hamcrest.CoreMatchers.*;
 
@@ -44,6 +46,8 @@ public class JobManagerTestBase extends TestBase {
     final MockTimer mockTimer = new MockTimer();
     @Rule public CleanupRule cleanup = new CleanupRule(this);
     @Rule public Timeout timeout = Timeout.seconds(getTimeout());
+    @Rule public CollectLogsRule collectLogsRule = new CollectLogsRule();
+
 
     protected int getActiveConsumerCount(JobManager jobManager) {
         return jobManager.getActiveConsumerCount();
@@ -68,6 +72,9 @@ protected JobManager createJobManager(Configuration.Builder configurationBuilder
         if(createdJobManagers.size() > 0) {
             throw new AssertionError("only 1 job manager per test");
         }
+        if (BuildConfig.DEBUG) {
+            configurationBuilder.customLogger(collectLogsRule.logger);
+        }
         Configuration config = configurationBuilder.inTestMode().id(UUID.randomUUID().toString())
                 .build();
         if (config.getTimer() != mockTimer && !canUseRealTimer()) {

jobqueue/src/test/java/com/birbit/android/jobqueue/test/jobmanager/KeepAliveTest.java

@@ -14,10 +14,12 @@
 import com.birbit.android.jobqueue.config.Configuration;
 import com.birbit.android.jobqueue.network.NetworkUtil;
 import com.birbit.android.jobqueue.test.jobs.DummyJob;
+import com.birbit.android.jobqueue.testing.CollectLogsRule;
 
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
 import org.junit.Assert;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -45,8 +47,10 @@ public void testKeepAliveWithoutNetworkEvents() throws Exception {
     @TargetApi(Build.VERSION_CODES.GINGERBREAD)
     public void testKeepAlive(final DummyNetworkUtil networkUtil) throws Exception {
         int keepAlive = 3;
-        final JobManager jobManager = createJobManager(new Configuration.Builder(RuntimeEnvironment.application)
-                .consumerKeepAlive(keepAlive).networkUtil(networkUtil).timer(mockTimer));
+        final JobManager jobManager = createJobManager(new Configuration
+                .Builder(RuntimeEnvironment.application)
+                .consumerKeepAlive(keepAlive).networkUtil(networkUtil)
+                .timer(mockTimer));
         //give it a little time to create first consumer
         final CountDownLatch jobDone = new CountDownLatch(1);
         jobManager.addCallback(new JobManagerCallbackAdapter() {
@@ -62,11 +66,12 @@ public void onDone(@NonNull Job job) {
         MatcherAssert.assertThat("there should be 1 thread  actively waiting for jobs",
                 jobManager.getActiveConsumerCount(), equalTo(1));
         MatcherAssert.assertThat(jobDone.await(1, TimeUnit.MINUTES), CoreMatchers.is(true));
-        //sleep till it dies
-        mockTimer.incrementNs((long) (JobManager.NETWORK_CHECK_INTERVAL
-                + TimeUnit.SECONDS.toNanos(keepAlive) * 1.33));
         // Sync on job manager to ensure it handled add requests
         jobManager.count();
+
+        mockTimer.incrementNs((long) (JobManager.NETWORK_CHECK_INTERVAL
+                + TimeUnit.SECONDS.toNanos(keepAlive) + 1));
+
         FutureTask<Void> waitForConsumersFuture = new FutureTask<>(new Callable<Void>() {
             @Override
             public Void call() throws Exception {
@@ -84,7 +89,8 @@ public Void call() throws Exception {
         networkUtil.setNetworkStatus(NetworkUtil.DISCONNECTED);
         final DummyJob dj1 = new DummyJob(new Params(0).requireNetwork());
         jobManager.addJob(dj1);
-
+        // sync add job request
+        jobManager.count();
         mockTimer.incrementNs(JobManager.NETWORK_CHECK_INTERVAL +
                 TimeUnit.SECONDS.toNanos(keepAlive) * 2);
 
@@ -101,8 +107,6 @@ public void assertJob(Job job) {
         });
         MatcherAssert.assertThat("when network is recovered, job should be handled",
                 jobManager.count(), equalTo(0));
-
-
     }
 
 }

jobqueue/src/test/java/com/birbit/android/jobqueue/testing/CollectLogsRule.java

@@ -0,0 +1,59 @@
+package com.birbit.android.jobqueue.testing;
+
+
+import com.birbit.android.jobqueue.log.CustomLogger;
+import com.birbit.android.jobqueue.log.JqLog;
+
+import org.junit.rules.TestWatcher;
+import org.junit.runner.Description;
+
+public class CollectLogsRule extends TestWatcher {
+    public final CollectingLogger logger = new CollectingLogger();
+
+    public CollectLogsRule() {
+        super();
+    }
+
+    @Override
+    protected void starting(Description description) {
+        super.starting(description);
+        JqLog.setCustomLogger(logger);
+    }
+
+    @Override
+    public void failed(Throwable e, Description description) {
+        throw new AssertionError(logger.logs.toString());
+    }
+
+    static class CollectingLogger implements CustomLogger {
+        private StringBuffer logs = new StringBuffer();
+        @Override
+        public boolean isDebugEnabled() {
+            return true;
+        }
+
+        @Override
+        public void d(String text, Object... args) {
+            logs.append(Thread.currentThread().getName()).append("[d]:");
+            logs.append(String.format(text, args)).append("\n");
+        }
+
+        @Override
+        public void e(Throwable t, String text, Object... args) {
+            logs.append(Thread.currentThread().getName()).append("[e]:");
+            logs.append(String.format(text, args)).append("\n");
+        }
+
+        @Override
+        public void e(String text, Object... args) {
+            logs.append(Thread.currentThread().getName()).append("[e]:");
+            logs.append(String.format(text, args)).append("\n");
+        }
+
+        @Override
+        public void v(String text, Object... args) {
+            logs.append(Thread.currentThread().getName()).append("[v]:");
+            logs.append(String.format(text, args)).append("\n");
+        }
+    }
+}