Merge pull request #785 from couchbase/feature/issue_1026_replicator_incorrect_behavior

Fixed  Java Core 1026 - replicator incorrect behavior

Author: pasin

src/androidTest/java/com/couchbase/lite/mockserver/MockDocumentAllDocs.java

@@ -0,0 +1,31 @@
+package com.couchbase.lite.mockserver;
+
+import com.squareup.okhttp.mockwebserver.MockResponse;
+import com.squareup.okhttp.mockwebserver.RecordedRequest;
+
+/**
+ * Created by hideki on 2/11/16.
+ */
+public class MockDocumentAllDocs implements SmartMockResponse {
+    public MockResponse generateMockResponse(RecordedRequest request) {
+        try {
+            MockResponse mockResponse = new MockResponse();
+            mockResponse.setBody("{\"offset\" : 0, \"rows\" : [],\"total_rows\" : 0}".getBytes());
+            mockResponse.setStatus("HTTP/1.1 200 OK");
+            return mockResponse;
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public boolean isSticky() {
+        return false;
+    }
+
+    @Override
+    public long delayMs() {
+        return 0;
+    }
+}

src/androidTest/java/com/couchbase/lite/mockserver/MockHelper.java

@@ -42,6 +42,7 @@ public class MockHelper {
     public static final String PATH_REGEX_SESSION_COUCHDB = "/_session.*";
     public static final String PATH_REGEX_FACEBOOK_AUTH = "/db/_facebook.*";
     public static final String PATH_REGEX_BULK_GET = "/db/_bulk_get.*";
+    public static final String PATH_REGEX_ALL_DOCS = "/db/_all_docs.*";
 
     public static MockWebServer getMockWebServer(MockDispatcher dispatcher) {
 

src/androidTest/java/com/couchbase/lite/replicator/ReplicationTest.java

@@ -33,6 +33,7 @@
 import com.couchbase.lite.mockserver.MockCheckpointGet;
 import com.couchbase.lite.mockserver.MockCheckpointPut;
 import com.couchbase.lite.mockserver.MockDispatcher;
+import com.couchbase.lite.mockserver.MockDocumentAllDocs;
 import com.couchbase.lite.mockserver.MockDocumentBulkGet;
 import com.couchbase.lite.mockserver.MockDocumentGet;
 import com.couchbase.lite.mockserver.MockDocumentPut;
@@ -364,11 +365,6 @@ public void testMockMultiplePullCouchDb() throws Exception {
 
 
     public void testMockContinuousPullCouchDb() throws Exception {
-
-        // TODO: (IMPORTANT, FORESTDB) lastSequence for checkpoint does not match and couase dead lock
-        // if(!isSQLiteDB())
-        //    fail("FORESTDB casues deadlock becasue of lastSequence mismatch for checkpoint");
-
         boolean shutdownMockWebserver = true;
         mockContinuousPull(shutdownMockWebserver, MockDispatcher.ServerType.COUCHDB);
     }
@@ -413,6 +409,9 @@ public Map<String, Object> mockSinglePull(boolean shutdownMockWebserver, MockDis
             mockChangesFeed.add(new MockChangesFeed.MockChangedDoc(mockDoc2));
             dispatcher.enqueueResponse(MockHelper.PATH_REGEX_CHANGES, mockChangesFeed.generateMockResponse());
 
+            // Empty _all_docs response to pass unit tests
+            dispatcher.enqueueResponse(MockHelper.PATH_REGEX_ALL_DOCS, new MockDocumentAllDocs());
+
             // doc1 response
             MockDocumentGet mockDocumentGet = new MockDocumentGet(mockDoc1);
             if (addAttachments) {
@@ -584,6 +583,9 @@ public Map<String, Object> mockMultiplePull(boolean shutdownMockWebserver, MockD
             MockResponse fakeChangesResponse = mockChangesFeed.generateMockResponse();
             dispatcher.enqueueResponse(MockHelper.PATH_REGEX_CHANGES, fakeChangesResponse);
 
+            // Empty _all_docs response to pass unit tests
+            dispatcher.enqueueResponse(MockHelper.PATH_REGEX_ALL_DOCS, new MockDocumentAllDocs());
+
             // doc1 response
             Map<String, Object> doc1JsonMap = MockHelper.generateRandomJsonMap();
             MockDocumentGet mockDocumentGet = new MockDocumentGet()
@@ -1827,6 +1829,9 @@ public void testChangesFeedWithPurgedDoc() throws Exception {
             MockHelper.set404NotFoundJson(fakeCheckpointResponse);
             dispatcher.enqueueResponse(MockHelper.PATH_REGEX_CHECKPOINT, fakeCheckpointResponse);
 
+            // Empty _all_docs response to pass unit tests
+            dispatcher.enqueueResponse(MockHelper.PATH_REGEX_ALL_DOCS, new MockDocumentAllDocs());
+
             //add response to _changes request
             // _changes response
             MockChangesFeed mockChangesFeed = new MockChangesFeed();
@@ -3171,7 +3176,10 @@ public void testVerifyPullerInsertsDocsWithValidation() throws Exception {
 
         // create mockwebserver and custom dispatcher
         MockDispatcher dispatcher = new MockDispatcher();
+        // Empty _all_docs response to pass unit tests
+        dispatcher.enqueueResponse(MockHelper.PATH_REGEX_ALL_DOCS, new MockDocumentAllDocs());
         MockWebServer server = MockHelper.getPreloadedPullTargetMockCouchDB(dispatcher, 2, 2);
+
         try {
             server.play();
 

src/main/java/com/couchbase/lite/android/AndroidNetworkReachabilityManager.java

@@ -62,6 +62,10 @@ public void onReceive(android.content.Context context, Intent intent) {
         }
     }
 
+    public  boolean isOnline(){
+        return isOnline(wrappedContext);
+    }
+
     private boolean isOnline(android.content.Context context) {
         ConnectivityManager cm = (ConnectivityManager) context.getSystemService(android.content.Context.CONNECTIVITY_SERVICE);
         NetworkInfo activeNetwork = cm.getActiveNetworkInfo();