Added securityContextType property to test plumbing

This removes a lot of hardcoding we have that forced the usage of digest authentication. Also removed some hardcoding of assumed port numbers. 

Intent is to make it easier to add support for running all the tests against a reverse proxy, which will most likely require basic authentication. 

Added fast functional tests to the PR pipeline - figuring this will be good to leave in for now as a quick way of ensuring a good chunk of the functional tests still work.

Author: rjrudin

Jenkinsfile

@@ -101,6 +101,7 @@ pipeline{
           export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
           cd java-client-api
           ./gradlew -i marklogic-client-api:test  || true
+          ./gradlew marklogic-client-api-functionaltests:runFastFunctionalTests || true
         '''
         junit '**/build/**/TEST*.xml'
       }

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/WBFailover.java

@@ -332,7 +332,7 @@ public void testBlackListHost() throws Exception {
 			final AtomicInteger successCount = new AtomicInteger(0);
 			final AtomicBoolean containsBLHost = new AtomicBoolean(false);
 			final AtomicBoolean failState = new AtomicBoolean(false);
-			SecurityContext secContext = new DatabaseClientFactory.DigestAuthContext("admin", "admin");
+			SecurityContext secContext = newSecurityContext("admin", "admin");
 			DatabaseClient dbClient = DatabaseClientFactory.newClient(hostLists.get(3), 8000, secContext, getConnType());
 			DataMovementManager dmManager = dbClient.newDataMovementManager();
 			WriteBatcher ihb2 = dmManager.newWriteBatcher();

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/AbstractFunctionalTest.java

@@ -61,11 +61,11 @@ public static void initializeClients() throws Exception {
             adminModulesClient = getDatabaseClientOnDatabase(getRestServerHostName(), getRestServerPort(), modulesDbName, getAdminUser(), getAdminPassword(), getConnType());
         } else {
             schemasClient = DatabaseClientFactory.newClient(getRestServerHostName(), getRestServerPort(), schemasDbName,
-                new DatabaseClientFactory.DigestAuthContext(OPTIC_USER, OPTIC_USER_PASSWORD));
+                newSecurityContext(OPTIC_USER, OPTIC_USER_PASSWORD));
             client = DatabaseClientFactory.newClient(getRestServerHostName(), getRestServerPort(),
-                new DatabaseClientFactory.DigestAuthContext(OPTIC_USER, OPTIC_USER_PASSWORD));
+                newSecurityContext(OPTIC_USER, OPTIC_USER_PASSWORD));
             adminModulesClient = DatabaseClientFactory.newClient(getRestServerHostName(), getRestServerPort(), modulesDbName,
-                new DatabaseClientFactory.DigestAuthContext(getAdminUser(), getAdminPassword()));
+                newSecurityContext(getAdminUser(), getAdminPassword()));
         }
 
         // Required to ensure that tests using the "/ext/" prefix work reliably. Expand to other directories as needed.
@@ -155,12 +155,12 @@ protected final String toWKT(String latLon) {
 
     protected static DatabaseClient connectAsRestWriter() {
         return DatabaseClientFactory.newClient(getRestServerHostName(), getRestServerPort(),
-            new DatabaseClientFactory.DigestAuthContext("rest-writer", "x"), getConnType());
+            newSecurityContext("rest-writer", "x"), getConnType());
     }
 
     protected static DatabaseClient connectAsAdmin() {
         return DatabaseClientFactory.newClient(getRestServerHostName(), getRestServerPort(),
-            new DatabaseClientFactory.DigestAuthContext(getAdminUser(), getAdminPassword()), getConnType());
+            newSecurityContext(getAdminUser(), getAdminPassword()), getConnType());
     }
 
     protected static void removeFieldIndices() {

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestBulkWriteWithTransformations.java

@@ -74,7 +74,7 @@ public void setUp() throws Exception {
     if (isLBHost())
     	client	= getDatabaseClient("eval-user", "x", getConnType());
     else {
-    	SecurityContext secContext = new DatabaseClientFactory.DigestAuthContext("eval-user", "x");
+    	SecurityContext secContext = newSecurityContext("eval-user", "x");
     client = DatabaseClientFactory.newClient(appServerHostname, uberPort, "java-functest", secContext, getConnType());
     }
   }

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestDatabaseAuthentication.java

@@ -21,13 +21,10 @@
 import com.marklogic.client.DatabaseClientFactory.SecurityContext;
 import com.marklogic.client.io.InputStreamHandle;
 import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.Test;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
 
 import static org.junit.Assert.assertEquals;
 
@@ -42,13 +39,14 @@ public class TestDatabaseAuthentication extends AbstractFunctionalTest {
   private static String restServerName = "java-functest";
 
   @After
-  public void testCleanUp() throws Exception {
-    deleteDocuments(connectAsAdmin());
+  public void teardown() throws Exception {
+    setAuthentication(securityContextType, restServerName);
+    setDefaultUser("nobody", restServerName);
   }
 
   // Should throw exceptions when none specified.
   @Test
-  public void testAuthenticationNone() throws KeyManagementException, NoSuchAlgorithmException, IOException
+  public void testAuthenticationNone() throws IOException
   {
     System.out.println("Running testAuthenticationNone");
     if (!IsSecurityEnabled()) {
@@ -63,13 +61,11 @@ public void testAuthenticationNone() throws KeyManagementException, NoSuchAlgori
       }
       assertEquals("Write Text difference", "makeSecurityContext should only be called with BASIC or DIGEST Authentication",
           str.toString().trim());
-      setAuthentication("digest", restServerName);
-      setDefaultUser("nobody", restServerName);
     }
   }
 
   @Test
-  public void testAuthenticationBasic() throws KeyManagementException, NoSuchAlgorithmException, IOException
+  public void testAuthenticationBasic() throws IOException
   {
     if (!IsSecurityEnabled()) {
       setAuthentication("basic", restServerName);
@@ -100,15 +96,6 @@ public void testAuthenticationBasic() throws KeyManagementException, NoSuchAlgor
 
       // release client
       client.release();
-
-      setAuthentication("digest", restServerName);
-      setDefaultUser("nobody", restServerName);
     }
   }
-
-  @AfterClass
-  public static void tearDown() throws Exception {
-    setAuthentication("digest", restServerName);
-    setDefaultUser("nobody", restServerName);
-  }
 }

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestHandles.java

@@ -78,7 +78,7 @@ public void testXmlCRUD_BytesHandle() throws KeyManagementException, NoSuchAlgor
         XMLUnit.setNormalizeWhitespace(true);
 
         // connect the client
-        DatabaseClientFactory.SecurityContext secContext = new DatabaseClientFactory.DigestAuthContext("eval-user", "x");
+        DatabaseClientFactory.SecurityContext secContext = newSecurityContext("eval-user", "x");
         DatabaseClient client = DatabaseClientFactory.newClient(appServerHostname, uberPort, dbName, secContext, getConnType());
 
         // write docs
@@ -140,7 +140,7 @@ public void testTextCRUD_BytesHandle() throws KeyManagementException, NoSuchAlgo
         System.out.println("Runing test TextCRUD_BytesHandle");
 
         // connect the client
-        DatabaseClientFactory.SecurityContext secContext = new DatabaseClientFactory.DigestAuthContext("eval-user", "x");
+        DatabaseClientFactory.SecurityContext secContext = newSecurityContext("eval-user", "x");
         DatabaseClient client = DatabaseClientFactory.newClient(appServerHostname, uberPort, dbName, secContext, getConnType());
 
         // write docs
@@ -201,7 +201,7 @@ public void testJsonCRUD_BytesHandle() throws KeyManagementException, NoSuchAlgo
         ObjectMapper mapper = new ObjectMapper();
 
         // connect the client
-        DatabaseClientFactory.SecurityContext secContext = new DatabaseClientFactory.DigestAuthContext("eval-user", "x");
+        DatabaseClientFactory.SecurityContext secContext = newSecurityContext("eval-user", "x");
         DatabaseClient client = DatabaseClientFactory.newClient(appServerHostname, uberPort, dbName, secContext, getConnType());
 
         // write docs
@@ -262,7 +262,7 @@ public void testBinaryCRUD_BytesHandle() throws KeyManagementException, NoSuchAl
         System.out.println("Running testBinaryCRUD_BytesHandle");
 
         // connect the client
-        DatabaseClientFactory.SecurityContext secContext = new DatabaseClientFactory.DigestAuthContext("eval-user", "x");
+        DatabaseClientFactory.SecurityContext secContext = newSecurityContext("eval-user", "x");
         DatabaseClient client = DatabaseClientFactory.newClient(appServerHostname, uberPort, dbName, secContext, getConnType());
 
         // write docs