Author: [log in to unmask]
Date: Mon Nov 17 16:32:06 2014
New Revision: 1562
Log:
Manually initialize DatabaseConditionsManager in tests that do not use the JobManager.
Modified:
java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtBadChannelTest.java
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java Mon Nov 17 16:32:06 2014
@@ -9,8 +9,8 @@
import junit.framework.TestCase;
-import org.hps.conditions.TestRunConditionsDriver;
import org.hps.conditions.beam.BeamCurrent.BeamCurrentCollection;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.util.Driver;
@@ -48,6 +48,8 @@
*/
public void test() throws Exception {
+ new DatabaseConditionsManager();
+
// Cache file locally from URL.
FileCache cache = new FileCache();
File testFile = cache.getCachedFile(new URL(fileLocation));
@@ -57,9 +59,6 @@
// Configure and run the loop.
loop.setLCIORecordSource(testFile);
- TestRunConditionsDriver conditionsDriver = new TestRunConditionsDriver();
- conditionsDriver.setLoadSvtConditions(false);
- loop.add(conditionsDriver);
loop.add(new BeamCurrentChecker());
loop.loop(-1, null);
}
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtBadChannelTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtBadChannelTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtBadChannelTest.java Mon Nov 17 16:32:06 2014
@@ -9,7 +9,6 @@
import junit.framework.TestCase;
-import org.hps.conditions.TestRunConditionsDriver;
import org.hps.conditions.database.DatabaseConditionsManager;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.EventHeader;
@@ -56,11 +55,11 @@
File testFile = cache.getCachedFile(new URL(TEST_FILE_URL));
// Create the record loop.
+ new DatabaseConditionsManager();
LCSimLoop loop = new LCSimLoop();
// Configure the loop.
loop.setLCIORecordSource(testFile);
- loop.add(new TestRunConditionsDriver());
loop.add(new SvtBadChannelChecker());
DatabaseConditionsManager.getInstance().setLogLevel(Level.OFF);
|