--- java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsObjectTest.java	2014-08-14 22:46:14 UTC (rev 855)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsObjectTest.java	2014-08-14 22:48:35 UTC (rev 856)
@@ -2,6 +2,7 @@

 
 import junit.framework.TestCase;
 

+import org.hps.conditions.config.DefaultTestSetup;

 import org.hps.conditions.svt.SvtGain;
 import org.hps.conditions.svt.SvtGain.SvtGainCollection;
 

@@ -25,7 +26,7 @@

 
         // Create a new collection, setting its table meta data and collection ID.
         TableMetaData tableMetaData = conditionsManager.findTableMetaData(TableConstants.SVT_GAINS);

-        int collectionId = conditionsManager.getNextCollectionId(tableMetaData.getTableName());

+        int collectionId = conditionsManager.getNextCollectionID(tableMetaData.getTableName());

         SvtGainCollection collection = new SvtGainCollection();
         collection.setTableMetaData(tableMetaData);
         try {

--- java/trunk/conditions/src/test/java/org/hps/conditions/DatabaseConditionsManagerTest.java	2014-08-14 22:46:14 UTC (rev 855)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/DatabaseConditionsManagerTest.java	2014-08-14 22:48:35 UTC (rev 856)
@@ -1,5 +1,7 @@

 package org.hps.conditions;
 

+import org.hps.conditions.config.DefaultTestSetup;
+

 import junit.framework.TestCase;
 
 public class DatabaseConditionsManagerTest extends TestCase {

--- java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalConditionsConverterTest.java	2014-08-14 22:46:14 UTC (rev 855)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalConditionsConverterTest.java	2014-08-14 22:48:35 UTC (rev 856)
@@ -3,7 +3,7 @@

 import junit.framework.TestCase;
 
 import org.hps.conditions.DatabaseConditionsManager;

-import org.hps.conditions.DefaultTestSetup;

+import org.hps.conditions.config.DefaultTestSetup;

 
 /**
  * Tests that a {@link EcalConditions} objects loads without errors.

--- java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalConditionsLoaderTest.java	2014-08-14 22:46:14 UTC (rev 855)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalConditionsLoaderTest.java	2014-08-14 22:48:35 UTC (rev 856)
@@ -5,7 +5,7 @@

 import junit.framework.TestCase;
 
 import org.hps.conditions.DatabaseConditionsManager;

-import org.hps.conditions.DefaultTestSetup;

+import org.hps.conditions.config.DefaultTestSetup;

 import org.lcsim.detector.converter.compact.EcalCrystal;
 import org.lcsim.geometry.Detector;
 

--- java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalGainCompareTest.java	2014-08-14 22:46:14 UTC (rev 855)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalGainCompareTest.java	2014-08-14 22:48:35 UTC (rev 856)
@@ -3,11 +3,12 @@

 import junit.framework.TestCase;
 
 import org.hps.conditions.DatabaseConditionsManager;

-import org.hps.conditions.DetectorSetup;

 import org.hps.conditions.TableConstants;

+import org.hps.conditions.config.DetectorSetup;

 import org.hps.conditions.deprecated.CalibrationDriver;
 import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
 import org.hps.conditions.ecal.EcalGain.EcalGainCollection;

+

 import static org.hps.conditions.deprecated.EcalConditions.makePhysicalID;
 import static org.hps.conditions.deprecated.EcalConditions.physicalToGain;