Test corrections for proper transaction handling.

Author: Ajit George

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

@@ -724,8 +724,11 @@ public void testBulkWritReadeWithTransaction() throws Exception {
   		}
   		finally {
   			if(tstatus) {
-  				termQueryResults.close();
-  			tx.rollback();}
+  				if (termQueryResults != null)
+  				termQueryResults.close();  			
+  			}
+  			tx.rollback();
+  			tx = null;
   		}    
   	}
 
@@ -2098,6 +2101,7 @@ public void testTransactionCommit() throws Exception {
       }
 
       transaction.commit();
+      transaction = null;
 
       // There should still be no documents in latest collection
       queryMgr = writerClient.newQueryManager();
@@ -2112,176 +2116,196 @@ public void testTransactionCommit() throws Exception {
           termQueryResults.getTotalSize());
     } catch (Exception ex) {
       transaction.rollback();
+      transaction = null;
 
       assertTrue("testTransactionCommit failed", false);
     }
+    finally {
+    	if( transaction != null ) {
+    		transaction.rollback();
+    		transaction = null;
+    	}
+    }
   }
 
   @Test
   // Test transaction rollback with bitemporal documents
   public void testTransactionRollback() throws Exception {
 
     System.out.println("Inside testTransactionRollback");
-
-    String docId = "javaSingleJSONDoc.json";
-   
     Transaction transaction = writerClient
-        .openTransaction("Transaction for BiTemporal");
+            .openTransaction("Transaction for BiTemporal");
 
     try {
-    	insertJSONSingleDocument(temporalCollectionName, docId, null,
-          transaction, null);
-    	} catch (Exception ex) {
-      transaction.rollback();
-
-      assertTrue("insertJSONSingleDocument failed in testTransactionRollback",
-          false);
-    }
+		String docId = "javaSingleJSONDoc.json";
+		try {
+			insertJSONSingleDocument(temporalCollectionName, docId, null,
+		      transaction, null);
+			} catch (Exception ex) {
+		  transaction.rollback();
+		  transaction = null;
+
+		  assertTrue("insertJSONSingleDocument failed in testTransactionRollback",
+		      false);
+		}
 
-    // Verify that the document was inserted
-    JSONDocumentManager docMgr = writerClient.newJSONDocumentManager();
-    DocumentPage readResults = docMgr.read(transaction, docId);
+		// Verify that the document was inserted
+		JSONDocumentManager docMgr = writerClient.newJSONDocumentManager();
+		DocumentPage readResults = docMgr.read(transaction, docId);
 
-    System.out.println("Number of results = " + readResults.size());
-    if (readResults.size() != 1) {
-      transaction.rollback();
+		System.out.println("Number of results = " + readResults.size());
+		if (readResults.size() != 1) {
+		  transaction.rollback();
 
-      assertEquals("Wrong number of results", 1, readResults.size());
-    }
+		  assertEquals("Wrong number of results", 1, readResults.size());
+		}
 
-    DocumentRecord latestDoc = readResults.next();
-    System.out.println("URI after insert = " + latestDoc.getUri());
-    if (!docId.equals(latestDoc.getUri())) {
-      transaction.rollback();
+		DocumentRecord latestDoc = readResults.next();
+		System.out.println("URI after insert = " + latestDoc.getUri());
+		if (!docId.equals(latestDoc.getUri())) {
+		  transaction.rollback();
 
-      assertEquals("Document uri wrong after insert", docId, latestDoc.getUri());
-    }
+		  assertEquals("Document uri wrong after insert", docId, latestDoc.getUri());
+		}
 
-    try {
-      updateJSONSingleDocument(temporalCollectionName, docId, transaction, null);
-    } catch (Exception ex) {
-      transaction.rollback();
+		try {
+		  updateJSONSingleDocument(temporalCollectionName, docId, transaction, null);
+		} catch (Exception ex) {
+		  transaction.rollback();
+		  transaction = null;
 
-      assertTrue("updateJSONSingleDocument failed in testTransactionRollback",
-          false);
-    }
+		  assertTrue("updateJSONSingleDocument failed in testTransactionRollback",
+		      false);
+		}
 
-    // Verify that the document is visible and count is 4
-    // Fetch documents associated with a search term (such as XML) in Address
-    // element
-    QueryManager queryMgr = writerClient.newQueryManager();
-    StructuredQueryBuilder sqb = queryMgr.newStructuredQueryBuilder();
+		// Verify that the document is visible and count is 4
+		// Fetch documents associated with a search term (such as XML) in Address
+		// element
+		QueryManager queryMgr = writerClient.newQueryManager();
+		StructuredQueryBuilder sqb = queryMgr.newStructuredQueryBuilder();
 
-    StructuredQueryDefinition termQuery = sqb.collection(docId);
+		StructuredQueryDefinition termQuery = sqb.collection(docId);
 
-    long start = 1;
-    DocumentPage termQueryResults = docMgr
-        .search(termQuery, start, transaction);
-    System.out
-        .println("Number of results = " + termQueryResults.getTotalSize());
-    if (termQueryResults.getTotalSize() != 4) {
-      transaction.rollback();
+		long start = 1;
+		DocumentPage termQueryResults = docMgr
+		    .search(termQuery, start, transaction);
+		System.out
+		    .println("Number of results = " + termQueryResults.getTotalSize());
+		if (termQueryResults.getTotalSize() != 4) {
+		  transaction.rollback();
 
-      assertEquals("Wrong number of results", 4,
-          termQueryResults.getTotalSize());
-    }
+		  assertEquals("Wrong number of results", 4,
+		      termQueryResults.getTotalSize());
+		}
 
-    transaction.rollback();
+		transaction.rollback();
+
+		// Verify that the document is not there after rollback
+		boolean exceptionThrown = false;
+		try {
+		  JacksonDatabindHandle<ObjectNode> contentHandle = new JacksonDatabindHandle<ObjectNode>(
+		      ObjectNode.class);
+		  DocumentMetadataHandle metadataHandle = new DocumentMetadataHandle();
+		  docMgr.read(docId, metadataHandle, contentHandle);
+		} catch (Exception ex) {
+		  exceptionThrown = true;
+		}
 
-    // Verify that the document is not there after rollback
-    boolean exceptionThrown = false;
-    try {
-      JacksonDatabindHandle<ObjectNode> contentHandle = new JacksonDatabindHandle<ObjectNode>(
-          ObjectNode.class);
-      DocumentMetadataHandle metadataHandle = new DocumentMetadataHandle();
-      docMgr.read(docId, metadataHandle, contentHandle);
-    } catch (Exception ex) {
-      exceptionThrown = true;
-    }
+		if (!exceptionThrown) {
+		  transaction.rollback();
+		
+		  assertTrue("Exception not thrown during read on non-existing uri",
+		      exceptionThrown);
+		}
 
-    if (!exceptionThrown) {
-      transaction.rollback();
-    
-      assertTrue("Exception not thrown during read on non-existing uri",
-          exceptionThrown);
-    }
+		// =======================================================================
+		// Now try rollback with delete
+		System.out.println("Test Rollback after delete");
+		docId = "javaSingleJSONDocForDelete.json";
 
-    // =======================================================================
-    // Now try rollback with delete
-    System.out.println("Test Rollback after delete");
-    docId = "javaSingleJSONDocForDelete.json";
+		transaction = writerClient
+		    .openTransaction("Transaction Rollback for BiTemporal Delete");
 
-    transaction = writerClient
-        .openTransaction("Transaction Rollback for BiTemporal Delete");
+		try {
+			insertJSONSingleDocument(temporalCollectionName, docId, null,
+		      transaction, null);
+			} catch (Exception ex) {
+		  transaction.rollback();
+		  transaction = null;
 
-    try {
-    	insertJSONSingleDocument(temporalCollectionName, docId, null,
-          transaction, null);
-    	} catch (Exception ex) {
-      transaction.rollback();
+		  assertTrue("insertJSONSingleDocument failed in testTransactionRollback",
+		      false);
+		}
 
-      assertTrue("insertJSONSingleDocument failed in testTransactionRollback",
-          false);
-    }
+		// Verify that the document was inserted
+		docMgr = writerClient.newJSONDocumentManager();
+		readResults = docMgr.read(transaction, docId);
 
-    // Verify that the document was inserted
-    docMgr = writerClient.newJSONDocumentManager();
-    readResults = docMgr.read(transaction, docId);
+		System.out.println("Number of results = " + readResults.size());
+		if (readResults.size() != 1) {
+		  transaction.rollback();
 
-    System.out.println("Number of results = " + readResults.size());
-    if (readResults.size() != 1) {
-      transaction.rollback();
+		  assertEquals("Wrong number of results", 1, readResults.size());
+		}
 
-      assertEquals("Wrong number of results", 1, readResults.size());
-    }
+		latestDoc = readResults.next();
+		System.out.println("URI after insert = " + latestDoc.getUri());
+		if (!docId.equals(latestDoc.getUri())) {
+		  transaction.rollback();
 
-    latestDoc = readResults.next();
-    System.out.println("URI after insert = " + latestDoc.getUri());
-    if (!docId.equals(latestDoc.getUri())) {
-      transaction.rollback();
+		  assertEquals("Document uri wrong after insert", docId, latestDoc.getUri());
+		}
 
-      assertEquals("Document uri wrong after insert", docId, latestDoc.getUri());
-    }
+		try {
+		  deleteJSONSingleDocument(temporalCollectionName, docId, transaction);
+		} catch (Exception ex) {
+		  transaction.rollback();
+		  transaction = null;
 
-    try {
-      deleteJSONSingleDocument(temporalCollectionName, docId, transaction);
-    } catch (Exception ex) {
-      transaction.rollback();
+		  assertTrue("deleteJSONSingleDocument failed in testTransactionRollback",
+		      false);
+		}
 
-      assertTrue("deleteJSONSingleDocument failed in testTransactionRollback",
-          false);
-    }
+		// Verify that the document is visible and count is 1
+		// Fetch documents associated with a search term (such as XML) in Address
+		// element
+		queryMgr = writerClient.newQueryManager();
+		sqb = queryMgr.newStructuredQueryBuilder();
 
-    // Verify that the document is visible and count is 1
-    // Fetch documents associated with a search term (such as XML) in Address
-    // element
-    queryMgr = writerClient.newQueryManager();
-    sqb = queryMgr.newStructuredQueryBuilder();
+		termQuery = sqb.collection(docId);
 
-    termQuery = sqb.collection(docId);
+		start = 1;
+		termQueryResults = docMgr.search(termQuery, start, transaction);
+		System.out
+		    .println("Number of results = " + termQueryResults.getTotalSize());
+		if (termQueryResults.getTotalSize() != 1) {
+		  transaction.rollback();
 
-    start = 1;
-    termQueryResults = docMgr.search(termQuery, start, transaction);
-    System.out
-        .println("Number of results = " + termQueryResults.getTotalSize());
-    if (termQueryResults.getTotalSize() != 1) {
-      transaction.rollback();
+		  assertEquals("Wrong number of results", 1,
+		      termQueryResults.getTotalSize());
+		}
 
-      assertEquals("Wrong number of results", 1,
-          termQueryResults.getTotalSize());
-    }
+		transaction.rollback();
+		transaction = null;
 
-    transaction.rollback();
+		// Verify that the document was rolled back and count is 0
+		exceptionThrown = false;
+		try {
+		  readResults = docMgr.read(docId);
+		} catch (Exception ex) {
+		  exceptionThrown = true;
+		}
 
-    // Verify that the document was rolled back and count is 0
-    exceptionThrown = false;
-    try {
-      readResults = docMgr.read(docId);
-    } catch (Exception ex) {
-      exceptionThrown = true;
+		System.out.println("Done");
+	} catch (Exception e) {		
+		e.printStackTrace();		
+	}
+    finally {
+    	if(transaction != null) {
+    		transaction.rollback();
+    		transaction = null;
+    	}    	
     }
-
-    System.out.println("Done");
   }
 
   @Test

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

@@ -496,7 +496,7 @@ public void testBulkWriteDeleteWithTransactions() throws Exception {
 			assertEquals("document count", 102, count);
 			// Perform a bulk delete.
 			docMgr.delete(t1, uris);
-			tstatus = false;
+			
 			count = 0;
 			page = docMgr.read(uris);
 			dh = new DOMHandle();