Update Robolectric to 3.3.2 and AssertJ to 3.6.2

build.gradle

@@ -64,14 +64,14 @@ ext.libraries = [
 
         // Libraries for tests and sample app
         junit                          : 'junit:junit:4.12',
-        assertJ                        : 'org.assertj:assertj-core:1.7.1',
-        assertJAndroid                 : 'com.squareup.assertj:assertj-android:1.0.1',
-        mockitoCore                    : 'org.mockito:mockito-core:2.7.7',
+        assertJ                        : 'org.assertj:assertj-core:3.6.2',
+        assertJAndroid                 : 'com.squareup.assertj:assertj-android:1.1.1',
+        mockitoCore                    : 'org.mockito:mockito-core:2.7.19',
 
         equalsVerifier                 : 'nl.jqno.equalsverifier:equalsverifier:1.7.2',
         privateConstructorChecker      : 'com.pushtorefresh.java-private-constructor-checker:checker:1.1.0',
         guava                          : 'com.google.guava:guava:18.0',
-        robolectric                    : 'org.robolectric:robolectric:3.1.4',
+        robolectric                    : 'org.robolectric:robolectric:3.3.2',
         googleTestingCompile           : 'com.google.testing.compile:compile-testing:0.10',
 
         dagger                         : 'com.google.dagger:dagger:' + daggerVersion,

storio-common-annotations-processor/src/test/java/com/pushtorefresh/storio/common/annotations/processor/introspection/JavaTypeTest.java

@@ -14,7 +14,7 @@
 import static com.pushtorefresh.storio.common.annotations.processor.introspection.JavaType.SHORT;
 import static com.pushtorefresh.storio.common.annotations.processor.introspection.JavaType.SHORT_OBJECT;
 import static com.pushtorefresh.storio.common.annotations.processor.introspection.JavaType.STRING;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

storio-common-annotations-processor/src/test/java/com/pushtorefresh/storio/common/annotations/processor/introspection/StorIOColumnMetaTest.java

@@ -10,7 +10,7 @@
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 public class StorIOColumnMetaTest {

storio-common-annotations-processor/src/test/java/com/pushtorefresh/storio/common/annotations/processor/introspection/StorIOTypeMetaTest.java

@@ -8,7 +8,7 @@
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 public class StorIOTypeMetaTest {

storio-common/src/test/java/com/pushtorefresh/storio/QueriesTest.java

@@ -4,7 +4,7 @@
 
 import org.junit.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
 
 public class QueriesTest {

storio-common/src/test/java/com/pushtorefresh/storio/StorIOExceptionTest.java

@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 
 public class StorIOExceptionTest {
 

storio-common/src/test/java/com/pushtorefresh/storio/TypeMappingFinderImplTest.java

@@ -10,7 +10,7 @@
 import java.util.Map;
 import java.util.Random;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;

storio-common/src/test/java/com/pushtorefresh/storio/internal/ChangesBusTest.java

@@ -8,7 +8,7 @@
 import rx.observers.TestSubscriber;
 
 import static java.util.Arrays.asList;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
 
 public class ChangesBusTest {

storio-common/src/test/java/com/pushtorefresh/storio/internal/ChecksTest.java

@@ -6,7 +6,7 @@
 
 import static com.pushtorefresh.storio.internal.Checks.checkNotEmpty;
 import static com.pushtorefresh.storio.internal.Checks.checkNotNull;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
 
 public class ChecksTest {

storio-common/src/test/java/com/pushtorefresh/storio/internal/EnvironmentTest.java

@@ -7,7 +7,7 @@
 import java.lang.reflect.Field;
 
 import static java.lang.reflect.Modifier.FINAL;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
 
 public class EnvironmentTest {

storio-common/src/test/java/com/pushtorefresh/storio/internal/InternalQueriesTest.java

@@ -15,7 +15,7 @@
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptySet;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 
 public class InternalQueriesTest {
 

storio-common/src/test/java/com/pushtorefresh/storio/operations/internal/MapSomethingToExecuteAsBlockingTest.java

@@ -6,7 +6,7 @@
 
 import rx.Observable;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

storio-common/src/test/java/com/pushtorefresh/storio/operations/internal/OnSubscribeExecuteAsBlockingTest.java

@@ -9,7 +9,7 @@
 import rx.Subscriber;
 import rx.observers.TestSubscriber;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/ChangesTest.java

@@ -14,7 +14,7 @@
 
 import nl.jqno.equalsverifier.EqualsVerifier;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 @RunWith(RobolectricTestRunner.class) // Required for correct Uri impl

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/ContentResolverTypeMappingTest.java

@@ -6,7 +6,7 @@
 
 import org.junit.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 public class ContentResolverTypeMappingTest {

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/impl/DefaultStorIOContentResolverTest.java

@@ -27,7 +27,7 @@
 
 import rx.Scheduler;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/impl/RxChangesObserverTest.java

@@ -31,7 +31,7 @@
 import static com.pushtorefresh.storio.test.Utils.MAX_SDK_VERSION;
 import static com.pushtorefresh.storio.test.Utils.MIN_SDK_VERSION;
 import static java.util.Collections.singleton;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.eq;

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/integration/DeleteOperationTest.java

@@ -19,7 +19,7 @@
 
 import static java.util.Collections.singletonList;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/integration/GetOperationTest.java

@@ -20,7 +20,7 @@
 import rx.observers.TestSubscriber;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/integration/PutOperationTest.java

@@ -24,7 +24,7 @@
 import rx.singles.BlockingSingle;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DefaultDeleteResolverTest.java

@@ -8,7 +8,7 @@
 
 import org.junit.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DeleteByQueryStub.java

@@ -12,7 +12,7 @@
 import rx.Single;
 import rx.functions.Action1;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DeleteObjectsStub.java

@@ -17,7 +17,7 @@
 import rx.Single;
 import rx.functions.Action1;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DeleteResultTest.java

@@ -15,7 +15,7 @@
 
 import nl.jqno.equalsverifier.EqualsVerifier;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 @RunWith(RobolectricTestRunner.class) // Required for correct Uri impl

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DeleteResultsTest.java

@@ -15,7 +15,7 @@
 
 import nl.jqno.equalsverifier.EqualsVerifier;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 @RunWith(RobolectricTestRunner.class) // Required for correct Uri impl

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/PreparedDeleteCollectionOfObjectsTest.java

@@ -17,7 +17,7 @@
 import rx.observers.TestSubscriber;
 
 import static java.util.Arrays.asList;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
@@ -291,7 +291,7 @@ public void shouldThrowExceptionIfNoTypeMappingWasFoundWithoutAffectingContentPr
         }
     }
 
-    class OtherTests {
+    public static class OtherTests {
 
         @Test
         public void deleteCollectionOfObjectsObservableExecutesOnSpecifiedScheduler() {

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/PreparedDeleteObjectTest.java

@@ -14,7 +14,7 @@
 import rx.Single;
 import rx.observers.TestSubscriber;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
@@ -271,7 +271,7 @@ public void shouldThrowExceptionIfNoTypeMappingWasFoundWithoutAffectingContentPr
         }
     }
 
-    class OtherTests {
+    public static class OtherTests {
 
         @Test
         public void deleteObjectObservableExecutesOnSpecifiedScheduler() {

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/DefaultGetResolverTest.java

@@ -9,7 +9,7 @@
 
 import org.junit.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/GetCursorStub.java

@@ -13,7 +13,7 @@
 import rx.Single;
 import rx.functions.Action1;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/GetNumberOfResultsStub.java

@@ -13,7 +13,7 @@
 import rx.Single;
 import rx.functions.Action1;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/GetObjectStub.java

@@ -14,7 +14,7 @@
 import rx.Single;
 import rx.functions.Action1;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/GetObjectsStub.java

@@ -21,7 +21,7 @@
 import rx.functions.Action1;
 
 import static com.pushtorefresh.storio.test.Asserts.assertThatListIsImmutable;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/PreparedGetCursorTest.java

@@ -12,7 +12,7 @@
 import rx.Observable;
 import rx.Single;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/PreparedGetListOfObjectsTest.java

@@ -19,7 +19,7 @@
 import rx.Single;
 import rx.observers.TestSubscriber;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/PreparedGetNumberOfResultsTest.java

@@ -16,7 +16,7 @@
 import rx.observers.TestSubscriber;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.assertj.core.api.Fail.failBecauseExceptionWasNotThrown;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/PreparedGetObjectTest.java

@@ -17,7 +17,7 @@
 import rx.Single;
 import rx.observers.TestSubscriber;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/DefaultPutResolverTest.java

@@ -18,7 +18,7 @@
 
 import rx.functions.Func1;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
 import static org.mockito.Matchers.any;

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PreparedPutCollectionOfObjectsTest.java

@@ -20,7 +20,7 @@
 import rx.observers.TestSubscriber;
 
 import static java.util.Arrays.asList;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
@@ -286,7 +286,7 @@ public void shouldThrowExceptionIfNoTypeMappingWasFoundWithoutAffectingContentPr
         }
     }
 
-    class OtherTests {
+    public static class OtherTests {
 
         @Test
         public void putCollectionOfObjectsObservableExecutesOnSpecifiedScheduler() {

storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PreparedPutObjectTest.java

@@ -17,7 +17,7 @@
 import rx.Single;
 import rx.observers.TestSubscriber;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
@@ -275,7 +275,7 @@ public void shouldThrowExceptionIfNoTypeMappingWasFoundWithoutAffectingContentPr
         }
     }
 
-    class OtherTests {
+    public static class OtherTests {
 
         @Test
         public void putObjectObservableExecutesOnSpecifiedScheduler() {