Merge pull request #567 from cloudant/fix-jenkinsfile-for-cloudant-non-cloudant-categories

Use `org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBV2(client.getRootUri()));` to skip tests at runtime

Author: tomblench

cloudant-sync-datastore-core/build.gradle

@@ -53,22 +53,11 @@ test {
         'com.cloudant.common.SystemTest', \
         'com.cloudant.common.RequireRunningCouchDB', \
         'com.cloudant.common.PerformanceTest', \
-        'com.cloudant.common.RequireRunningProxy', \
-        'com.cloudant.common.RequireCloudant'
+        'com.cloudant.common.RequireRunningProxy'
     }
 }
 
 task integrationTest(type: Test, dependsOn: testClasses) {
-    useJUnit {
-        excludeCategories \
-        'com.cloudant.common.SystemTest', \
-        'com.cloudant.common.PerformanceTest', \
-        'com.cloudant.common.RequireRunningProxy',  \
-        'com.cloudant.common.RequireCloudant'
-    }
-}
-
-task integrationTestCloudant(type: Test, dependsOn: testClasses) {
     useJUnit {
         excludeCategories \
         'com.cloudant.common.SystemTest', \
@@ -77,7 +66,6 @@ task integrationTestCloudant(type: Test, dependsOn: testClasses) {
     }
 }
 
-
 task performanceTest(type: Test, dependsOn: testClasses) {
     useJUnit {
         includeCategories

cloudant-sync-datastore-core/src/test/java/com/cloudant/common/RequireCloudant.java

@@ -16,14 +16,11 @@
 
 import static org.hamcrest.Matchers.hasSize;
 
-import com.cloudant.common.RequireCloudant;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(RequireCloudant.class)
 public class CouchClientSelectorChangesTest extends CouchClientTestBase {
 
     @Before
@@ -33,14 +30,16 @@ public void setUp() {
     }
 
     @Test
-    public void changes_selector() {
+    public void changes_selector() throws Exception {
+        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBV2(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() {
+    public void changes_selectorAndMoreThanLimitNumberOfDocs() throws Exception {
+        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBV2(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/mazha/CouchClientSelectorChangesTest.java

@@ -14,14 +14,13 @@
 
 package com.cloudant.sync.internal.replication;
 
-import com.cloudant.common.RequireCloudant;
 import com.cloudant.sync.internal.mazha.AnimalDb;
+import com.cloudant.sync.internal.mazha.ClientTestUtils;
 
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(RequireCloudant.class)
 public class PullStrategySelectorTest extends ReplicationTestBase {
 
     // we use this utility method rather than ReplicationTestBase.pull() because some
@@ -36,6 +35,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()));
         String selector ="{\"selector\":{\"class\":\"bird\"}}";
         PullStrategy replicator = super.getPullStrategy(selector);
 
@@ -55,6 +55,7 @@ public void pull_filterSelectorBirdFromAnimalDb_twoDocShouldBePulled() throws Ex
     public void
     pull_filterSelectorMammalFromAnimalDbUsingParameterizedFilter_eightDocShouldBePulled()
             throws Exception {
+        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBV2(remoteDb.couchClient.getRootUri()));
         String selector = "{\"selector\":{\"class\":\"mammal\"}}";
         PullStrategy replicator = super.getPullStrategy(selector);
 
@@ -74,6 +75,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()));
         String selector = "{\"selector\":{\"max_length\":{\"$lte\":2}}}";
         PullStrategy replicator = super.getPullStrategy(selector);
 
@@ -92,7 +94,8 @@ public void pull_filterSelectorSmallFromAnimalDbUsingIntegerFilter_eightDocShoul
     @Test
     public void pull_filterSelectorSmallFromAnimalDbUsingNullFilter_eightDocShouldBePulled()
             throws Exception {
-       String selector = "{\"selector\":{\"chinese_name\":\"\u718a\u732b\"}}";
+        org.junit.Assume.assumeTrue(ClientTestUtils.isCouchDBV2(remoteDb.couchClient.getRootUri()));
+        String selector = "{\"selector\":{\"chinese_name\":\"\u718a\u732b\"}}";
         PullStrategy replicator = super.getPullStrategy(selector);
 
         Assert.assertEquals(0, datastore.getDocumentCount());