Allow testing on CouchDB 3.0.0

Author: jjrodrig

cloudant-sync-datastore-core/src/test/java/com/cloudant/sync/internal/mazha/ChangesFeedTest.java

@@ -98,7 +98,7 @@ public void changes_docWithConflicts_conflictsShouldBeReturned() {
     @Test
     public void changes_dbChangesMustSuccessfullyReturnWithSeqInterval() throws IOException,
             URISyntaxException {
-        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBV2(client.getRootUri()));
+        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBVersion2or3(client.getRootUri()));
         Response res1 = ClientTestUtils.createHelloWorldDoc(client);
         Response res2 = ClientTestUtils.createHelloWorldDoc(client);
         ClientTestUtils.createHelloWorldDoc(client);

cloudant-sync-datastore-core/src/test/java/com/cloudant/sync/internal/mazha/ClientTestUtils.java

@@ -239,11 +239,11 @@ public static List<String> getRemoteRevisionIDs(URI uri, CouchConfig config) thr
         return revisions;
     }
 
-    public static boolean isCouchDBV2(URI uri) throws URISyntaxException, IOException {
+    public static boolean isCouchDBVersion2or3(URI uri) throws URISyntaxException, IOException {
         URI root = new URI(uri.getScheme() + "://" + uri.getAuthority());
         HttpConnection connection = Http.GET(root);
         String response = connection.execute().responseAsString();
-        return response.contains("\"version\":\"2.");
+        return response.contains("\"version\":\"2.") || response.contains("\"version\":\"3.");
     }
 
 

cloudant-sync-datastore-core/src/test/java/com/cloudant/sync/internal/mazha/CouchClientSelectorChangesTest.java

@@ -19,7 +19,6 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 public class CouchClientSelectorChangesTest extends CouchClientTestBase {
 
@@ -31,15 +30,15 @@ public void setUp() {
 
     @Test
     public void changes_selector() throws Exception {
-        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBV2(client.getRootUri()));
+        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBVersion2or3(client.getRootUri()));
         String animalBirdSelector = "{\"selector\":{\"class\":\"bird\"}}";
         ChangesResult changes = client.changes(animalBirdSelector, null, 5);
         Assert.assertThat(changes.getResults(), hasSize(2));
     }
 
     @Test
     public void changes_selectorAndMoreThanLimitNumberOfDocs() throws Exception {
-        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBV2(client.getRootUri()));
+        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBVersion2or3(client.getRootUri()));
         String animalMammalSelector = "{\"selector\":{\"class\":\"mammal\"}}";
         ChangesResult firstChangeSet = client.changes(animalMammalSelector, null, 5);
         Assert.assertThat(firstChangeSet.getResults(), hasSize(5));

cloudant-sync-datastore-core/src/test/java/com/cloudant/sync/internal/replication/PullStrategyDocIdTest.java

@@ -37,7 +37,7 @@ private void pull(PullStrategy replicator, int expectedDocs) throws Exception {
 
     @Test
     public void pull_filterDocIdsFromAnimalDb_twoDocShouldBePulled() throws Exception {
-        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBV2(remoteDb.couchClient.getRootUri()));
+        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBVersion2or3(remoteDb.couchClient.getRootUri()));
         List<String> docIds = Arrays.asList("snipe","kookaburra");
         PullStrategy replicator = super.getPullStrategy(docIds);
 
@@ -57,7 +57,7 @@ public void pull_filterDocIdsFromAnimalDb_twoDocShouldBePulled() throws Exceptio
     public void
     pull_filterSelectorMammalFromAnimalDbUsingParameterizedFilter_eightDocShouldBePulled()
             throws Exception {
-        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBV2(remoteDb.couchClient.getRootUri()));
+        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBVersion2or3(remoteDb.couchClient.getRootUri()));
         List<String> docIds = Arrays.asList("aardvark", "badger", "elephant", "giraffe", "lemur", "llama",
                 "panda", "zebra");
         PullStrategy replicator = super.getPullStrategy(docIds);

cloudant-sync-datastore-core/src/test/java/com/cloudant/sync/internal/replication/PullStrategySelectorTest.java

@@ -19,7 +19,6 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 public class PullStrategySelectorTest extends ReplicationTestBase {
 
@@ -35,7 +34,7 @@ private void pull(PullStrategy replicator, int expectedDocs) throws Exception {
 
     @Test
     public void pull_filterSelectorBirdFromAnimalDb_twoDocShouldBePulled() throws Exception {
-        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBV2(remoteDb.couchClient.getRootUri()));
+        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBVersion2or3(remoteDb.couchClient.getRootUri()));
         String selector ="{\"selector\":{\"class\":\"bird\"}}";
         PullStrategy replicator = super.getPullStrategy(selector);
 
@@ -55,7 +54,7 @@ public void pull_filterSelectorBirdFromAnimalDb_twoDocShouldBePulled() throws Ex
     public void
     pull_filterSelectorMammalFromAnimalDbUsingParameterizedFilter_eightDocShouldBePulled()
             throws Exception {
-        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBV2(remoteDb.couchClient.getRootUri()));
+        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBVersion2or3(remoteDb.couchClient.getRootUri()));
         String selector = "{\"selector\":{\"class\":\"mammal\"}}";
         PullStrategy replicator = super.getPullStrategy(selector);
 
@@ -75,7 +74,7 @@ public void pull_filterSelectorBirdFromAnimalDb_twoDocShouldBePulled() throws Ex
     @Test
     public void pull_filterSelectorSmallFromAnimalDbUsingIntegerFilter_eightDocShouldBePulled()
             throws Exception {
-        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBV2(remoteDb.couchClient.getRootUri()));
+        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBVersion2or3(remoteDb.couchClient.getRootUri()));
         String selector = "{\"selector\":{\"max_length\":{\"$lte\":2}}}";
         PullStrategy replicator = super.getPullStrategy(selector);
 
@@ -94,7 +93,7 @@ public void pull_filterSelectorSmallFromAnimalDbUsingIntegerFilter_eightDocShoul
     @Test
     public void pull_filterSelectorSmallFromAnimalDbUsingNullFilter_eightDocShouldBePulled()
             throws Exception {
-        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBV2(remoteDb.couchClient.getRootUri()));
+        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBVersion2or3(remoteDb.couchClient.getRootUri()));
         String selector = "{\"selector\":{\"chinese_name\":\"\u718a\u732b\"}}";
         PullStrategy replicator = super.getPullStrategy(selector);