Changeset 6585

Timestamp:

Oct 31, 2014, 10:43:13 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #1873: Deleting child biomaterial doesn't return the used quantity to the parent

Test program for change history failed now that the remaining quantity is updated when a child item is deleted. This generates an extra entry in the change history table for the parent item that wasn't accounted for.

File:

• branches/3.3-stable/src/test/TestChangeHistory.java (modified) (2 diffs)

branches/3.3-stable/src/test/TestChangeHistory.java

@@ -95 +95 @@
     TestExtract.test_delete(extractId);
     
+    // 1 CREATE event only
     test_list_by_item(Item.BIOSOURCE, bioSourceId, 1);
-    test_list_by_item(Item.SAMPLE, sampleId, 7);
+    
+    /*
+      1 CREATE
+      2 UPDATE (name and externalId)
+      3 ADD+UPDATE+REMOVE ('change' annotation)
+      2 UPDATE (remainingQuantity when creating/deleting extract)
+    */
+    test_list_by_item(Item.SAMPLE, sampleId, 8);
     /*
       Total change log events:
-      5 CREATE (biosource, sample, annotationtype, extract, annotation)
-      4 UPDATE (when updating and removing the annotation from the sample)
-      2 DELETE (extract, annotation)
+      4 CREATE (biosource, sample, annotationtype, extract)
+      1 ADD (annotation)
+      5 UPDATE (when updating the sample, it's annotation and child extract)
+      1 REMOVE (annotation)
+      1 DELETE (extract)
     */
-    test_list_by_user(TestUtil.getSessionControl().getLoggedInUserId(), since, 11);
+    test_list_by_user(TestUtil.getSessionControl().getLoggedInUserId(), since, 12);
     
     if (TestUtil.waitBeforeDelete()) TestUtil.waitForEnter();
@@ -110 +120 @@
     TestBioSource.test_delete(bioSourceId);
     TestAnnotationType.test_delete(annotationTypeId);
-    // 14 = The original 11 create+update + 3 delete
-    test_delete_stray(14);
+    // 15 = The original 12 create+update + 3 delete
+    test_delete_stray(15);
     
     xtRegistry.unregisterExtension("test.db-logger");