Changeset 5072

Timestamp:

Aug 21, 2009, 9:07:59 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

References #108: Logging the change history of an item

Added some more tests to the test program.

File:

• trunk/src/test/TestChangeHistory.java (modified) (5 diffs)

trunk/src/test/TestChangeHistory.java

@@ -35 +35 @@
 import net.sf.basedb.core.ItemResultList;
 import net.sf.basedb.core.ProgressReporter;
+import net.sf.basedb.core.Type;
 import net.sf.basedb.core.User;
 import net.sf.basedb.core.log.LogManagerFactory;
@@ -65 +66 @@
     int bioSourceId = TestBioSource.test_create("Biosource 1", false);
     int sampleId = TestSample.test_create(bioSourceId, "Sample 1", false);
+    int annotationTypeId = TestAnnotationType.test_create("change", Type.INT, 0, null, null, Item.SAMPLE, 1, null, false);
+    TestAnnotation.test_annotatate(Item.SAMPLE, sampleId, annotationTypeId, 0, 1);
+    TestAnnotation.test_annotatate(Item.SAMPLE, sampleId, annotationTypeId, 0, 2);
+    TestAnnotation.test_remove_annotation(Item.SAMPLE, sampleId, annotationTypeId);
     int extractId = TestExtract.test_create(sampleId, false);
     TestExtract.test_delete(extractId);
     
     test_list_by_item(Item.BIOSOURCE, bioSourceId, 1);
-    test_list_by_user(TestUtil.getSessionControl().getLoggedInUserId(), since, 4);
+    test_list_by_item(Item.SAMPLE, sampleId, 6);
+    /*
+      Total change log events:
+      4 CREATE (biosource, sample, annotationtype, extract)
+      5 UPDATE (when adding, updating and removing the annotation from the sample)
+      1 DELETE (extract)
+    */
+    test_list_by_user(TestUtil.getSessionControl().getLoggedInUserId(), since, 10);
     
     if (TestUtil.waitBeforeDelete()) TestUtil.waitForEnter();
@@ -75 +87 @@
     TestSample.test_delete(sampleId);
     TestBioSource.test_delete(bioSourceId);
-    test_delete_stray(6);
+    TestAnnotationType.test_delete(annotationTypeId);
+    test_delete_stray(13);
     set_log_manager(old);
     write("++Testing change history "+(ok ? "OK" : "Failed")+"\n");
@@ -98 +111 @@
         throw new BaseException("Expected "+expectedResults+" results, not "+l.size());
       }
-      write("--List history of item OK ("+l.size()+")");
+      write("--List history of " + item + " OK ("+l.size()+")");
     }
     catch (Throwable ex)
     {
-      write("--List history of item FAILED");
+      write("--List history of " + itemType + "[id=" + itemId + "] FAILED");
       ex.printStackTrace();
       ok = false;
@@ -160 +173 @@
     throws BaseException
   {
-    BasicItem item = null;
-    try
-    {
-      item = c.getItem(null);
+    String item = null;
+    try
+    {
+      BasicItem b = c.getItem(null);
+      item = b.toString();
     }
     catch (ItemNotFoundException ex)
-    {}
+    {
+      item = c.getItemType() + "[id=" + c.getItemId() + "; not found]";
+    }
     if (!TestUtil.getSilent()) System.out.println(i+":\t"+c.getId()+"\t"+c.getTime()+"\t"+
       c.getChangeType() + "\t" + item + "\t" + c.getChangeInfo()+"\t"+c.getUser(null));