Changeset 6430

Timestamp:

Mar 10, 2014, 11:16:36 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #1784: Add support for logging old values

Extending the test case with updating some properties of a sample and making sure that log entries are created.

Location:

trunk/src

Files:

• core/net/sf/basedb/core/log/db/DbLogManagerFactory.java (modified) (3 diffs)
• test/TestChangeHistory.java (modified) (8 diffs)

trunk/src/core/net/sf/basedb/core/log/db/DbLogManagerFactory.java

@@ -37 +37 @@
 import net.sf.basedb.core.log.LogManager;
 import net.sf.basedb.core.log.LogManagerFactory;
+import net.sf.basedb.core.log.db.AnnotationLogger;
+import net.sf.basedb.core.log.db.AnnotationSetLogger;
+import net.sf.basedb.core.log.db.AnyToAnyLogger;
+import net.sf.basedb.core.log.db.BioMaterialEventLogger;
+import net.sf.basedb.core.log.db.DefaultEntityLogger;
+import net.sf.basedb.core.log.db.FileSetMemberLogger;
+import net.sf.basedb.core.log.db.PlateEventLogger;
 import net.sf.basedb.util.extensions.ActionFactory;
 import net.sf.basedb.util.extensions.InvokationContext;
@@ -60 +67 @@
   public DbLogManagerFactory()
   {
+    this(Config.getBoolean("changelog.dblogger.detailed-properties"), Config.getBoolean("changelog.dblogger.old-property-values"));
+  }
+  
+  public DbLogManagerFactory(boolean detailedProperties, boolean oldValues)
+  {
     this.specialLoggers = new HashMap<Class, EntityLogger>();
-    this.detailedProperties = Config.getBoolean("changelog.dblogger.detailed-properties");
-    this.oldPropertyValues = detailedProperties ? Config.getBoolean("changelog.dblogger.old-property-values") : false;
+    this.detailedProperties = detailedProperties;
+    this.oldPropertyValues = detailedProperties && oldValues;
 
     this.defaultLogger = new DefaultEntityLogger(this);
@@ -71 +83 @@
     setSpecialLogger(AnnotationSetData.class, new AnnotationSetLogger(this));
     setSpecialLogger(AnyToAnyData.class, new AnyToAnyLogger(this));
+    
   }
   

trunk/src/test/TestChangeHistory.java

@@ -28 +28 @@
 import net.sf.basedb.core.BasicItem;
 import net.sf.basedb.core.ChangeHistory;
+import net.sf.basedb.core.Sample;
 import net.sf.basedb.core.DbControl;
 import net.sf.basedb.core.Item;
@@ -79 +80 @@
     
     Extension<LogManagerFactory> logger = new ExtensionBean<LogManagerFactory>(
-      "test.db-logger", "net.sf.basedb.core.log-manager", 1, null, new DbLogManagerFactory(), null);
+      "test.db-logger", "net.sf.basedb.core.log-manager", 1, null, new DbLogManagerFactory(true, true), null);
     xtRegistry.registerExtension(logger, null);
     
@@ -86 +87 @@
     int bioSourceId = TestBioSource.test_create("Biosource 1", false);
     int sampleId = TestSample.test_create(bioSourceId, "Sample 1", 0, false);
+    test_update_sample(sampleId);
     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);
@@ -94 +96 @@
     
     test_list_by_item(Item.BIOSOURCE, bioSourceId, 1);
-    test_list_by_item(Item.SAMPLE, sampleId, 6);
+    test_list_by_item(Item.SAMPLE, sampleId, 7);
     /*
       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)
+      5 CREATE (biosource, sample, annotationtype, extract, annotation)
+      4 UPDATE (when updating and removing the annotation from the sample)
+      2 DELETE (extract, annotation)
     */
-    test_list_by_user(TestUtil.getSessionControl().getLoggedInUserId(), since, 10);
+    test_list_by_user(TestUtil.getSessionControl().getLoggedInUserId(), since, 11);
     
     if (TestUtil.waitBeforeDelete()) TestUtil.waitForEnter();
@@ -108 +110 @@
     TestBioSource.test_delete(bioSourceId);
     TestAnnotationType.test_delete(annotationTypeId);
-    // 13 = The original 10 create+update + 3 delete
-    test_delete_stray(13);
+    // 14 = The original 11 create+update + 3 delete
+    test_delete_stray(14);
     
     xtRegistry.unregisterExtension("test.db-logger");
@@ -194 +196 @@
     if (!TestUtil.getSilent())
     {
-      write("   \tID \tTime     \tType\tItem  \tChange info\tUser");
-      write("-- \t-- \t---------\t----\t------\t-----------\t----");
+      write("   \tID \tTime     \tType\tItem  \tChange info\tOld value\tNew value\tUser");
+      write("-- \t-- \t---------\t----\t------\t-----------\t---------\t---------\t----");
     }
   }
@@ -212 +214 @@
     }
     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));
+      c.getChangeType() + "\t" + item + "\t" + c.getChangeInfo()+"\t"+c.getOldValue()+"\t"+c.getNewValue()+"\t"+c.getUser(null));
   }
   static void write(String message)
@@ -242 +244 @@
   }
 
+  static void test_update_sample(int sampleId)
+  {
+    DbControl dc = null;
+    try
+    {
+      dc = TestUtil.getDbControl();
+      Sample s = Sample.getById(dc, sampleId);
+      s.setName("Updated name");
+      s.setExternalId("Added external id");
+      dc.commit();
+      write("--Updated sample OK");
+    }
+    catch (Throwable ex)
+    {
+      write("--Updated sample FAILED");
+      ex.printStackTrace();
+      ok = false;
+    }
+    finally
+    {
+      if (dc != null) dc.close();
+    }
+  }
 }