--- java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDevTest.java	2014-09-09 02:35:51 UTC (rev 973)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDevTest.java	2014-09-09 20:36:06 UTC (rev 974)
@@ -5,50 +5,37 @@

 import org.lcsim.conditions.ConditionsManager.ConditionsNotFoundException;
 
 /**

- * Read conditions from the dev database.

+ * Read conditions from the dev database and print them out.

  * @author Jeremy McCormick <[log in to unmask]>
  */
 public class ConditionsDevTest extends TestCase {

-
-    static final String[] conditionsKeys = {
-            TableConstants.ECAL_CALIBRATIONS,
-            TableConstants.ECAL_CHANNELS,
-            TableConstants.ECAL_GAINS,
-            TableConstants.ECAL_LEDS,
-            TableConstants.ECAL_TIME_SHIFTS,
-            TableConstants.SVT_ALIGNMENTS,
-            TableConstants.SVT_CALIBRATIONS,
-            TableConstants.SVT_CHANNELS,
-            TableConstants.SVT_DAQ_MAP,
-            TableConstants.SVT_GAINS,
-            TableConstants.SVT_PULSE_PARAMETERS,
-            TableConstants.SVT_TIME_SHIFTS
-    };

+    static String config = "/org/hps/conditions/config/conditions_dev.xml";
+    static String prop = "/org/hps/conditions/config/conditions_dev.properties";
+    

     public void testConditionsDev() {
 
         DatabaseConditionsManager manager = new DatabaseConditionsManager();

-        manager.configure("/org/hps/conditions/config/conditions_dev.xml");
-        manager.setConnectionResource("/org/hps/conditions/config/conditions_dev.properties");

+        manager.configure(config);
+        manager.setConnectionResource(prop);

         manager.register();
         try {
             manager.setDetector("HPS-Proposal2014-v8-6pt6", 0);
         } catch (ConditionsNotFoundException e) {
             throw new RuntimeException(e);
         }

-        
-        for (String conditionsKey : conditionsKeys) {
-            TableMetaData metaData = manager.findTableMetaData(conditionsKey);            
-            ConditionsSeries series = manager.getConditionsSeries(metaData.getKey());            
-            for (int i = 0; i < series.getNumberOfCollections(); i++) {
-                ConditionsObjectCollection<AbstractConditionsObject> collection = series.getCollection(i);
-                System.out.println("Printing " + collection.getObjects().size() 
-                        + " objects in collection " + metaData.getKey() + " ...");
-                for (ConditionsObject object : collection.getObjects()) {
-                    System.out.println(object.toString());

+                
+        for (TableMetaData metaData : manager.getTableMetaDataList()) {
+            ConditionsSeries series = manager.getConditionsSeries(metaData.getKey());
+            if (series.getNumberOfCollections() > 0) {
+                for (int i = 0; i < series.getNumberOfCollections(); i++) {
+                    ConditionsObjectCollection<AbstractConditionsObject> collection = series.getCollection(i);
+                    System.out.println("Printing " + collection.getObjects().size()  + " objects in collection " + metaData.getKey() + " ...");
+                    for (ConditionsObject object : collection.getObjects()) {
+                        System.out.println(object.toString());
+                    }

                 }

-            }            

+            }

         }
     }

-

 }

--- java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsTestRunTest.java	                        (rev 0)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsTestRunTest.java	2014-09-09 20:36:06 UTC (rev 974)
@@ -0,0 +1,43 @@

+package org.hps.conditions;
+
+import junit.framework.TestCase;
+
+import org.lcsim.conditions.ConditionsManager.ConditionsNotFoundException;
+
+/**
+ * Read conditions from the dev database and print them out.
+ * @author Jeremy McCormick <[log in to unmask]>
+ */
+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";
+    
+    public void testConditionsDev() {
+
+        DatabaseConditionsManager manager = new DatabaseConditionsManager();
+        manager.configure(config);
+        manager.setConnectionResource(prop);
+        manager.register();
+        try {
+            manager.setDetector("HPS-Proposal2014-v8-6pt6", 0);
+        } catch (ConditionsNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+                
+        for (TableMetaData metaData : manager.getTableMetaDataList()) {
+            ConditionsSeries series = manager.getConditionsSeries(metaData.getKey());
+            if (series.getNumberOfCollections() > 0) {
+                for (int i = 0; i < series.getNumberOfCollections(); i++) {
+                    ConditionsObjectCollection<AbstractConditionsObject> collection = series.getCollection(i);
+                    System.out.println("Printing " + collection.getObjects().size()  + " objects in collection " + metaData.getKey() + " ...");
+                    for (ConditionsObject object : collection.getObjects()) {
+                        System.out.println(object.toString());
+                    }
+                }
+            } else {
+                System.err.println("WARNING: No collections found for key <" + metaData.getKey() + "> in this conditions database!");
+            }
+        }
+    }
+}

\ No newline at end of file