Fixing HandleAsTest when run with reverse proxy

Now using `Common.newClientBuilder()` so that the base path is taken into account.

Separated `testHandleRegistry` into two separate tests as well so it's easy to understand which scenario failed.

Author: rjrudin

marklogic-client-api/src/test/java/com/marklogic/client/test/HandleAsTest.java

@@ -300,76 +300,80 @@ public void testSearch() throws JAXBException {
     client.release();
   }
 
-  @Test
-  public void testHandleRegistry() {
-    int[] iterations = {1,2};
-    for (int i: iterations) {
-      DatabaseClientFactory.Bean clientFactoryBean = (i == 1) ? null : makeClientFactoryBean();
-
-      HandleFactoryRegistry registry =
-        (i == 1) ? DatabaseClientFactory.getHandleRegistry()
-                 : clientFactoryBean.getHandleRegistry();
-
-      registry.register(new BufferHandleFactory());
-      assertTrue(registry.isRegistered(StringBuilder.class));
-
-      Set<Class<?>> registered = registry.listRegistered();
-      assertTrue(registered.contains(StringBuilder.class));
-
-      ContentHandle<StringBuilder> handle = registry.makeHandle(StringBuilder.class);
-      assertNotNull(handle);
-      assertEquals(handle.getClass(),BufferHandle.class);
-
-      // instantiate a client with a copy of the registry
-      DatabaseClient client =
-        (i == 1) ? DatabaseClientFactory.newClient(Common.HOST, Common.PORT, Common.newSecurityContext(Common.USER, Common.PASS))
-                 : clientFactoryBean.newClient();
-
-      registry.unregister(StringBuilder.class);
-      assertTrue(!registry.isRegistered(StringBuilder.class));
-
-      String beforeText = "A simple text document";
-
-      TextDocumentManager textMgr = client.newTextDocumentManager();
-      String textDocId = "/test/testAs1.txt";
-
-      // use the handled class
-      StringBuilder buffer = new StringBuilder();
-      buffer.append(beforeText);
-
-      textMgr.writeAs(textDocId, buffer);
-      buffer = textMgr.readAs(textDocId, StringBuilder.class);
-      textMgr.delete(textDocId);
-      assertEquals(beforeText, buffer.toString());
-
-      boolean threwError = false;
-      try {
-        textMgr.writeAs(textDocId, new Integer(5));
-      } catch(Exception e) {
-        threwError = true;
-      }
-      assertTrue(threwError);
-
-      threwError = false;
-      try {
-        textMgr.readAs(textDocId, Integer.class);
-      } catch(Exception e) {
-        threwError = true;
-      }
-      assertTrue(threwError);
-
-      client.release();
-    }
-  }
-
-  private DatabaseClientFactory.Bean makeClientFactoryBean() {
-    DatabaseClientFactory.Bean clientFactoryBean = new DatabaseClientFactory.Bean();
-    clientFactoryBean.setHost(Common.HOST);
-    clientFactoryBean.setPort(Common.PORT);
-	clientFactoryBean.setBasePath(Common.BASE_PATH);
-	clientFactoryBean.setSecurityContext(Common.newSecurityContext(Common.USER, Common.PASS));
-    return clientFactoryBean;
-  }
+	@Test
+	void testHandleRegistryWithClientFactoryBean() {
+		verifyHandleRegistry(makeClientFactoryBean());
+	}
+
+	@Test
+	void testHandleRegistryWithoutClientFactoryBean() {
+		verifyHandleRegistry(null);
+	}
+
+	private void verifyHandleRegistry(DatabaseClientFactory.Bean clientFactoryBean) {
+		HandleFactoryRegistry registry = clientFactoryBean == null ?
+			DatabaseClientFactory.getHandleRegistry() :
+			clientFactoryBean.getHandleRegistry();
+
+		registry.register(new BufferHandleFactory());
+		assertTrue(registry.isRegistered(StringBuilder.class));
+
+		Set<Class<?>> registered = registry.listRegistered();
+		assertTrue(registered.contains(StringBuilder.class));
+
+		ContentHandle<StringBuilder> handle = registry.makeHandle(StringBuilder.class);
+		assertNotNull(handle);
+		assertEquals(handle.getClass(),BufferHandle.class);
+
+		// instantiate a client with a copy of the registry
+		DatabaseClient client = clientFactoryBean == null ?
+			Common.newClientBuilder().build() :
+			clientFactoryBean.newClient();
+
+		registry.unregister(StringBuilder.class);
+		assertTrue(!registry.isRegistered(StringBuilder.class));
+
+		String beforeText = "A simple text document";
+
+		TextDocumentManager textMgr = client.newTextDocumentManager();
+		String textDocId = "/test/testAs1.txt";
+
+		// use the handled class
+		StringBuilder buffer = new StringBuilder();
+		buffer.append(beforeText);
+
+		textMgr.writeAs(textDocId, buffer);
+		buffer = textMgr.readAs(textDocId, StringBuilder.class);
+		textMgr.delete(textDocId);
+		assertEquals(beforeText, buffer.toString());
+
+		boolean threwError = false;
+		try {
+			textMgr.writeAs(textDocId, new Integer(5));
+		} catch(Exception e) {
+			threwError = true;
+		}
+		assertTrue(threwError);
+
+		threwError = false;
+		try {
+			textMgr.readAs(textDocId, Integer.class);
+		} catch(Exception e) {
+			threwError = true;
+		}
+		assertTrue(threwError);
+
+		client.release();
+	}
+
+	private DatabaseClientFactory.Bean makeClientFactoryBean() {
+		DatabaseClientFactory.Bean clientFactoryBean = new DatabaseClientFactory.Bean();
+		clientFactoryBean.setHost(Common.HOST);
+		clientFactoryBean.setPort(Common.PORT);
+		clientFactoryBean.setBasePath(Common.BASE_PATH);
+		clientFactoryBean.setSecurityContext(Common.newSecurityContext(Common.USER, Common.PASS));
+		return clientFactoryBean;
+	}
 
   static public class BufferHandle
     extends BaseHandle<String, String>