Merge remote-tracking branch 'origin/newRegressionTests' into dev

Author: sravanr

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

@@ -342,6 +342,13 @@ public void testPOJORepoDeleteDateTime() {
 		validateSpecialArtifactDateTime(artifact, artifactName, longId, calTime);
 
 		pojoReposProducts.delete(calTime);
+		// Introduce a wait for the document to be deleted.
+		try {
+			Thread.sleep(5000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 		// Validate the artifact read back.
 		long count = pojoReposProducts.count();
 

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

@@ -18,6 +18,7 @@
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.DatabaseClientFactory;
 import com.marklogic.client.DatabaseClientFactory.Authentication;
+import com.marklogic.client.FailedRequestException;
 import com.marklogic.client.Transaction;
 import com.marklogic.client.admin.ExtensionLibrariesManager;
 import com.marklogic.client.document.DocumentDescriptor;
@@ -96,6 +97,28 @@ public void testPartialUpdateXML() throws IOException
 		// release client
 		client.release();		
 	}
+	
+	/* Used to test Git issue # 94 along with uber-app server. use a bad user to authenticate client.
+	 * Should be throwing FailedRequestException Exception.
+	 * Message : Local message: write failed: Unauthorized. Server Message: Unauthorized
+	 */
+	@Test(expected=FailedRequestException.class)	
+	public void testJSONParserException() throws IOException
+	{	
+		System.out.println("Running testPartialUpdateJSON");
+
+		String[] filenames = {"json-original.json"};
+
+		DatabaseClient client = DatabaseClientFactory.newClient("localhost", uberPort, dbName, "bad-eval-user", "x", Authentication.DIGEST);
+
+		// write docs
+		for(String filename : filenames)
+		{
+			writeDocumentUsingInputStreamHandle(client, filename, "/partial-update/", "JSON");
+		}		
+		// release client
+		client.release();		
+	}
 
 	@Test	
 	public void testPartialUpdateJSON() throws IOException
@@ -122,8 +145,9 @@ public void testPartialUpdateJSON() throws IOException
 		fragmentNode = mapper.createObjectNode();
 		fragmentNode.put("insertedKey", 9);
 		String fragment = mapper.writeValueAsString(fragmentNode);
-
-		patchBldr.insertFragment("$.employees", Position.LAST_CHILD, fragment);
+		
+		String jsonpath = new String("$.employees[2]"); 
+		patchBldr.insertFragment(jsonpath, Position.AFTER, fragment);
 		DocumentPatchHandle patchHandle = patchBldr.build();
 		docMgr.patch(docId, patchHandle);
 
@@ -532,10 +556,14 @@ public void testPartialUpdateCombinationTranscRevert() throws Exception{
 
 	}
 
+	/* We have Git issue #199 that tracks multiple patch on same JSONPath index.
+	 * This test uses different path index. This test was modified to account for the 
+	 * correct path index elements. 
+	 */
 	@Test	
 	public void testPartialUpdateCombinationJSON() throws Exception{
 		System.out.println("Running testPartialUpdateCombinationJSON");
-		DatabaseClient client = DatabaseClientFactory.newClient("localhost", uberPort, dbName, "eval-user", "x", Authentication.DIGEST);
+		DatabaseClient client = DatabaseClientFactory.newClient("localhost", 8011, "rest-writer", "x", Authentication.DIGEST);
 
 		// write docs
 		String[] filenames = {"json-original.json"};
@@ -557,23 +585,24 @@ public void testPartialUpdateCombinationJSON() throws Exception{
 		fragmentNode = mapper.createObjectNode();
 		fragmentNode.put("insertedKey", 9);
 		String fragment = mapper.writeValueAsString(fragmentNode);
-		patchBldr.insertFragment("$.employees", Position.LAST_CHILD, fragment).delete("$.employees[2]").replaceApply("$.employees[1].firstName", patchBldr.call().concatenateAfter("Hi"));
+		// Original - patchBldr.insertFragment("$.employees", Position.LAST_CHILD, fragment).delete("$.employees[2]").replaceApply("$.employees[1].firstName", patchBldr.call().concatenateAfter("Hi"));
+		patchBldr.insertFragment("$.employees[0]", Position.AFTER, fragment).delete("$.employees[2]").replaceApply("$.employees[1].firstName", patchBldr.call().concatenateAfter("Hi"));
 		DocumentPatchHandle patchHandle = patchBldr.build();
 		docMgr.patch(docId, patchHandle);
 
 		String content = docMgr.read(docId, new StringHandle()).get();
 
 		System.out.println("After" + content);
 
-		assertTrue("fragment is not inserted", content.contains("{\"insertedKey\":9}]"));
+		assertTrue("fragment is not inserted", content.contains("{\"insertedKey\":9}"));
 		assertTrue("fragment is not inserted", content.contains("{\"firstName\":\"AnnHi\", \"lastName\":\"Smith\"}"));
 		assertFalse("fragment is not deleted",content.contains("{\"firstName\":\"Bob\", \"lastName\":\"Foo\"}"));
 
 		// release client
 		client.release();	
 
 	}
-
+	
 	@Test	
 	public void testPartialUpdateMetadata() throws Exception{
 		System.out.println("Running testPartialUpdateMetadata");
@@ -711,7 +740,7 @@ public void testPartialUpdateJSONDescriptor() throws IOException
 		fragmentNode.put("insertedKey", 9);
 		String fragment = mapper.writeValueAsString(fragmentNode);
 
-		patchBldr.insertFragment("$.employees", Position.LAST_CHILD, fragment);
+		patchBldr.insertFragment("$.employees[2]", Position.AFTER, fragment);
 		DocumentPatchHandle patchHandle = patchBldr.build();
 
 		docMgr.patch(desc, patchHandle);
@@ -795,7 +824,7 @@ public void testPartialUpdateJSONDescriptorTranc() throws IOException
 		fragmentNode.put("insertedKey", 9);
 		String fragment = mapper.writeValueAsString(fragmentNode);
 		patchBldr.pathLanguage(PathLanguage.JSONPATH);
-		patchBldr.insertFragment("$.employees", Position.LAST_CHILD, fragment);
+		patchBldr.insertFragment("$.employees[2]", Position.AFTER, fragment);
 		DocumentPatchHandle patchHandle = patchBldr.build();
 		//		Transaction t = client.openTransaction("Tranc");
 		docMgr.patch(desc, patchHandle);//,t);