Functionl test changes for OKHttp

Author: georgeajit

test-complete/src/test/java/com/marklogic/client/functionaltest/BasicJavaClientREST.java

@@ -111,27 +111,6 @@
 import com.marklogic.client.io.XMLEventReaderHandle;
 import com.marklogic.client.io.XMLStreamReaderHandle;
 
-
-
-//import com.sun.xml.internal.ws.util.xml.StAXSource;
-//Importing for http client calls
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.util.*;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.entity.FileEntity;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.NameValuePair;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.client.entity.*;
-
-
 public abstract class BasicJavaClientREST extends ConnectedRESTQA
 {
     protected static String checkDoc =

test-complete/src/test/java/com/marklogic/client/functionaltest/TestCRUDModulesDb.java

@@ -148,11 +148,11 @@ public void testXQueryModuleCRUDBinaryFile() {
 		String Path = "/ext/my/path/to/my/module.xqy";
 
 		// write XQuery file to the modules database
-		libsMgr.write(Path, new FileHandle(new File("src/test/java/com/marklogic/client/functionaltest/data/binary.jpg")).withFormat(Format.BINARY));
+		File fBin = new File("src/test/java/com/marklogic/client/functionaltest/data/binary.jpg");
+		libsMgr.write(Path, new FileHandle(fBin).withFormat(Format.BINARY));
 
 		// read it back
-			FileHandle f = new FileHandle(new File("src/test/java/com/marklogic/client/functionaltest/data/binary.jpg"));
-		assertEquals(f.getByteLength(),libsMgr.read(Path, new StringHandle()).getByteLength());
+		assertEquals(fBin.length(), libsMgr.read(Path, new StringHandle()).getByteLength());
 
 		// get the list of descriptors
 		ExtensionLibraryDescriptor[] descriptors = libsMgr.list();
@@ -170,8 +170,7 @@ public void testXQueryModuleCRUDBinaryFile() {
 		    libsMgr.read(Path, new StringHandle()).get();
 		} catch (ResourceNotFoundException e) {
 			// pass;
-		}
-		
+		}		
 	}
 
 
@@ -220,13 +219,16 @@ public void testXQueryModuleCRUDBinaryFile() {
 		ExtensionLibrariesManager libsMgr = client.newServerConfigManager().newExtensionLibrariesManager();
 
 		String Path = "/ext/my/path/to/my/module.xqy";
-		FileHandle f = new FileHandle(new File("src/test/java/com/marklogic/client/functionaltest/data/all_well.xml")).withFormat(Format.XML);
-
+		File fXML = new File("src/test/java/com/marklogic/client/functionaltest/data/all_well.xml");
+		FileHandle f = new FileHandle().with(fXML).withFormat(Format.XML);
 		// write XQuery file to the modules database
 		libsMgr.write(Path, f);
+		StringHandle strHandle = new StringHandle();
 
 		// read it back
-		assertEquals(f.getByteLength(), libsMgr.read(Path, new StringHandle()).getByteLength());
+		assertTrue(libsMgr.read(Path, strHandle).getByteLength()>0);
+		assertTrue(strHandle.get().contains("All's Well That Ends Well"));
+		assertTrue(strHandle.get().contains("Exeunt"));
 
 		// get the list of descriptors
 		ExtensionLibraryDescriptor[] descriptors = libsMgr.list();

test-complete/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientConnection.java

@@ -83,7 +83,7 @@ public class TestDatabaseClientConnection extends BasicJavaClientREST{
 	public static void setUp() throws Exception 
 	{
 		System.out.println("In setup");	
-		System.setProperty("org.apache.commons.logging.simplelog.log.org.apache.http.wire", "debug");
+		//System.setProperty("org.apache.commons.logging.simplelog.log.org.apache.http.wire", "debug");
 		setupJavaRESTServer(dbName, fNames[0], restServerName,8011);
 
 		/*
@@ -158,7 +158,7 @@ public void testDatabaseClientConnectionExist()
 
 		DatabaseClient client = DatabaseClientFactory.newClient("localhost", 8033, "rest-reader", "x", Authentication.DIGEST);
 
-		String expectedException = "com.sun.jersey.api.client.ClientHandlerException: org.apache.http.conn.HttpHostConnectException: Connection to http://localhost:8033 refused";
+		String expectedException = "java.net.ConnectException: Failed to connect to localhost";
 		String exception = "";
 
 		// write doc
@@ -167,7 +167,7 @@ public void testDatabaseClientConnectionExist()
 		}
 		catch (Exception e) { exception = e.toString(); }
 
-		assertEquals("Exception is not thrown", expectedException, exception);
+		assertTrue("Exception is not thrown", exception.contains(expectedException));
 
 		// release client
 		client.release();