Merge pull request #1484 from marklogic/feature/ignore-functional-tests

Ignoring functional tests excluded in Gradle

Author: rjrudin

Jenkinsfile

@@ -43,6 +43,7 @@ def runtests(String type, String version){
                 export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
                 export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
                 cd java-client-api
+                ./gradlew -i mlDeploy -PmlForestDataDirectory=/space
                 ./gradlew marklogic-client-api-functionaltests:runFunctionalTests || true
             '''
             sh label:'post-test-process', script: '''

marklogic-client-api-functionaltests/build.gradle

@@ -7,7 +7,7 @@ test {
   /* For use in testing TestDatabaseClientKerberosFromFile */
   systemProperty "keytabFile", System.getProperty("keytabFile")
   systemProperty "principal", System.getProperty("principal")
-  
+
   exclude 'com/marklogic/client/functionaltest/TestSSLConnection.class'
   exclude 'com/marklogic/client/functionaltest/TestBug18993.class'
   exclude 'com/marklogic/client/functionaltest/TestDatabaseClientWithKerberos.class'
@@ -59,12 +59,6 @@ task runSlowFunctionalTests(type: Test) {
   description = "Run slow functional tests; i.e. those that setup/teardown custom app servers / databases"
   include "com/marklogic/client/datamovement/functionaltests/**"
   include "com/marklogic/client/functionaltest/**"
-  exclude 'com/marklogic/client/functionaltest/TestSSLConnection.class'
-  exclude 'com/marklogic/client/functionaltest/TestBug18993.class'
-  exclude 'com/marklogic/client/functionaltest/TestDatabaseClientWithKerberos.class'
-  exclude 'com/marklogic/client/functionaltest/TestDatabaseClientKerberosFromFile.class'
-  exclude 'com/marklogic/client/functionaltest/TestDatabaseClientWithCertBasedAuth.class'
-  exclude 'com/marklogic/client/functionaltest/TestSandBox.class'
 }
 
 task runFunctionalTests {

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug18993.java

@@ -22,15 +22,13 @@
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
 
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.document.XMLDocumentManager;
 import com.marklogic.client.io.StringHandle;
 
+@Ignore
 public class TestBug18993 extends BasicJavaClientREST {
 
   private static String dbName = "Bug18993DB";

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientKerberosFromFile.java

@@ -122,6 +122,7 @@
  * Copy the services.keytab file to ML Server data directory.
  */
 
+@Ignore("Ignored because it was previously ignored in build.gradle though without explanation")
 public class TestDatabaseClientKerberosFromFile extends BasicJavaClientREST {
 
   private static String dbName = "TestDBClientWithKerberosFileDB";

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientWithCertBasedAuth.java

@@ -32,11 +32,7 @@
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.util.EntityUtils;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -50,6 +46,7 @@
 
 import junit.framework.Assert;
 
+@Ignore("Ignored because it was previously ignored in build.gradle though without explanation")
 public class TestDatabaseClientWithCertBasedAuth extends BasicJavaClientREST {
 
   public static String newLine = System.getProperty("line.separator");

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientWithKerberos.java

@@ -103,6 +103,7 @@
 import com.marklogic.client.query.StructuredQueryDefinition;
 import com.marklogic.client.util.RequestLogger;
 
+@Ignore("Ignored because it was previously ignored in build.gradle though without explanation")
 public class TestDatabaseClientWithKerberos extends BasicJavaClientREST {
 
   private static String dbName = "TestDatabaseClientWithKerberosDB";

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSSLConnection.java

@@ -31,13 +31,15 @@
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.DatabaseClientFactory;
 import com.marklogic.client.DatabaseClientFactory.SSLHostnameVerifier;
 import com.marklogic.client.DatabaseClientFactory.SecurityContext;
 
+@Ignore("Ignored because it was previously ignored in build.gradle though without explanation")
 public class TestSSLConnection extends BasicJavaClientREST {
 
   private static String dbName = "TestSSLConnectionDB";

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSandBox.java

@@ -36,11 +36,7 @@
 import javax.xml.transform.TransformerException;
 
 import org.custommonkey.xmlunit.exceptions.XpathException;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
@@ -85,6 +81,7 @@
 import com.marklogic.client.type.CtsReferenceExpr;
 import com.marklogic.client.type.XsStringSeqVal;
 
+@Ignore("Ignored because it was previously ignored in build.gradle though without explanation")
 public class TestSandBox extends BasicJavaClientREST {
 
   private static String dbName = "TestSandBox";

marklogic-client-api/src/test/java/com/marklogic/client/test/rows/UnnestTest.java

@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.marklogic.client.expression.PlanBuilder;
 import com.marklogic.client.row.RowRecord;
+import com.marklogic.client.test.Common;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.util.StringUtils;
@@ -27,6 +28,10 @@ public class UnnestTest extends AbstractOpticUpdateTest {
      */
     @Before
     public void insertTestDocument() {
+        if (!Common.markLogicIsVersion11OrHigher()) {
+            return;
+        }
+
         ObjectNode doc = mapper.createObjectNode();
         ArrayNode office = doc.putArray("office");
         Stream.of("Engineering:Cindy,Alice", "Sales:Bob", "Marketing: ").forEach(value -> {
@@ -41,6 +46,10 @@ public void insertTestDocument() {
 
     @Test
     public void unnestInner() {
+        if (!Common.markLogicIsVersion11OrHigher()) {
+            return;
+        }
+
         PlanBuilder.ModifyPlan plan = op.fromView("unnestSchema", "unnestView")
             .bind(op.as("teamMemberNameArray", op.fn.tokenize(op.col("teamMembers"), op.xs.string(","))))
             .unnestInner("teamMemberNameArray", SINGLE_NAME_COLUMN)
@@ -55,6 +64,10 @@ public void unnestInner() {
 
     @Test
     public void unnestInnerWithOrdinality() {
+        if (!Common.markLogicIsVersion11OrHigher()) {
+            return;
+        }
+
         PlanBuilder.ModifyPlan plan = op.fromView("unnestSchema", "unnestView")
             .bind(op.as("teamMemberNameArray", op.fn.tokenize(op.col("teamMembers"), op.xs.string(","))))
             .unnestInner("teamMemberNameArray", SINGLE_NAME_COLUMN, "index")
@@ -74,6 +87,10 @@ public void unnestInnerWithOrdinality() {
 
     @Test
     public void unnestLeftOuter() {
+        if (!Common.markLogicIsVersion11OrHigher()) {
+            return;
+        }
+
         PlanBuilder.ModifyPlan plan = op.fromView("unnestSchema", "unnestView")
             .bind(op.as("teamMemberNameArray", op.fn.tokenize(op.col("teamMembers"), op.xs.string(","))))
             .unnestLeftOuter("teamMemberNameArray", SINGLE_NAME_COLUMN)
@@ -89,6 +106,10 @@ public void unnestLeftOuter() {
 
     @Test
     public void unnestLeftOuterWithOrdinality() {
+        if (!Common.markLogicIsVersion11OrHigher()) {
+            return;
+        }
+
         PlanBuilder.ModifyPlan plan = op.fromView("unnestSchema", "unnestView")
             .bind(op.as("teamMemberNameArray", op.fn.tokenize(op.col("teamMembers"), op.xs.string(","))))
             .unnestLeftOuter("teamMemberNameArray", SINGLE_NAME_COLUMN, "myIndex")