Changed test methods to handle Uber Port and fixes, added read binary method BasicJavaClientREST

Author: Ajit George

test-complete/src/test/java/com/marklogic/javaclient/BasicJavaClientREST.java

@@ -675,6 +675,49 @@ public void updateDocumentReaderHandle(DatabaseClient client, String filename, S
 
 	    docStream.close();
 	}
+	
+	  /* Read a binary file, and return its contents as an array of bytes.
+	   *
+	   */ 
+	
+	  byte[] readBinaryFile(String binaryFile)
+	  {
+		System.out.println("Read binary file : " + binaryFile);
+	    
+		File file = new File(binaryFile);
+	    System.out.println("File size is : " + file.length());
+	    
+	    byte[] byteArray = new byte[(int)file.length()];
+	    
+	    try {
+	      InputStream input = null;
+	      try {
+	        int totalBytesRead = 0;
+	        input = new BufferedInputStream(new FileInputStream(file));
+	        while(totalBytesRead < byteArray.length){
+	          int bytesRemaining = byteArray.length - totalBytesRead;
+	          //input.read() returns -1, 0, or more :
+	          int bytesRead = input.read(byteArray, totalBytesRead, bytesRemaining); 
+	          if (bytesRead > 0){
+	            totalBytesRead = totalBytesRead + bytesRead;
+	          }
+	        }
+	        
+	        System.out.println("Number of bytes read: " + totalBytesRead);
+	      }
+	      finally {
+	    	  System.out.println("Closing input stream.");
+	        input.close();
+	      }
+	    }
+	    catch (FileNotFoundException fnfex) {
+	    	 System.out.println("File not found Exception.");
+	    }
+	    catch (IOException ioex) {
+	    	 System.out.println(ioex);
+	    }
+	    return byteArray;
+	  }
 
 	/**
 	 * Read document using ReaderHandle
@@ -1070,19 +1113,30 @@ public void updateDocumentUsingByteHandle(DatabaseClient client, String filename
 	{   
 	    // create doc manager
 	    DocumentManager docMgr = null;
+	    byte[] contentInByte = null;
+	    // variable to hold QA data directory path
+	    String dirpath = new String("src/test/java/com/marklogic/javaclient/data/");
+	    
 	    docMgr = documentManagerSelector(client, docMgr, type);	
-				
-	    // acquire the content
-	    FileReader content = new FileReader("src/test/java/com/marklogic/javaclient/data/" + filename);
-	    //String contentInString = new String(content);
-	    BufferedReader br = new BufferedReader(content);
-	    String readContent = "";
-	    String line = null;
-	    while ((line = br.readLine()) != null)
+	    
+	    if(type.equalsIgnoreCase("BINARY"))
+	    {
+	    	contentInByte = readBinaryFile(dirpath + filename);
+	    }
+	    else
+	    {				
+	    	// acquire the content
+	    	FileReader content = new FileReader(dirpath + filename);
+	    	//String contentInString = new String(content);
+	    	BufferedReader br = new BufferedReader(content);
+	    	String readContent = "";
+	    	String line = null;
+	    	while ((line = br.readLine()) != null)
 	    		readContent = readContent + line; 
-	    br.close();
+	    	br.close();
 
-	    byte[] contentInByte = (byte[])readContent.getBytes();
+	    	contentInByte = (byte[])readContent.getBytes();
+	    }
 	    // create an identifier for the document
 	    String docId = uri;
 	    // create a handle on the content

test-complete/src/test/java/com/marklogic/javaclient/TestBytesHandle.java

@@ -23,10 +23,15 @@ public class TestBytesHandle extends BasicJavaClientREST{
 private static String dbName = "BytesHandleDB";
 private static String [] fNames = {"BytesHandleDB-1"};
 private static String restServerName = "REST-Java-Client-API-Server";
+//Additional port to test for Uber port
+private static int uberPort = 8000;
+
 @BeforeClass
 public static void setUp() throws Exception{
 	System.out.println("In setup");
 	setupJavaRESTServer(dbName, fNames[0], restServerName,8011);
+	createUserRolesWithPrevilages("test-eval","xdbc:eval", "xdbc:eval-in","xdmp:eval-in","any-uri","xdbc:invoke");
+    createRESTUser("eval-user", "x", "test-eval","rest-admin","rest-writer","rest-reader");
 	}
 
 @Test
@@ -39,10 +44,10 @@ public void testXmlCRUD() throws IOException , SAXException, ParserConfiguration
 	XMLUnit.setNormalizeWhitespace(true);
 
 	// connect the client
-	DatabaseClient client = DatabaseClientFactory.newClient("localhost", 8011, "rest-writer", "x",Authentication.DIGEST);
+	DatabaseClient client = DatabaseClientFactory.newClient("localhost", uberPort, dbName, "eval-user", "x",Authentication.DIGEST);
 
 	// write docs
-	writeDocumentUsingBytesHandle(client, filename, uri, null,"XML");//***********
+	writeDocumentUsingBytesHandle(client, filename, uri, null,"XML");
 
 	//read docs
 	BytesHandle contentHandle = readDocumentUsingBytesHandle(client, uri + filename,"XML");
@@ -101,7 +106,7 @@ public void testTextCRUD() throws IOException, ParserConfigurationException, SAX
 	System.out.println("Runing test TextCRUD");
 
 	// connect the client
-	DatabaseClient client = DatabaseClientFactory.newClient("localhost", 8011, "rest-writer", "x", Authentication.DIGEST);
+	DatabaseClient client = DatabaseClientFactory.newClient("localhost", uberPort, dbName, "eval-user", "x", Authentication.DIGEST);
 
 	// write docs
 	writeDocumentUsingBytesHandle(client, filename, uri, "Text");
@@ -161,7 +166,7 @@ public void testJsonCRUD() throws IOException, ParserConfigurationException, SAX
 	ObjectMapper mapper = new ObjectMapper();
 
 	// connect the client
-	DatabaseClient client = DatabaseClientFactory.newClient("localhost", 8011, "rest-writer", "x", Authentication.DIGEST);
+	DatabaseClient client = DatabaseClientFactory.newClient("localhost", uberPort, dbName, "eval-user", "x", Authentication.DIGEST);
 
 	// write docs
 	writeDocumentUsingBytesHandle(client, filename, uri, "JSON");
@@ -220,7 +225,7 @@ public void testBinaryCRUD() throws IOException, ParserConfigurationException, S
 	System.out.println("Running testBinaryCRUD");
 
 	// connect the client
-	DatabaseClient client = DatabaseClientFactory.newClient("localhost", 8011, "rest-writer", "x", Authentication.DIGEST);
+	DatabaseClient client = DatabaseClientFactory.newClient("localhost", uberPort, dbName, "eval-user", "x", Authentication.DIGEST);
 
 	// write docs
 	writeDocumentUsingBytesHandle(client, filename, uri, "Binary");
@@ -250,8 +255,8 @@ public void testBinaryCRUD() throws IOException, ParserConfigurationException, S
 
     // get the binary size
 	long sizeUpdate = getBinarySizeFromByte(fileReadUpdate);
-	long expectedSizeUpdate = 3290;
-	//long expectedSizeUpdate = 3322;
+	//long expectedSizeUpdate = 3290;
+	long expectedSizeUpdate = 3322;
 	assertEquals("Binary size difference", expectedSizeUpdate, sizeUpdate);
 
 	// delete the document