Fixing a test in StringQueryHostBatcherTest

Author: rjrudin

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

@@ -1347,7 +1347,7 @@ public void testServerXQueryTransform() throws IOException, ParserConfigurationE
    * @throws InterruptedException
    */
   @Test
-  public void testQueryBatcherWithForestRemoveAndAdd() throws IOException, InterruptedException
+  public void testQueryBatcherWithForestRemoveAndAdd() throws InterruptedException
   {
     System.out.println("Running testQueryBatcherWithForestRemoveAndAdd");
     String testMultipleDB = "QBMultipleForestDB";
@@ -1476,28 +1476,10 @@ public void testQueryBatcherWithForestRemoveAndAdd() throws IOException, Interru
           assertTrue( batchFailResultsRem.toString().contains("Test has Exceptions"));
         }
       }
-    } catch (Exception e) {
-      System.out.print(e.getMessage());
-      fail("testQueryBatcherWithForestRemoveAndAdd method failed");
-    }
-
-    finally {
-      // Associate back the original DB.
-      try {
-        associateRESTServerWithDB(restServerName, dbName);
-      } catch (Exception e) {
-        e.printStackTrace();
-      }
-      detachForest(testMultipleDB, testMultipleForest[0]);
-      detachForest(testMultipleDB, testMultipleForest[1]);
-      // In case something asserts
-      detachForest(testMultipleDB, testMultipleForest[2]);
-      deleteDB(testMultipleDB);
-
-      deleteForest(testMultipleForest[0]);
-      deleteForest(testMultipleForest[1]);
-      deleteForest(testMultipleForest[2]);
-    }
+    } finally {
+		associateRESTServerWithDB(restServerName, dbName);
+		deleteDB(testMultipleDB);
+	}
   }
 
   /*
@@ -1510,9 +1492,7 @@ public void testQueryBatcherWithForestRemoveAndAdd() throws IOException, Interru
    * @throws InterruptedException
    */
   @Test
-  public void testBatchClientLookupTimeout() throws IOException, InterruptedException
-  {
-    System.out.println("Running testBatchClientLookupTimeout");
+  public void testBatchClientLookupTimeout() throws InterruptedException{
     String testMultipleDB = "QBMultipleForestDB";
     String[] testMultipleForest = { "QBMultipleForestDB-1" };
 
@@ -1602,9 +1582,6 @@ public void testBatchClientLookupTimeout() throws IOException, InterruptedExcept
         }
       }
       assertTrue( batchResults.toString().isEmpty());
-    } catch (Exception e) {
-      System.out.print(e.getMessage());
-      fail("testBatchClientLookupTimeout method failed");
     } finally {
         associateRESTServerWithDB(restServerName, dbName);
       deleteDB(testMultipleDB);

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

@@ -38,6 +38,8 @@
 import java.security.cert.X509Certificate;
 import java.util.*;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 public abstract class ConnectedRESTQA {
 
 	private static Properties testProperties = null;
@@ -348,10 +350,15 @@ public static void setDatabaseProperties(String dbName, String prop, boolean pro
 	 * root property name else if it has an existing sub property name then it
 	 * adds elements to that array
 	 */
-	private static void setDatabaseProperties(String dbName, String propName, ObjectNode objNode) throws IOException {
+	private static void setDatabaseProperties(String dbName, String propName, ObjectNode objNode) {
 		ManageClient client = newManageClient();
 		String databaseProperties = new DatabaseManager(client).getPropertiesAsJson(dbName);
-		JsonNode jnode = new ObjectMapper().readTree(databaseProperties);
+		JsonNode jnode = null;
+		try {
+			jnode = new ObjectMapper().readTree(databaseProperties);
+		} catch (JsonProcessingException e) {
+			fail("Could not parse database-properties: " + databaseProperties + "; cause: " + e.getMessage());
+		}
 
 		if (!jnode.has(propName)) {
 			((ObjectNode) jnode).putArray(propName).addAll(objNode.withArray(propName));
@@ -374,7 +381,7 @@ public static void enableCollectionLexicon(String dbName) {
 		setDatabaseProperties(dbName, "collection-lexicon", true);
 	}
 
-	public static void enableWordLexicon(String dbName) throws Exception {
+	public static void enableWordLexicon(String dbName) {
 		ObjectMapper mapper = new ObjectMapper();
 		ObjectNode childNode = mapper.createObjectNode();
 		ArrayNode childArray = mapper.createArrayNode();
@@ -395,13 +402,11 @@ public static void setMaintainLastModified(String dbName, boolean opt) {
 	 * This function constructs a range element index with default
 	 * collation,range-value-positions and invalid values
 	 */
-	public static void addRangeElementIndex(String dbName, String type, String namespace, String localname)
-			throws Exception {
+	public static void addRangeElementIndex(String dbName, String type, String namespace, String localname) {
 		addRangeElementIndex(dbName, type, namespace, localname, false);
 	}
 
-	public static void addRangeElementIndex(String dbName, String type, String namespace, String localname,
-			boolean positions) throws Exception {
+	public static void addRangeElementIndex(String dbName, String type, String namespace, String localname, boolean positions) {
 		ObjectMapper mapper = new ObjectMapper();
 		ObjectNode mainNode = mapper.createObjectNode();
 
@@ -419,7 +424,7 @@ public static void addRangeElementIndex(String dbName, String type, String names
 		setDatabaseProperties(dbName, "range-element-index", mainNode);
 	}
 
-	public static void addRangeElementIndex(String dbName, String[][] rangeElements) throws Exception {
+	public static void addRangeElementIndex(String dbName, String[][] rangeElements) {
 		ObjectMapper mapper = new ObjectMapper();
 		ObjectNode mainNode = mapper.createObjectNode();
 
@@ -530,7 +535,7 @@ public static void addRangePathIndex(String dbName, String type, String pathexpr
 		setDatabaseProperties(dbName, "range-path-index", childNode);
 	}
 
-	public static void addRangePathIndex(String dbName, String[][] rangePaths) throws Exception {
+	public static void addRangePathIndex(String dbName, String[][] rangePaths) {
 		ObjectMapper mapper = new ObjectMapper();
 		ObjectNode childNode = mapper.createObjectNode();
 		ArrayNode childArray = mapper.createArrayNode();
@@ -585,7 +590,7 @@ public static void addPathNamespace(String dbName, String[][] pathNamespace) thr
 		setDatabaseProperties(dbName, "path-namespace", childNode);
 	}
 
-	public static void setupAppServicesConstraint(String dbName) throws Exception {
+	public static void setupAppServicesConstraint(String dbName) {
 		// Add new range elements into this array
 		String[][] rangeElements = {
 				// { scalar-type, namespace-uri, localname, collation,