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

sravanr · sravanr · commit 6969a1cb32bb · 2015-01-19T09:56:07.000-08:00
diff --git a/test-complete/src/test/java/com/marklogic/client/functionaltest/TestPOJOWithStringQD.java b/test-complete/src/test/java/com/marklogic/client/functionaltest/TestPOJOWithStringQD.java
@@ -285,7 +285,7 @@ public void testPOJOSearchWithStringHandle() throws JsonProcessingException, IOE
 		JsonNode actNode = mapper.readTree(results.get()).get("total");
 //		System.out.println(expNode.equals(actNode)+"\n"+ expNode.toString()+"\n"+actNode.toString());
 		
-		assertNull("Total search results resulted are ",actNode );
+		assertEquals("Total search results resulted are ",actNode.asInt(),0 );
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ public void testPOJOSearchWithStringHandle() throws JsonProcessingException, IOE`
`285`	`285`	`JsonNode actNode = mapper.readTree(results.get()).get("total");`
`286`	`286`	`// System.out.println(expNode.equals(actNode)+"\n"+ expNode.toString()+"\n"+actNode.toString());`
`287`	`287`
`288`		`- assertNull("Total search results resulted are ",actNode );`
	`288`	`+ assertEquals("Total search results resulted are ",actNode.asInt(),0 );`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`}`