Changeset 6086

Timestamp:

Aug 17, 2012, 2:35:41 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

References #1601: Convert logging plug-in system to an extension point

The test code didn't work since it still used the old system. It has now been converted to the extensions system.

File:

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

trunk/src/test/TestChangeHistory.java

@@ -22 +22 @@
 */
 
-import java.lang.reflect.Field;
 import java.util.Date;
 
@@ -43 +42 @@
 import net.sf.basedb.core.query.Restrictions;
 import net.sf.basedb.util.ConsoleProgressReporter;
+import net.sf.basedb.util.extensions.Extension;
+import net.sf.basedb.util.extensions.ExtensionBean;
+import net.sf.basedb.util.extensions.Registry;
+import net.sf.basedb.util.extensions.manager.Settings;
 
 public class TestChangeHistory
@@ -62 +65 @@
     
     ChangeHistory.deleteStrayEntries(null);
-    LogManagerFactory old = set_log_manager(new DbLogManagerFactory());
+    
+    // Register a new instance of the DbLogger as an extension
+    // If the core logger is enabled, disable it
+    Settings xtSettings = Application.getExtensionsManager().getSettings();
+    Registry xtRegistry = Application.getExtensionsManager().getRegistry();
+    Extension coreLogger = xtRegistry.getExtension("net.sf.basedb.core.db-log-manager");
+    boolean coreLoggerWasEnabled = false;
+    if (coreLogger != null && xtSettings.isEnabled(coreLogger))
+    {
+      coreLoggerWasEnabled = true;
+      xtSettings.enableExtension(coreLogger.getId(), false);
+    }
+    
+    Extension<LogManagerFactory> logger = new ExtensionBean<LogManagerFactory>(
+      "test.db-logger", "net.sf.basedb.core.log-manager", 1, null, new DbLogManagerFactory(), null);
+    xtRegistry.registerExtension(logger, null);
+    
+    //LogManagerFactory old = set_log_manager(new DbLogManagerFactory());
     Date since = new Date();
     int bioSourceId = TestBioSource.test_create("Biosource 1", false);
@@ -88 +108 @@
     TestBioSource.test_delete(bioSourceId);
     TestAnnotationType.test_delete(annotationTypeId);
+    // 13 = The original 10 create+update + 3 delete
     test_delete_stray(13);
-    set_log_manager(old);
+    
+    xtRegistry.unregisterExtension("test.db-logger");
+    
+    if (coreLoggerWasEnabled)
+    {
+      xtSettings.enableExtension(coreLogger.getId(), true);
+    }
+    
     write("++Testing change history "+(ok ? "OK" : "Failed")+"\n");
     return ok;
@@ -214 +242 @@
   }
 
-  static LogManagerFactory set_log_manager(LogManagerFactory factory)
-  {
-    LogManagerFactory old = null;
-    try
-    {
-      Field logManager = Application.class.getDeclaredField("logManagerFactory");
-      logManager.setAccessible(true);
-      old = (LogManagerFactory)logManager.get(null);
-      logManager.set(null, factory);
-    }
-    catch (Exception ex)
-    {
-      ex.printStackTrace();
-    }
-    return old;
-  }
 }