diff --git a/build.gradle b/build.gradle index 08316e631..1fbb074a6 100644 --- a/build.gradle +++ b/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, diff --git a/storio-common-annotations-processor/src/test/java/com/pushtorefresh/storio/common/annotations/processor/introspection/JavaTypeTest.java b/storio-common-annotations-processor/src/test/java/com/pushtorefresh/storio/common/annotations/processor/introspection/JavaTypeTest.java index a7d4a9eb2..2fa6edcaf 100644 --- a/storio-common-annotations-processor/src/test/java/com/pushtorefresh/storio/common/annotations/processor/introspection/JavaTypeTest.java +++ b/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; diff --git a/storio-common-annotations-processor/src/test/java/com/pushtorefresh/storio/common/annotations/processor/introspection/StorIOColumnMetaTest.java b/storio-common-annotations-processor/src/test/java/com/pushtorefresh/storio/common/annotations/processor/introspection/StorIOColumnMetaTest.java index 1ee34a876..453e12392 100644 --- a/storio-common-annotations-processor/src/test/java/com/pushtorefresh/storio/common/annotations/processor/introspection/StorIOColumnMetaTest.java +++ b/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 { diff --git a/storio-common-annotations-processor/src/test/java/com/pushtorefresh/storio/common/annotations/processor/introspection/StorIOTypeMetaTest.java b/storio-common-annotations-processor/src/test/java/com/pushtorefresh/storio/common/annotations/processor/introspection/StorIOTypeMetaTest.java index 1a024a642..f232896d8 100644 --- a/storio-common-annotations-processor/src/test/java/com/pushtorefresh/storio/common/annotations/processor/introspection/StorIOTypeMetaTest.java +++ b/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 { diff --git a/storio-common/src/test/java/com/pushtorefresh/storio/QueriesTest.java b/storio-common/src/test/java/com/pushtorefresh/storio/QueriesTest.java index 261d48b1b..d32c28ade 100644 --- a/storio-common/src/test/java/com/pushtorefresh/storio/QueriesTest.java +++ b/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 { diff --git a/storio-common/src/test/java/com/pushtorefresh/storio/StorIOExceptionTest.java b/storio-common/src/test/java/com/pushtorefresh/storio/StorIOExceptionTest.java index 8cc9d8b1f..cee1af63e 100644 --- a/storio-common/src/test/java/com/pushtorefresh/storio/StorIOExceptionTest.java +++ b/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 { diff --git a/storio-common/src/test/java/com/pushtorefresh/storio/TypeMappingFinderImplTest.java b/storio-common/src/test/java/com/pushtorefresh/storio/TypeMappingFinderImplTest.java index 04e64db78..48339e292 100644 --- a/storio-common/src/test/java/com/pushtorefresh/storio/TypeMappingFinderImplTest.java +++ b/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; diff --git a/storio-common/src/test/java/com/pushtorefresh/storio/internal/ChangesBusTest.java b/storio-common/src/test/java/com/pushtorefresh/storio/internal/ChangesBusTest.java index b856315f8..d425c5257 100644 --- a/storio-common/src/test/java/com/pushtorefresh/storio/internal/ChangesBusTest.java +++ b/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 { diff --git a/storio-common/src/test/java/com/pushtorefresh/storio/internal/ChecksTest.java b/storio-common/src/test/java/com/pushtorefresh/storio/internal/ChecksTest.java index e5355762c..f090c71ac 100644 --- a/storio-common/src/test/java/com/pushtorefresh/storio/internal/ChecksTest.java +++ b/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 { diff --git a/storio-common/src/test/java/com/pushtorefresh/storio/internal/EnvironmentTest.java b/storio-common/src/test/java/com/pushtorefresh/storio/internal/EnvironmentTest.java index 5a8c47e4f..339fc728f 100644 --- a/storio-common/src/test/java/com/pushtorefresh/storio/internal/EnvironmentTest.java +++ b/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 { diff --git a/storio-common/src/test/java/com/pushtorefresh/storio/internal/InternalQueriesTest.java b/storio-common/src/test/java/com/pushtorefresh/storio/internal/InternalQueriesTest.java index 135fb428e..83c6378a1 100644 --- a/storio-common/src/test/java/com/pushtorefresh/storio/internal/InternalQueriesTest.java +++ b/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 { diff --git a/storio-common/src/test/java/com/pushtorefresh/storio/operations/internal/MapSomethingToExecuteAsBlockingTest.java b/storio-common/src/test/java/com/pushtorefresh/storio/operations/internal/MapSomethingToExecuteAsBlockingTest.java index c4033ff68..91160d59c 100644 --- a/storio-common/src/test/java/com/pushtorefresh/storio/operations/internal/MapSomethingToExecuteAsBlockingTest.java +++ b/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; diff --git a/storio-common/src/test/java/com/pushtorefresh/storio/operations/internal/OnSubscribeExecuteAsBlockingTest.java b/storio-common/src/test/java/com/pushtorefresh/storio/operations/internal/OnSubscribeExecuteAsBlockingTest.java index 2a46ea87d..4c2fb7bee 100644 --- a/storio-common/src/test/java/com/pushtorefresh/storio/operations/internal/OnSubscribeExecuteAsBlockingTest.java +++ b/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; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/ChangesTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/ChangesTest.java index c9531a194..9849cf252 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/ChangesTest.java +++ b/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 diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/ContentResolverTypeMappingTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/ContentResolverTypeMappingTest.java index afb2da4ad..3660f3d1b 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/ContentResolverTypeMappingTest.java +++ b/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 { diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/impl/DefaultStorIOContentResolverTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/impl/DefaultStorIOContentResolverTest.java index eaa5b8915..f0a85a6f9 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/impl/DefaultStorIOContentResolverTest.java +++ b/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; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/impl/RxChangesObserverTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/impl/RxChangesObserverTest.java index 7e85e78bd..04941cfcf 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/impl/RxChangesObserverTest.java +++ b/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; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/integration/DeleteOperationTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/integration/DeleteOperationTest.java index bf19f126c..13c5e124e 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/integration/DeleteOperationTest.java +++ b/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) diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/integration/GetOperationTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/integration/GetOperationTest.java index 826e3df95..f590fbdf3 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/integration/GetOperationTest.java +++ b/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) diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/integration/PutOperationTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/integration/PutOperationTest.java index 438ea0e98..10a4f383e 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/integration/PutOperationTest.java +++ b/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) diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DefaultDeleteResolverTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DefaultDeleteResolverTest.java index 680bfea51..44333c63b 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DefaultDeleteResolverTest.java +++ b/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; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DeleteByQueryStub.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DeleteByQueryStub.java index 1fa416ec9..b177f3f9c 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DeleteByQueryStub.java +++ b/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; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DeleteObjectsStub.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DeleteObjectsStub.java index 56bd148ea..166bc5039 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DeleteObjectsStub.java +++ b/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; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DeleteResultTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DeleteResultTest.java index 05f15188e..b49e88b16 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DeleteResultTest.java +++ b/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 diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DeleteResultsTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DeleteResultsTest.java index 60cb54828..6cb1e2aba 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/DeleteResultsTest.java +++ b/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 diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/PreparedDeleteCollectionOfObjectsTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/PreparedDeleteCollectionOfObjectsTest.java index 7dbb850f5..04ce7c475 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/PreparedDeleteCollectionOfObjectsTest.java +++ b/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() { diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/PreparedDeleteObjectTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/PreparedDeleteObjectTest.java index e3ec07132..c91731fbd 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/delete/PreparedDeleteObjectTest.java +++ b/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() { diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/DefaultGetResolverTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/DefaultGetResolverTest.java index d7e2dfc44..e6b8dc92c 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/DefaultGetResolverTest.java +++ b/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; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/GetCursorStub.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/GetCursorStub.java index dba4b0895..a32d2960b 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/GetCursorStub.java +++ b/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; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/GetNumberOfResultsStub.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/GetNumberOfResultsStub.java index 4086fe2d8..5c1bac17d 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/GetNumberOfResultsStub.java +++ b/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; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/GetObjectStub.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/GetObjectStub.java index 95caa4fe1..09aadbbe1 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/GetObjectStub.java +++ b/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; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/GetObjectsStub.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/GetObjectsStub.java index aedd27a76..814a23a94 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/GetObjectsStub.java +++ b/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; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/PreparedGetCursorTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/PreparedGetCursorTest.java index 8ced6f60b..99e05e34c 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/PreparedGetCursorTest.java +++ b/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; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/PreparedGetListOfObjectsTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/PreparedGetListOfObjectsTest.java index f92e4dbc3..502ca1f73 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/PreparedGetListOfObjectsTest.java +++ b/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; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/PreparedGetNumberOfResultsTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/PreparedGetNumberOfResultsTest.java index 3ad66f0e5..d1b17b770 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/PreparedGetNumberOfResultsTest.java +++ b/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; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/PreparedGetObjectTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/PreparedGetObjectTest.java index bff1abd39..3767bfbd8 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/get/PreparedGetObjectTest.java +++ b/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; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/DefaultPutResolverTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/DefaultPutResolverTest.java index 32fef8dd7..9969b8159 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/DefaultPutResolverTest.java +++ b/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; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PreparedPutCollectionOfObjectsTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PreparedPutCollectionOfObjectsTest.java index eef0b2c0a..c5108e332 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PreparedPutCollectionOfObjectsTest.java +++ b/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() { diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PreparedPutObjectTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PreparedPutObjectTest.java index f0af1e0bc..cb1afe834 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PreparedPutObjectTest.java +++ b/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() { diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PutObjectsStub.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PutObjectsStub.java index 4cf6e1d3c..9f4885670 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PutObjectsStub.java +++ b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PutObjectsStub.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; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PutResultTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PutResultTest.java index da3e31fdd..a422cea41 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PutResultTest.java +++ b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PutResultTest.java @@ -12,7 +12,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.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; import static org.mockito.Mockito.mock; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PutResultsTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PutResultsTest.java index b347d69a4..2c0403309 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PutResultsTest.java +++ b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/operations/put/PutResultsTest.java @@ -16,7 +16,7 @@ import nl.jqno.equalsverifier.EqualsVerifier; import static java.util.Collections.singletonMap; -import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Java6Assertions.assertThat; @RunWith(RobolectricTestRunner.class) // Required for correct Uri impl @Config(constants = BuildConfig.class, sdk = 21) diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/queries/DeleteQueryTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/queries/DeleteQueryTest.java index 75485e7bb..ef9229fa5 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/queries/DeleteQueryTest.java +++ b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/queries/DeleteQueryTest.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.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; import static org.mockito.Mockito.mock; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/queries/InsertQueryTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/queries/InsertQueryTest.java index 1b5b2b801..6e1eae569 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/queries/InsertQueryTest.java +++ b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/queries/InsertQueryTest.java @@ -12,7 +12,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.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; import static org.mockito.Mockito.mock; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/queries/QueryTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/queries/QueryTest.java index 7059f98d5..5d806e34b 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/queries/QueryTest.java +++ b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/queries/QueryTest.java @@ -13,7 +13,7 @@ import nl.jqno.equalsverifier.EqualsVerifier; 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.Mockito.mock; diff --git a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/queries/UpdateQueryTest.java b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/queries/UpdateQueryTest.java index 2914a99a0..107248c73 100644 --- a/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/queries/UpdateQueryTest.java +++ b/storio-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/queries/UpdateQueryTest.java @@ -13,7 +13,7 @@ import nl.jqno.equalsverifier.EqualsVerifier; 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.Mockito.mock; diff --git a/storio-sample-app/src/test/java/com/pushtorefresh/storio/sample/db/DbOpenHelperTest.java b/storio-sample-app/src/test/java/com/pushtorefresh/storio/sample/db/DbOpenHelperTest.java index 718205348..db6eca57e 100644 --- a/storio-sample-app/src/test/java/com/pushtorefresh/storio/sample/db/DbOpenHelperTest.java +++ b/storio-sample-app/src/test/java/com/pushtorefresh/storio/sample/db/DbOpenHelperTest.java @@ -10,7 +10,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -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) diff --git a/storio-sample-app/src/test/java/com/pushtorefresh/storio/sample/sample_code/RelationsTest.java b/storio-sample-app/src/test/java/com/pushtorefresh/storio/sample/sample_code/RelationsTest.java index 4f0727b76..ea1539bf7 100644 --- a/storio-sample-app/src/test/java/com/pushtorefresh/storio/sample/sample_code/RelationsTest.java +++ b/storio-sample-app/src/test/java/com/pushtorefresh/storio/sample/sample_code/RelationsTest.java @@ -15,7 +15,7 @@ import java.util.List; import static java.util.Arrays.asList; -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) diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/ChangesTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/ChangesTest.java index ba2ef306d..6aa39f1d9 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/ChangesTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/ChangesTest.java @@ -15,7 +15,7 @@ import static java.util.Collections.singleton; import static java.util.Collections.singletonList; -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.hamcrest.CoreMatchers.startsWith; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/SQLiteTypeMappingTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/SQLiteTypeMappingTest.java index a18a756f9..abbe96955 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/SQLiteTypeMappingTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/SQLiteTypeMappingTest.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 SQLiteTypeMappingTest { diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/impl/DefaultStorIOSQLiteTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/impl/DefaultStorIOSQLiteTest.java index cef3971f9..e2d94fcdb 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/impl/DefaultStorIOSQLiteTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/impl/DefaultStorIOSQLiteTest.java @@ -35,7 +35,7 @@ import rx.Scheduler; import rx.observers.TestSubscriber; -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.eq; import static org.mockito.Matchers.same; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/BaseTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/BaseTest.java index 6b057c535..a8e92162a 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/BaseTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/BaseTest.java @@ -24,7 +24,7 @@ import rx.Scheduler; import rx.schedulers.Schedulers; -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) diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/DeleteTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/DeleteTest.java index 6eebf87d9..0932e8f42 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/DeleteTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/DeleteTest.java @@ -13,7 +13,7 @@ import java.util.ArrayList; import java.util.List; -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) diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/ExecSQLTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/ExecSQLTest.java index 69d34c4dd..0cf4bcfe1 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/ExecSQLTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/ExecSQLTest.java @@ -10,7 +10,7 @@ import java.util.List; -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) diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/InsertTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/InsertTest.java index 3ba7f864d..93cd2d869 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/InsertTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/InsertTest.java @@ -11,7 +11,7 @@ import java.util.List; -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) diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/NotifyAboutChangesTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/NotifyAboutChangesTest.java index 739169cad..88a1163df 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/NotifyAboutChangesTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/NotifyAboutChangesTest.java @@ -22,7 +22,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) diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/QueryTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/QueryTest.java index cbd377eb0..cf391b8f6 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/QueryTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/QueryTest.java @@ -19,7 +19,7 @@ import java.util.Collections; import java.util.List; -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) diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/RxQueryTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/RxQueryTest.java index bb22e4671..09107a0a7 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/RxQueryTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/RxQueryTest.java @@ -25,7 +25,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) diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/UpdateTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/UpdateTest.java index edc7aef09..1a876b5be 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/UpdateTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/UpdateTest.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; -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) diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/auto_parcel/AutoParcelTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/auto_parcel/AutoParcelTest.java index 1cc5e0a75..2119cb94e 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/auto_parcel/AutoParcelTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/auto_parcel/AutoParcelTest.java @@ -20,7 +20,7 @@ import java.util.List; -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) diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/DefaultDeleteResolverTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/DefaultDeleteResolverTest.java index 3edede641..830756d34 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/DefaultDeleteResolverTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/DefaultDeleteResolverTest.java @@ -10,7 +10,7 @@ import java.util.Set; 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.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/DeleteResultTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/DeleteResultTest.java index 23ee60bd1..b89b6e9ce 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/DeleteResultTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/DeleteResultTest.java @@ -12,7 +12,7 @@ import nl.jqno.equalsverifier.EqualsVerifier; 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.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.CoreMatchers.startsWith; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/DeleteResultsTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/DeleteResultsTest.java index efab16bd0..fbc6aa607 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/DeleteResultsTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/DeleteResultsTest.java @@ -9,7 +9,7 @@ import nl.jqno.equalsverifier.EqualsVerifier; -import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Java6Assertions.assertThat; public class DeleteResultsTest { diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/PreparedDeleteByQueryTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/PreparedDeleteByQueryTest.java index 5e2ce190f..5d57e8288 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/PreparedDeleteByQueryTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/PreparedDeleteByQueryTest.java @@ -11,7 +11,7 @@ import rx.Observable; 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.Matchers.same; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/PreparedDeleteCollectionOfObjectsTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/PreparedDeleteCollectionOfObjectsTest.java index 88da374fc..6424f6926 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/PreparedDeleteCollectionOfObjectsTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/PreparedDeleteCollectionOfObjectsTest.java @@ -19,10 +19,9 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; -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.Matchers.anyObject; import static org.mockito.Matchers.same; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -640,7 +639,7 @@ public void shouldFinishTransactionIfExceptionHasOccurredBlocking() { //noinspection unchecked final DeleteResolver deleteResolver = mock(DeleteResolver.class); - when(deleteResolver.performDelete(same(storIOSQLite), anyObject())) + when(deleteResolver.performDelete(same(storIOSQLite), any())) .thenThrow(new IllegalStateException("test exception")); try { @@ -660,7 +659,7 @@ public void shouldFinishTransactionIfExceptionHasOccurredBlocking() { verify(internal).endTransaction(); verify(storIOSQLite).lowLevel(); - verify(deleteResolver).performDelete(same(storIOSQLite), anyObject()); + verify(deleteResolver).performDelete(same(storIOSQLite), any()); verifyNoMoreInteractions(storIOSQLite, internal, deleteResolver); } } @@ -675,7 +674,7 @@ public void shouldFinishTransactionIfExceptionHasOccurredObservable() { //noinspection unchecked final DeleteResolver deleteResolver = mock(DeleteResolver.class); - when(deleteResolver.performDelete(same(storIOSQLite), anyObject())) + when(deleteResolver.performDelete(same(storIOSQLite), any())) .thenThrow(new IllegalStateException("test exception")); final TestSubscriber> testSubscriber = new TestSubscriber>(); @@ -703,7 +702,7 @@ public void shouldFinishTransactionIfExceptionHasOccurredObservable() { verify(storIOSQLite).lowLevel(); verify(storIOSQLite).defaultScheduler(); - verify(deleteResolver).performDelete(same(storIOSQLite), anyObject()); + verify(deleteResolver).performDelete(same(storIOSQLite), any()); verifyNoMoreInteractions(storIOSQLite, internal, deleteResolver); } @@ -717,7 +716,7 @@ public void shouldFinishTransactionIfExceptionHasOccurredSingle() { //noinspection unchecked final DeleteResolver deleteResolver = mock(DeleteResolver.class); - when(deleteResolver.performDelete(same(storIOSQLite), anyObject())) + when(deleteResolver.performDelete(same(storIOSQLite), any())) .thenThrow(new IllegalStateException("test exception")); final TestSubscriber> testSubscriber = new TestSubscriber>(); @@ -745,7 +744,7 @@ public void shouldFinishTransactionIfExceptionHasOccurredSingle() { verify(storIOSQLite).lowLevel(); verify(storIOSQLite).defaultScheduler(); - verify(deleteResolver).performDelete(same(storIOSQLite), anyObject()); + verify(deleteResolver).performDelete(same(storIOSQLite), any()); verifyNoMoreInteractions(storIOSQLite, internal, deleteResolver); } @@ -759,7 +758,7 @@ public void shouldFinishTransactionIfExceptionHasOccurredCompletable() { //noinspection unchecked final DeleteResolver deleteResolver = mock(DeleteResolver.class); - when(deleteResolver.performDelete(same(storIOSQLite), anyObject())) + when(deleteResolver.performDelete(same(storIOSQLite), any())) .thenThrow(new IllegalStateException("test exception")); final TestSubscriber> testSubscriber = new TestSubscriber>(); @@ -787,7 +786,7 @@ public void shouldFinishTransactionIfExceptionHasOccurredCompletable() { verify(storIOSQLite).lowLevel(); verify(storIOSQLite).defaultScheduler(); - verify(deleteResolver).performDelete(same(storIOSQLite), anyObject()); + verify(deleteResolver).performDelete(same(storIOSQLite), any()); verifyNoMoreInteractions(storIOSQLite, internal, deleteResolver); } diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/PreparedDeleteObjectTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/PreparedDeleteObjectTest.java index 85122c8ed..e07a59570 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/delete/PreparedDeleteObjectTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/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.doReturn; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/execute/PreparedExecuteSQLTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/execute/PreparedExecuteSQLTest.java index c6d2cbf03..b912ea8ab 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/execute/PreparedExecuteSQLTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/execute/PreparedExecuteSQLTest.java @@ -22,7 +22,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.hamcrest.CoreMatchers.equalTo; import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/DefaultGetResolverTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/DefaultGetResolverTest.java index 935677b69..0cccaf04c 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/DefaultGetResolverTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/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; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/GetCursorStub.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/GetCursorStub.java index 3b21cc4dd..c9bac0582 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/GetCursorStub.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/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; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/GetNumberOfResultsStub.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/GetNumberOfResultsStub.java index 5cb1c6841..3a4d74af0 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/GetNumberOfResultsStub.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/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.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/GetObjectStub.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/GetObjectStub.java index 5007ba9c9..10b335c49 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/GetObjectStub.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/GetObjectStub.java @@ -18,7 +18,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; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/GetObjectsStub.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/GetObjectsStub.java index 81531f754..e654a54d8 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/GetObjectsStub.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/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; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/PreparedGetCursorTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/PreparedGetCursorTest.java index 44af2e325..442bc8a04 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/PreparedGetCursorTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/PreparedGetCursorTest.java @@ -15,7 +15,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.Assertions.failBecauseExceptionWasNotThrown; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/PreparedGetListOfObjectsTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/PreparedGetListOfObjectsTest.java index 5d677f2b4..17e912965 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/PreparedGetListOfObjectsTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/PreparedGetListOfObjectsTest.java @@ -20,7 +20,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.Matchers.eq; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/PreparedGetNumberOfResultsTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/PreparedGetNumberOfResultsTest.java index a20e928ee..b88391d77 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/PreparedGetNumberOfResultsTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/PreparedGetNumberOfResultsTest.java @@ -15,7 +15,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.Assertions.failBecauseExceptionWasNotThrown; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/PreparedGetObjectTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/PreparedGetObjectTest.java index 62c475906..b9836e8f1 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/PreparedGetObjectTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/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.Matchers.eq; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/DefaultPutResolverTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/DefaultPutResolverTest.java index 9bf2c6b40..925c476ba 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/DefaultPutResolverTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/DefaultPutResolverTest.java @@ -19,7 +19,7 @@ import rx.functions.Func1; 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.assertj.core.api.Assertions.fail; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PreparedPutCollectionOfObjectsTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PreparedPutCollectionOfObjectsTest.java index 400ae27f9..05802d570 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PreparedPutCollectionOfObjectsTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PreparedPutCollectionOfObjectsTest.java @@ -22,10 +22,9 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; -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.Matchers.anyObject; import static org.mockito.Matchers.same; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -582,14 +581,14 @@ public static class OtherTests { @Test public void shouldFinishTransactionIfExceptionHasOccurredBlocking() { final StorIOSQLite storIOSQLite = mock(StorIOSQLite.class); - final StorIOSQLite.Internal internal = mock(StorIOSQLite.Internal.class); + final StorIOSQLite.LowLevel lowLevel = mock(StorIOSQLite.LowLevel.class); - when(storIOSQLite.lowLevel()).thenReturn(internal); + when(storIOSQLite.lowLevel()).thenReturn(lowLevel); //noinspection unchecked final PutResolver putResolver = mock(PutResolver.class); - when(putResolver.performPut(same(storIOSQLite), anyObject())) + when(putResolver.performPut(same(storIOSQLite), any())) .thenThrow(new IllegalStateException("test exception")); final List objects = singletonList(new Object()); @@ -606,27 +605,27 @@ public void shouldFinishTransactionIfExceptionHasOccurredBlocking() { IllegalStateException cause = (IllegalStateException) expected.getCause(); assertThat(cause).hasMessage("test exception"); - verify(internal).beginTransaction(); - verify(internal, never()).setTransactionSuccessful(); - verify(internal).endTransaction(); + verify(lowLevel).beginTransaction(); + verify(lowLevel, never()).setTransactionSuccessful(); + verify(lowLevel).endTransaction(); verify(storIOSQLite).lowLevel(); - verify(putResolver).performPut(same(storIOSQLite), anyObject()); - verifyNoMoreInteractions(storIOSQLite, internal, putResolver); + verify(putResolver).performPut(same(storIOSQLite), any()); + verifyNoMoreInteractions(storIOSQLite, lowLevel, putResolver); } } @Test public void shouldFinishTransactionIfExceptionHasOccurredObservable() { final StorIOSQLite storIOSQLite = mock(StorIOSQLite.class); - final StorIOSQLite.Internal internal = mock(StorIOSQLite.Internal.class); + final StorIOSQLite.LowLevel lowLevel = mock(StorIOSQLite.LowLevel.class); - when(storIOSQLite.lowLevel()).thenReturn(internal); + when(storIOSQLite.lowLevel()).thenReturn(lowLevel); //noinspection unchecked final PutResolver putResolver = mock(PutResolver.class); - when(putResolver.performPut(same(storIOSQLite), anyObject())) + when(putResolver.performPut(same(storIOSQLite), any())) .thenThrow(new IllegalStateException("test exception")); final List objects = singletonList(new Object()); @@ -649,27 +648,27 @@ public void shouldFinishTransactionIfExceptionHasOccurredObservable() { IllegalStateException cause = (IllegalStateException) expected.getCause(); assertThat(cause).hasMessage("test exception"); - verify(internal).beginTransaction(); - verify(internal, never()).setTransactionSuccessful(); - verify(internal).endTransaction(); + verify(lowLevel).beginTransaction(); + verify(lowLevel, never()).setTransactionSuccessful(); + verify(lowLevel).endTransaction(); verify(storIOSQLite).lowLevel(); verify(storIOSQLite).defaultScheduler(); - verify(putResolver).performPut(same(storIOSQLite), anyObject()); - verifyNoMoreInteractions(storIOSQLite, internal, putResolver); + verify(putResolver).performPut(same(storIOSQLite), any()); + verifyNoMoreInteractions(storIOSQLite, lowLevel, putResolver); } @Test public void shouldFinishTransactionIfExceptionHasOccurredSingle() { final StorIOSQLite storIOSQLite = mock(StorIOSQLite.class); - final StorIOSQLite.Internal internal = mock(StorIOSQLite.Internal.class); + final StorIOSQLite.LowLevel lowLevel = mock(StorIOSQLite.LowLevel.class); - when(storIOSQLite.lowLevel()).thenReturn(internal); + when(storIOSQLite.lowLevel()).thenReturn(lowLevel); //noinspection unchecked final PutResolver putResolver = mock(PutResolver.class); - when(putResolver.performPut(same(storIOSQLite), anyObject())) + when(putResolver.performPut(same(storIOSQLite), any())) .thenThrow(new IllegalStateException("test exception")); final List objects = singletonList(new Object()); @@ -692,27 +691,27 @@ public void shouldFinishTransactionIfExceptionHasOccurredSingle() { IllegalStateException cause = (IllegalStateException) expected.getCause(); assertThat(cause).hasMessage("test exception"); - verify(internal).beginTransaction(); - verify(internal, never()).setTransactionSuccessful(); - verify(internal).endTransaction(); + verify(lowLevel).beginTransaction(); + verify(lowLevel, never()).setTransactionSuccessful(); + verify(lowLevel).endTransaction(); verify(storIOSQLite).lowLevel(); verify(storIOSQLite).defaultScheduler(); - verify(putResolver).performPut(same(storIOSQLite), anyObject()); - verifyNoMoreInteractions(storIOSQLite, internal, putResolver); + verify(putResolver).performPut(same(storIOSQLite), any()); + verifyNoMoreInteractions(storIOSQLite, lowLevel, putResolver); } @Test public void shouldFinishTransactionIfExceptionHasOccurredCompletable() { final StorIOSQLite storIOSQLite = mock(StorIOSQLite.class); - final StorIOSQLite.Internal internal = mock(StorIOSQLite.Internal.class); + final StorIOSQLite.LowLevel lowLevel = mock(StorIOSQLite.LowLevel.class); - when(storIOSQLite.lowLevel()).thenReturn(internal); + when(storIOSQLite.lowLevel()).thenReturn(lowLevel); //noinspection unchecked final PutResolver putResolver = mock(PutResolver.class); - when(putResolver.performPut(same(storIOSQLite), anyObject())) + when(putResolver.performPut(same(storIOSQLite), any())) .thenThrow(new IllegalStateException("test exception")); final List objects = singletonList(new Object()); @@ -735,27 +734,27 @@ public void shouldFinishTransactionIfExceptionHasOccurredCompletable() { IllegalStateException cause = (IllegalStateException) expected.getCause(); assertThat(cause).hasMessage("test exception"); - verify(internal).beginTransaction(); - verify(internal, never()).setTransactionSuccessful(); - verify(internal).endTransaction(); + verify(lowLevel).beginTransaction(); + verify(lowLevel, never()).setTransactionSuccessful(); + verify(lowLevel).endTransaction(); verify(storIOSQLite).lowLevel(); verify(storIOSQLite).defaultScheduler(); - verify(putResolver).performPut(same(storIOSQLite), anyObject()); - verifyNoMoreInteractions(storIOSQLite, internal, putResolver); + verify(putResolver).performPut(same(storIOSQLite), any()); + verifyNoMoreInteractions(storIOSQLite, lowLevel, putResolver); } @Test public void verifyBehaviorInCaseOfExceptionWithoutTransactionBlocking() { final StorIOSQLite storIOSQLite = mock(StorIOSQLite.class); - final StorIOSQLite.Internal internal = mock(StorIOSQLite.Internal.class); + final StorIOSQLite.LowLevel lowLevel = mock(StorIOSQLite.LowLevel.class); - when(storIOSQLite.lowLevel()).thenReturn(internal); + when(storIOSQLite.lowLevel()).thenReturn(lowLevel); //noinspection unchecked final PutResolver putResolver = mock(PutResolver.class); - when(putResolver.performPut(same(storIOSQLite), anyObject())) + when(putResolver.performPut(same(storIOSQLite), any())) .thenThrow(new IllegalStateException("test exception")); final List objects = singletonList(new Object()); @@ -773,27 +772,27 @@ public void verifyBehaviorInCaseOfExceptionWithoutTransactionBlocking() { assertThat(cause).hasMessage("test exception"); // Main checks of this test - verify(internal, never()).beginTransaction(); - verify(internal, never()).setTransactionSuccessful(); - verify(internal, never()).endTransaction(); + verify(lowLevel, never()).beginTransaction(); + verify(lowLevel, never()).setTransactionSuccessful(); + verify(lowLevel, never()).endTransaction(); verify(storIOSQLite).lowLevel(); - verify(putResolver).performPut(same(storIOSQLite), anyObject()); - verifyNoMoreInteractions(storIOSQLite, internal, putResolver); + verify(putResolver).performPut(same(storIOSQLite), any()); + verifyNoMoreInteractions(storIOSQLite, lowLevel, putResolver); } } @Test public void verifyBehaviorInCaseOfExceptionWithoutTransactionObservable() { final StorIOSQLite storIOSQLite = mock(StorIOSQLite.class); - final StorIOSQLite.Internal internal = mock(StorIOSQLite.Internal.class); + final StorIOSQLite.LowLevel lowLevel = mock(StorIOSQLite.LowLevel.class); - when(storIOSQLite.lowLevel()).thenReturn(internal); + when(storIOSQLite.lowLevel()).thenReturn(lowLevel); //noinspection unchecked final PutResolver putResolver = mock(PutResolver.class); - when(putResolver.performPut(same(storIOSQLite), anyObject())) + when(putResolver.performPut(same(storIOSQLite), any())) .thenThrow(new IllegalStateException("test exception")); final List objects = singletonList(new Object()); @@ -818,27 +817,27 @@ public void verifyBehaviorInCaseOfExceptionWithoutTransactionObservable() { assertThat(cause).hasMessage("test exception"); // Main checks of this test - verify(internal, never()).beginTransaction(); - verify(internal, never()).setTransactionSuccessful(); - verify(internal, never()).endTransaction(); + verify(lowLevel, never()).beginTransaction(); + verify(lowLevel, never()).setTransactionSuccessful(); + verify(lowLevel, never()).endTransaction(); verify(storIOSQLite).lowLevel(); verify(storIOSQLite).defaultScheduler(); - verify(putResolver).performPut(same(storIOSQLite), anyObject()); - verifyNoMoreInteractions(storIOSQLite, internal, putResolver); + verify(putResolver).performPut(same(storIOSQLite), any()); + verifyNoMoreInteractions(storIOSQLite, lowLevel, putResolver); } @Test public void verifyBehaviorInCaseOfExceptionWithoutTransactionSingle() { final StorIOSQLite storIOSQLite = mock(StorIOSQLite.class); - final StorIOSQLite.Internal internal = mock(StorIOSQLite.Internal.class); + final StorIOSQLite.LowLevel lowLevel = mock(StorIOSQLite.LowLevel.class); - when(storIOSQLite.lowLevel()).thenReturn(internal); + when(storIOSQLite.lowLevel()).thenReturn(lowLevel); //noinspection unchecked final PutResolver putResolver = mock(PutResolver.class); - when(putResolver.performPut(same(storIOSQLite), anyObject())) + when(putResolver.performPut(same(storIOSQLite), any())) .thenThrow(new IllegalStateException("test exception")); final List objects = singletonList(new Object()); @@ -863,27 +862,27 @@ public void verifyBehaviorInCaseOfExceptionWithoutTransactionSingle() { assertThat(cause).hasMessage("test exception"); // Main checks of this test - verify(internal, never()).beginTransaction(); - verify(internal, never()).setTransactionSuccessful(); - verify(internal, never()).endTransaction(); + verify(lowLevel, never()).beginTransaction(); + verify(lowLevel, never()).setTransactionSuccessful(); + verify(lowLevel, never()).endTransaction(); verify(storIOSQLite).lowLevel(); verify(storIOSQLite).defaultScheduler(); - verify(putResolver).performPut(same(storIOSQLite), anyObject()); - verifyNoMoreInteractions(storIOSQLite, internal, putResolver); + verify(putResolver).performPut(same(storIOSQLite), any()); + verifyNoMoreInteractions(storIOSQLite, lowLevel, putResolver); } @Test public void verifyBehaviorInCaseOfExceptionWithoutTransactionCompletable() { final StorIOSQLite storIOSQLite = mock(StorIOSQLite.class); - final StorIOSQLite.Internal internal = mock(StorIOSQLite.Internal.class); + final StorIOSQLite.LowLevel lowLevel = mock(StorIOSQLite.LowLevel.class); - when(storIOSQLite.lowLevel()).thenReturn(internal); + when(storIOSQLite.lowLevel()).thenReturn(lowLevel); //noinspection unchecked final PutResolver putResolver = mock(PutResolver.class); - when(putResolver.performPut(same(storIOSQLite), anyObject())) + when(putResolver.performPut(same(storIOSQLite), any())) .thenThrow(new IllegalStateException("test exception")); final List objects = singletonList(new Object()); @@ -908,14 +907,14 @@ public void verifyBehaviorInCaseOfExceptionWithoutTransactionCompletable() { assertThat(cause).hasMessage("test exception"); // Main checks of this test - verify(internal, never()).beginTransaction(); - verify(internal, never()).setTransactionSuccessful(); - verify(internal, never()).endTransaction(); + verify(lowLevel, never()).beginTransaction(); + verify(lowLevel, never()).setTransactionSuccessful(); + verify(lowLevel, never()).endTransaction(); verify(storIOSQLite).lowLevel(); verify(storIOSQLite).defaultScheduler(); - verify(putResolver).performPut(same(storIOSQLite), anyObject()); - verifyNoMoreInteractions(storIOSQLite, internal, putResolver); + verify(putResolver).performPut(same(storIOSQLite), any()); + verifyNoMoreInteractions(storIOSQLite, lowLevel, putResolver); } @Test diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PreparedPutContentValuesIterableTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PreparedPutContentValuesIterableTest.java index 608ee274b..7b49378e2 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PreparedPutContentValuesIterableTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PreparedPutContentValuesIterableTest.java @@ -19,7 +19,7 @@ import rx.observers.TestSubscriber; import static java.util.Collections.singletonList; -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.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.startsWith; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PreparedPutContentValuesTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PreparedPutContentValuesTest.java index 84c6d4de1..e3050d4a2 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PreparedPutContentValuesTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PreparedPutContentValuesTest.java @@ -13,7 +13,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.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.startsWith; import static org.mockito.Mockito.doReturn; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PreparedPutObjectTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PreparedPutObjectTest.java index 9661f22f1..595524611 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PreparedPutObjectTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PreparedPutObjectTest.java @@ -13,7 +13,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.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PutObjectsStub.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PutObjectsStub.java index 07aa3f74f..7adf6953b 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PutObjectsStub.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PutObjectsStub.java @@ -23,7 +23,7 @@ import static java.util.Collections.singleton; import static java.util.Collections.singletonMap; -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; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PutResultTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PutResultTest.java index 38bc8dc97..44df1f0c1 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PutResultTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PutResultTest.java @@ -17,7 +17,7 @@ import static java.util.Arrays.asList; 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.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.CoreMatchers.startsWith; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PutResultsTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PutResultsTest.java index ce28a3c5d..eb0f29d6e 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PutResultsTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/operations/put/PutResultsTest.java @@ -10,7 +10,7 @@ import nl.jqno.equalsverifier.EqualsVerifier; import static java.util.Collections.singletonMap; -import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Java6Assertions.assertThat; public class PutResultsTest { diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/DeleteQueryTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/DeleteQueryTest.java index 33a650710..54062d6eb 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/DeleteQueryTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/DeleteQueryTest.java @@ -14,7 +14,7 @@ import static java.util.Collections.singleton; import static java.util.Collections.singletonList; -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.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/InsertQueryTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/InsertQueryTest.java index 87cee3917..c41b4ecde 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/InsertQueryTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/InsertQueryTest.java @@ -13,7 +13,7 @@ import static java.util.Collections.singleton; import static java.util.Collections.singletonList; -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.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/QueryTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/QueryTest.java index f529a452e..c614e813d 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/QueryTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/QueryTest.java @@ -16,7 +16,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.singleton; import static java.util.Collections.singletonList; -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.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/RawQueryTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/RawQueryTest.java index bea07c998..eb59af8cd 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/RawQueryTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/RawQueryTest.java @@ -15,7 +15,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.singleton; import static java.util.Collections.singletonList; -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.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/UpdateQueryTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/UpdateQueryTest.java index 156fb40aa..b74d43553 100644 --- a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/UpdateQueryTest.java +++ b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/queries/UpdateQueryTest.java @@ -16,7 +16,7 @@ import static java.util.Collections.singleton; import static java.util.Collections.singletonList; import static java.util.Collections.unmodifiableSet; -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.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/storio-test-common/src/test/java/com/pushtorefresh/storio/test/AbstractEmissionCheckerTest.java b/storio-test-common/src/test/java/com/pushtorefresh/storio/test/AbstractEmissionCheckerTest.java index 65632a758..7c07b6b21 100644 --- a/storio-test-common/src/test/java/com/pushtorefresh/storio/test/AbstractEmissionCheckerTest.java +++ b/storio-test-common/src/test/java/com/pushtorefresh/storio/test/AbstractEmissionCheckerTest.java @@ -17,7 +17,7 @@ import rx.subjects.PublishSubject; 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.Assertions.failBecauseExceptionWasNotThrown; public class AbstractEmissionCheckerTest { diff --git a/storio-test-common/src/test/java/com/pushtorefresh/storio/test/AssertsTest.java b/storio-test-common/src/test/java/com/pushtorefresh/storio/test/AssertsTest.java index b5cdeba23..655b74397 100644 --- a/storio-test-common/src/test/java/com/pushtorefresh/storio/test/AssertsTest.java +++ b/storio-test-common/src/test/java/com/pushtorefresh/storio/test/AssertsTest.java @@ -8,9 +8,9 @@ import java.util.Collections; import java.util.List; -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.anyObject; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -56,7 +56,7 @@ public void shouldCheckThatListIsImmutableByCallingAdd() { assertThat(expected).hasMessage("List is not immutable: list = " + list); } - verify(list).add(anyObject()); + verify(list).add(any()); verifyNoMoreInteractions(list); } @@ -65,7 +65,7 @@ public void shouldCheckThatListIsImmutableByCallingRemove() { //noinspection unchecked List list = mock(List.class); - when(list.add(anyObject())) + when(list.add(any())) .thenThrow(new UnsupportedOperationException("add() not supported")); try { @@ -75,7 +75,7 @@ public void shouldCheckThatListIsImmutableByCallingRemove() { assertThat(expected).hasMessage("List is not immutable: list = " + list); } - verify(list).add(anyObject()); + verify(list).add(any()); verify(list).remove(0); verifyNoMoreInteractions(list); } diff --git a/storio-test-common/src/test/java/com/pushtorefresh/storio/test/ObservableBehaviorCheckerTest.java b/storio-test-common/src/test/java/com/pushtorefresh/storio/test/ObservableBehaviorCheckerTest.java index fa1dd5500..a35cc708c 100644 --- a/storio-test-common/src/test/java/com/pushtorefresh/storio/test/ObservableBehaviorCheckerTest.java +++ b/storio-test-common/src/test/java/com/pushtorefresh/storio/test/ObservableBehaviorCheckerTest.java @@ -7,7 +7,7 @@ import rx.Observable; import rx.functions.Action1; -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.times; diff --git a/storio-test-common/src/test/java/com/pushtorefresh/storio/test/ToStringCheckerTest.java b/storio-test-common/src/test/java/com/pushtorefresh/storio/test/ToStringCheckerTest.java index 17aabb3e3..c1eaf66c1 100644 --- a/storio-test-common/src/test/java/com/pushtorefresh/storio/test/ToStringCheckerTest.java +++ b/storio-test-common/src/test/java/com/pushtorefresh/storio/test/ToStringCheckerTest.java @@ -11,7 +11,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.singleton; import static java.util.Collections.singletonMap; -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 ToStringCheckerTest { diff --git a/storio-test-common/src/test/java/com/pushtorefresh/storio/test/UtilsTest.java b/storio-test-common/src/test/java/com/pushtorefresh/storio/test/UtilsTest.java index edb0ac025..32875cff1 100644 --- a/storio-test-common/src/test/java/com/pushtorefresh/storio/test/UtilsTest.java +++ b/storio-test-common/src/test/java/com/pushtorefresh/storio/test/UtilsTest.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; public class UtilsTest { diff --git a/storio-test-without-rxjava/src/test/java/com/pushtorefresh/storio/test_without_rxjava/EnvironmentTest.java b/storio-test-without-rxjava/src/test/java/com/pushtorefresh/storio/test_without_rxjava/EnvironmentTest.java index a7622952c..3018b8f8f 100644 --- a/storio-test-without-rxjava/src/test/java/com/pushtorefresh/storio/test_without_rxjava/EnvironmentTest.java +++ b/storio-test-without-rxjava/src/test/java/com/pushtorefresh/storio/test_without_rxjava/EnvironmentTest.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; public class EnvironmentTest {