Tests updated to verify getId on repository - #456

Author: Ajit George

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

@@ -108,6 +108,7 @@ public void testPOJOSearchWithCollections() {
 			while(p.iterator().hasNext()){
 				Artifact a =p.iterator().next();
 				validateArtifact(a);
+				assertEquals("Repository getId value incorrect", a.getId(), products.getId(a).longValue());
 				assertTrue("Artifact Id is even", a.getId()%2==0);
 				count++;
 			}
@@ -122,6 +123,7 @@ public void testPOJOSearchWithCollections() {
 			while(p.iterator().hasNext()){
 				Artifact a =p.iterator().next();
 				assertTrue("Artifact Id is even", a.getId()%2 !=0);
+		        assertEquals("Repository getId value incorrect", a.getId(), products.getId(a).longValue());
 				validateArtifact(a);
 				products.delete(a.getId());
 				count++;

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

@@ -16,8 +16,7 @@
 
 package com.marklogic.client.functionaltest;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
 
 import java.util.Calendar;
 
@@ -498,6 +497,7 @@ public void testPOJOWriteReadSuper() throws Exception {
 		pojoReposSmallArtifact.write(art,"com.marklogic.client.functionaltest.TestPOJOMissingIdGetSetMethod$SmallArtifactSuper/SmallArtifactSuper.json");
 
 		SmallArtifactNoId artifact1 = pojoReposSmallArtifact.read(artifactName);
+		assertTrue("GetId for String incorrect", "SmallArtifactInSuperOnly".equalsIgnoreCase(pojoReposSmallArtifact.getId(artifact1)));
 		validateSmallArtifactSuper(artifact1);			
 	}
 
@@ -520,11 +520,12 @@ public void testPOJOWriteReadSuperAndSub() throws Exception {
 		art.setInventory(1000);
 		art.setName(artifactName);
 		art.setOriginCountry("USA");
-				
+						
 		// Load the object into database
 		pojoReposSmallArtifact.write(art,"com.marklogic.client.functionaltest.TestPOJOMissingIdGetSetMethod$SmallArtifactSuper/SmallArtifactSuper.json");
 
 		SmallArtifactIdInSuperAndSub artifact1 = pojoReposSmallArtifact.read(artifactName);
+		assertEquals("Repository getId value incorrect", artifact1.getName(), pojoReposSmallArtifact.getId(artifact1).toString());
 		validateSmallArtifactSuperAndSub(artifact1);			
 	}