Author: [log in to unmask]
Date: Thu Jan 1 23:24:47 2015
New Revision: 1829
Log:
Modifications to tests from API changes and for simplification.
Modified:
java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDriverTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/EngRunConditionsTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/RunNumberTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalDetectorSetupTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtDaqMappingTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtDetectorSetupTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/svt/TestRunSvtDaqMappingTest.java
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDriverTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDriverTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDriverTest.java Thu Jan 1 23:24:47 2015
@@ -25,8 +25,6 @@
ConditionsDriver conditionsDriver = new ConditionsDriver();
conditionsDriver.setDetectorName("HPS-TestRun-v5");
- conditionsDriver.setEcalName("Ecal");
- conditionsDriver.setSvtName("Tracker");
conditionsDriver.setTag("test_run");
conditionsDriver.setRunNumber(1351);
conditionsDriver.setFreeze(true);
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/EngRunConditionsTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/EngRunConditionsTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/EngRunConditionsTest.java Thu Jan 1 23:24:47 2015
@@ -32,7 +32,9 @@
* This tests the basic correctness of conditions for an LCIO file generated from Engineering Run data.
* <p>
* Currently only ECAL conditions are handled here but SVT should be added once that information is in the
- * prod database.
+ * production database and there are runs available with Tracker data.
+ * <p>
+ * This test will need to be updated if the default conditions sets are changed for the EngRun.
*
* @author Jeremy McCormick <[log in to unmask]>
*/
@@ -47,7 +49,8 @@
public void test() throws Exception {
- new DatabaseConditionsManager();
+ DatabaseConditionsManager manager = new DatabaseConditionsManager();
+ manager.setXmlConfig("/org/hps/conditions/config/conditions_database_engrun.xml");
FileCache cache = new FileCache();
File inputFile = cache.getCachedFile(new URL(url));
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/RunNumberTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/RunNumberTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/RunNumberTest.java Thu Jan 1 23:24:47 2015
@@ -43,7 +43,7 @@
// Create the record loop.
new DatabaseConditionsManager();
- //DatabaseConditionsManager.getInstance().setLogLevel(Level.WARNING);
+ DatabaseConditionsManager.getInstance().setLogLevel(Level.WARNING);
LCSimLoop loop = new LCSimLoop();
// Configure the loop.
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 Thu Jan 1 23:24:47 2015
@@ -18,7 +18,7 @@
import org.lcsim.util.loop.LCSimLoop;
/**
- * This test checks the beam current values by run.
+ * This test checks the Test Run beam current values by run.
* @author Jeremy McCormick <[log in to unmask]>
*/
public class BeamCurrentTest extends TestCase {
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalDetectorSetupTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalDetectorSetupTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalDetectorSetupTest.java Thu Jan 1 23:24:47 2015
@@ -52,7 +52,7 @@
EcalConditions conditions = conditionsManager.getCachedConditions(EcalConditions.class, "ecal_conditions").getCachedData();
// Load conditions onto detector.
- EcalDetectorSetup loader = new EcalDetectorSetup();
+ EcalDetectorSetup loader = new EcalDetectorSetup("Ecal");
loader.load(detector.getSubdetector("Ecal"), conditions);
// Get crystals from detector.
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtDaqMappingTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtDaqMappingTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtDaqMappingTest.java Thu Jan 1 23:24:47 2015
@@ -30,8 +30,7 @@
DatabaseConditionsManager conditionsManager = new DatabaseConditionsManager();
conditionsManager.setDetector("HPS-Proposal2014-v7-2pt2", 0);
- TableMetaData metaData = conditionsManager.findTableMetaData(SvtDaqMappingCollection.class);
- SvtDaqMappingCollection daqMappingCollection = conditionsManager.getConditionsData(SvtDaqMappingCollection.class, metaData.getTableName());
+ SvtDaqMappingCollection daqMappingCollection = conditionsManager.getCollection(SvtDaqMappingCollection.class);
int totalSensors = 0;
int febHybridID;
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtDetectorSetupTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtDetectorSetupTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtDetectorSetupTest.java Thu Jan 1 23:24:47 2015
@@ -52,8 +52,8 @@
SvtConditions conditions = conditionsManager.getCachedConditions(SvtConditions.class, "svt_conditions").getCachedData();
// Load the SVT conditions onto detector.
- SvtDetectorSetup loader = new SvtDetectorSetup();
- loader.load(detector.getSubdetector(SVT_SUBDETECTOR_NAME), conditions);
+ SvtDetectorSetup loader = new SvtDetectorSetup("Tracker");
+ loader.loadDefault(detector.getSubdetector(SVT_SUBDETECTOR_NAME), conditions);
// Check sensor data.
List<HpsSiSensor> sensors = detector.getSubdetector(SVT_SUBDETECTOR_NAME).getDetectorElement().findDescendants(HpsSiSensor.class);
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/svt/TestRunSvtDaqMappingTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/svt/TestRunSvtDaqMappingTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/svt/TestRunSvtDaqMappingTest.java Thu Jan 1 23:24:47 2015
@@ -37,8 +37,7 @@
conditionsManager.setXmlConfig("/org/hps/conditions/config/conditions_database_testrun_2012.xml");
conditionsManager.setDetector("HPS-TestRun-v5", 1351);
- metaData = conditionsManager.findTableMetaData(TestRunSvtDaqMappingCollection.class);
- TestRunSvtDaqMappingCollection daqMappingCollection = conditionsManager.getConditionsData(TestRunSvtDaqMappingCollection.class, metaData.getTableName());
+ TestRunSvtDaqMappingCollection daqMappingCollection = conditionsManager.getCollection(TestRunSvtDaqMappingCollection.class);
int totalSensors = 0;
this.printDebug("");
