Print

---

Author: [log in to unmask]
Date: Fri Oct 31 20:36:09 2014
New Revision: 1381

Log:
Fix test cases

Modified:
    java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/test/java/org/hps/conditions/ConditionsTestRunTest.java
    java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/test/java/org/hps/conditions/ecal/EcalGainCompareTest.java

Modified: java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/test/java/org/hps/conditions/ConditionsTestRunTest.java
 =============================================================================
--- java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/test/java/org/hps/conditions/ConditionsTestRunTest.java	(original)
+++ java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/test/java/org/hps/conditions/ConditionsTestRunTest.java	Fri Oct 31 20:36:09 2014
@@ -11,7 +11,7 @@
 public class ConditionsTestRunTest extends TestCase {
         
     static String config = "/org/hps/conditions/config/conditions_database_testrun_2012.xml";
-    static String prop = "/org/hps/conditions/config/conditions_database_testrun_2012_connection.properties";
+    static String prop = "/org/hps/conditions/config/conditions_dev.properties";
     
     public void testConditionsTestRun() {
 
@@ -40,4 +40,4 @@
             }
         }
     }
-}
+}

Modified: java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/test/java/org/hps/conditions/ecal/EcalGainCompareTest.java
 =============================================================================
--- java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/test/java/org/hps/conditions/ecal/EcalGainCompareTest.java	(original)
+++ java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/test/java/org/hps/conditions/ecal/EcalGainCompareTest.java	Fri Oct 31 20:36:09 2014
@@ -34,8 +34,8 @@
         calibrationDriver.detectorChanged(conditionsManager.getDetectorObject());
         
         // Fetch conditions from the database.
-        EcalGainCollection gains = conditionsManager.getConditionsData(EcalGainCollection.class, TableConstants.ECAL_GAINS);
-        EcalChannelCollection channels = conditionsManager.getConditionsData(EcalChannelCollection.class, TableConstants.ECAL_CHANNELS);
+        EcalGainCollection gains = conditionsManager.getConditionsData(EcalGainCollection.class, "test_run_ecal_gains");
+        EcalChannelCollection channels = conditionsManager.getConditionsData(EcalChannelCollection.class, "test_run_ecal_channels");
         
         // Loop over the gain values and compare them with each other.
         int nCompared = 0;