Rebase problems fixed

pushtorefresh · Apr 10, 2017 · 19a45a5 · 19a45a5
1 parent 83e4701
commit 19a45a5
Show file tree

Hide file tree

Showing 12 changed files with 68 additions and 10 deletions.
diff --git a/...com/pushtorefresh/storio/contentresolver/operations/delete/PreparedDeleteByQueryTest.java b/...com/pushtorefresh/storio/contentresolver/operations/delete/PreparedDeleteByQueryTest.java
@@ -8,7 +8,7 @@
 import rx.Observable;
 import rx.Single;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 
 public class PreparedDeleteByQueryTest {
 

diff --git a/...torefresh/storio/contentresolver/operations/put/PreparedPutContentValuesIterableTest.java b/...torefresh/storio/contentresolver/operations/put/PreparedPutContentValuesIterableTest.java
@@ -10,7 +10,7 @@
 import rx.Observable;
 import rx.Single;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 
 public class PreparedPutContentValuesIterableTest {
 

diff --git a/...com/pushtorefresh/storio/contentresolver/operations/put/PreparedPutContentValuesTest.java b/...com/pushtorefresh/storio/contentresolver/operations/put/PreparedPutContentValuesTest.java
@@ -8,7 +8,7 @@
 import rx.Observable;
 import rx.Single;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 
 public class PreparedPutContentValuesTest {
 

diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/LoggingInterceptorTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/LoggingInterceptorTest.java
@@ -14,7 +14,7 @@
 import rx.Observable;
 import rx.Single;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 
 @RunWith(RobolectricTestRunner.class)
 public class LoggingInterceptorTest {

diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/impl/ChainImplTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/impl/ChainImplTest.java
@@ -0,0 +1,29 @@
+package com.pushtorefresh.storio.sqlite.impl;
+
+import com.pushtorefresh.storio.operations.PreparedOperation;
+import com.pushtorefresh.storio.sqlite.Interceptor;
+import com.pushtorefresh.storio.sqlite.Interceptor.Chain;
+
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Fail.failBecauseExceptionWasNotThrown;
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+public class ChainImplTest {
+
+    @Test
+    public void proceed_shouldThrowIfIteratorEmpty() {
+        try {
+            final List<Interceptor> empty = Collections.emptyList();
+            final Chain chain = new ChainImpl(empty.listIterator());
+            chain.proceed(mock(PreparedOperation.class));
+            failBecauseExceptionWasNotThrown(IllegalStateException.class);
+        } catch (IllegalStateException e) {
+            assertThat(e).hasMessage("proceed was called on empty iterator");
+        }
+    }
+}
diff --git a/...io-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/impl/DefaultStorIOSQLiteTest.java b/...io-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/impl/DefaultStorIOSQLiteTest.java
@@ -608,7 +608,7 @@ class TestDefaultStorIOSQLite extends DefaultStorIOSQLite {
         private final Internal internal;
 
         TestDefaultStorIOSQLite(@NonNull SQLiteOpenHelper sqLiteOpenHelper, @NonNull TypeMappingFinder typeMappingFinder) {
-            super(sqLiteOpenHelper, typeMappingFinder, null);
+            super(sqLiteOpenHelper, typeMappingFinder, null, Collections.<Interceptor>emptyList());
             internal = new InternalImpl(typeMappingFinder);
         }
 

diff --git a/...est/java/com/pushtorefresh/storio/sqlite/integration/BaseOperationObserveChangesTest.java b/...est/java/com/pushtorefresh/storio/sqlite/integration/BaseOperationObserveChangesTest.java
@@ -46,8 +46,8 @@ public void beforeEachTest() {
         tagChanges = Changes.newInstance("yet_another_table", UserTableMeta.NOTIFICATION_TAG);
     }
 
-    public <T> void verifyChangesReceived(
-            @NonNull PreparedOperation<T> operation,
+    public <T, Data> void verifyChangesReceived(
+            @NonNull PreparedOperation<T, Data> operation,
             @NonNull Changes changes,
             @NonNull T value
     ) {

diff --git a/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/InterceptorTest.java b/storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/integration/InterceptorTest.java
@@ -32,7 +32,7 @@
 import static com.pushtorefresh.storio.sqlite.integration.TweetTableMeta.COLUMN_AUTHOR_ID;
 import static com.pushtorefresh.storio.sqlite.integration.TweetTableMeta.COLUMN_CONTENT_TEXT;
 import static com.pushtorefresh.storio.sqlite.integration.TweetTableMeta.COLUMN_ID;
-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/.../test/java/com/pushtorefresh/storio/sqlite/operations/execute/PreparedExecuteSQLTest.java b/.../test/java/com/pushtorefresh/storio/sqlite/operations/execute/PreparedExecuteSQLTest.java
@@ -211,6 +211,7 @@ public void shouldWrapExceptionIntoStorIOExceptionObservable() {
         verify(stub.storIOSQLite).defaultScheduler();
         verify(stub.storIOSQLite).lowLevel();
         verify(stub.lowLevel).executeSQL(stub.rawQuery);
+        verify(stub.storIOSQLite).interceptors();
         verifyNoMoreInteractions(stub.storIOSQLite, stub.lowLevel);
     }
 
@@ -244,6 +245,7 @@ public void shouldWrapExceptionIntoStorIOExceptionSingle() {
         verify(stub.storIOSQLite).defaultScheduler();
         verify(stub.storIOSQLite).lowLevel();
         verify(stub.lowLevel).executeSQL(stub.rawQuery);
+        verify(stub.storIOSQLite).interceptors();
         verifyNoMoreInteractions(stub.storIOSQLite, stub.lowLevel);
     }
 

diff --git a/...e/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/PreparedGetCursorTest.java b/...e/src/test/java/com/pushtorefresh/storio/sqlite/operations/get/PreparedGetCursorTest.java
@@ -9,6 +9,7 @@
 import com.pushtorefresh.storio.sqlite.queries.Query;
 
 import org.junit.Test;
+import org.robolectric.util.ReflectionHelpers;
 
 import rx.Observable;
 import rx.Single;
@@ -28,6 +29,28 @@
 
 public class PreparedGetCursorTest {
 
+    @Test
+    public void shouldThrowIfNoQueryOrRawQueryIsSet() {
+        try {
+            final GetCursorStub getStub = GetCursorStub.newInstance();
+
+            final PreparedGetCursor operation = getStub.storIOSQLite
+                    .get()
+                    .cursor()
+                    .withQuery(getStub.query) // will be removed
+                    .withGetResolver(getStub.getResolverForCursor)
+                    .prepare();
+
+            ReflectionHelpers.setField(operation, "query", null);
+            ReflectionHelpers.setField(operation, "rawQuery", null);
+            operation.getData();
+
+            failBecauseExceptionWasNotThrown(IllegalStateException.class);
+        } catch (IllegalStateException e) {
+            assertThat(e).hasMessage("Either rawQuery or query should be set!");
+        }
+    }
+
     @Test
     public void shouldReturnQueryInGetData() {
         final GetCursorStub getStub = GetCursorStub.newInstance();

diff --git a/.../com/pushtorefresh/storio/sqlite/operations/put/PreparedPutContentValuesIterableTest.java b/.../com/pushtorefresh/storio/sqlite/operations/put/PreparedPutContentValuesIterableTest.java
@@ -604,6 +604,7 @@ public void shouldWrapExceptionIntoStorIOExceptionObservable() {
         verify(stub.lowLevel).beginTransaction();
         verify(stub.lowLevel).endTransaction();
         verify(stub.storIOSQLite).defaultScheduler();
+        verify(stub.storIOSQLite).interceptors();
         verifyNoMoreInteractions(stub.storIOSQLite, stub.lowLevel);
     }
 
@@ -640,6 +641,7 @@ public void shouldWrapExceptionIntoStorIOExceptionSingle() {
         verify(stub.lowLevel).beginTransaction();
         verify(stub.lowLevel).endTransaction();
         verify(stub.storIOSQLite).defaultScheduler();
+        verify(stub.storIOSQLite).interceptors();
         verifyNoMoreInteractions(stub.storIOSQLite, stub.lowLevel);
     }
 
@@ -676,6 +678,7 @@ public void shouldWrapExceptionIntoStorIOExceptionCompletable() {
         verify(stub.lowLevel).beginTransaction();
         verify(stub.lowLevel).endTransaction();
         verify(stub.storIOSQLite).defaultScheduler();
+        verify(stub.storIOSQLite).interceptors();
         verifyNoMoreInteractions(stub.storIOSQLite, stub.lowLevel);
     }
 

diff --git a/...est/java/com/pushtorefresh/storio/sqlite/operations/put/PreparedPutContentValuesTest.java b/...est/java/com/pushtorefresh/storio/sqlite/operations/put/PreparedPutContentValuesTest.java
@@ -22,8 +22,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class PreparedPutContentValuesTest {
 
     @Rule
@@ -153,6 +151,7 @@ public void shouldWrapExceptionIntoStorIOExceptionObservable() {
 
         verify(stub.storIOSQLite).put();
         verify(stub.storIOSQLite).defaultScheduler();
+        verify(stub.storIOSQLite).interceptors();
         verifyNoMoreInteractions(stub.storIOSQLite, stub.lowLevel);
     }
 
@@ -188,6 +187,7 @@ public void shouldWrapExceptionIntoStorIOExceptionSingle() {
 
         verify(stub.storIOSQLite).put();
         verify(stub.storIOSQLite).defaultScheduler();
+        verify(stub.storIOSQLite).interceptors();
         verifyNoMoreInteractions(stub.storIOSQLite, stub.lowLevel);
     }
 
@@ -223,6 +223,7 @@ public void shouldWrapExceptionIntoStorIOExceptionCompletable() {
 
         verify(stub.storIOSQLite).put();
         verify(stub.storIOSQLite).defaultScheduler();
+        verify(stub.storIOSQLite).interceptors();
         verifyNoMoreInteractions(stub.storIOSQLite, stub.lowLevel);
     }