fix #4 since my logic in InvalidUserTest.java needed fixing to actually run the assert; also added SSLTest.java for additional validation

Author: sammefford

src/test/java/com/marklogic/client/test/InvalidUserTest.java

@@ -40,21 +40,20 @@ public void testInvalidUserAuth() {
 
         String docId = "/example/text.txt";
         TextDocumentManager docMgr = client.newTextDocumentManager();
-        // write doc
-        try
-        {
-            // make use of the client connection
+        try {
+            // make use of the client connection so we get an auth error
             StringHandle handle = new StringHandle();
             handle.set("A simple text document");
             docMgr.write(docId, handle);
-            assertEquals(expectedException, exception);
+            // the next line will only run if write doesn't throw an exception
             docMgr.delete(docId);
         }
         catch (Exception e) {
             exception = e.toString();
         } finally {
             client.release();
         }
+        assertEquals(expectedException, exception);
 
     }
 }

src/test/java/com/marklogic/client/test/SSLTest.java

@@ -37,20 +37,20 @@ public class SSLTest {
     @Test
     public void testSSLAuth() throws NoSuchAlgorithmException, KeyManagementException {
 
-		// create a trust manager
-		// (note: a real application should verify certificates)
-		TrustManager naiveTrustMgr = new X509TrustManager() {
-			@Override
-			public void checkClientTrusted(X509Certificate[] chain, String authType) {
-			}
-			@Override
-			public void checkServerTrusted(X509Certificate[] chain, String authType) {
-			}
-			@Override
-			public X509Certificate[] getAcceptedIssuers() {
-				return new X509Certificate[0];
-			}
-		};
+        // create a trust manager
+        // (note: a real application should verify certificates)
+        TrustManager naiveTrustMgr = new X509TrustManager() {
+            @Override
+            public void checkClientTrusted(X509Certificate[] chain, String authType) {
+            }
+            @Override
+            public void checkServerTrusted(X509Certificate[] chain, String authType) {
+            }
+            @Override
+            public X509Certificate[] getAcceptedIssuers() {
+                return new X509Certificate[0];
+            }
+        };
 
         // create an SSL context
         SSLContext sslContext = SSLContext.getInstance("SSLv3");
@@ -60,18 +60,18 @@ public X509Certificate[] getAcceptedIssuers() {
         DatabaseClient client = DatabaseClientFactory.newClient("localhost", 8012, "MyFooUser", "x", Authentication.DIGEST, sslContext, SSLHostnameVerifier.ANY);
 
 
-        String expectedException = "FailedRequestException: Local message: write failed: Unauthorized";
+        String expectedException = "com.sun.jersey.api.client.ClientHandlerException: javax.net.ssl.SSLPeerUnverifiedException: peer not authenticated";
         String exception = "";
 
-        // write doc
-        try
-        {
-            // make use of the client connection
+        try {
+            // make use of the client connection so we get an auth error
             TextDocumentManager docMgr = client.newTextDocumentManager();
             String docId = "/example/text.txt";
             StringHandle handle = new StringHandle();
             handle.set("A simple text document");
             docMgr.write(docId, handle);
+            // the next line will only run if write doesn't throw an exception
+            docMgr.delete(docId);
         }
         catch (Exception e) {
             exception = e.toString();