java/trunk/conditions

--- java/trunk/conditions/pom.xml	2014-09-09 23:31:18 UTC (rev 975)
+++ java/trunk/conditions/pom.xml	2014-09-10 01:40:30 UTC (rev 976)
@@ -22,14 +22,11 @@

                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <excludes>

-                        <exclude>org/hps/conditions/**/**.java</exclude>
-                        <!--  
-                        <exclude>org/hps/conditions/ConditionsObjectTest.java</exclude>
-                        <exclude>org/hps/conditions/**.java</exclude>
-                        <exclude>org/hps/conditions/beam/**.java</exclude>
-                        <exclude>org/hps/conditions/ecal/**.java</exclude>
-                        <exclude>org/hps/conditions/svt/**.java</exclude>
-                        -->

+                        <exclude>org/hps/conditions/svt/SvtBadChannelTest.java</exclude>
+                        <exclude>org/hps/conditions/svt/SvtGainInsertTest.java</exclude>
+                        <exclude>org/hps/conditions/svt/SvtConditionsLoaderTest.java</exclude> 
+                        <exclude>org/hps/conditions/svt/SvtConditionsConverterTest.java</exclude>
+                        <exclude>org/hps/conditions/svt/SvtConfigurationTest.java</exclude>

                     </excludes>
                 </configuration>
             </plugin>

java/trunk/conditions/src/main/java/org/hps/conditions

--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java	2014-09-09 23:31:18 UTC (rev 975)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java	2014-09-10 01:40:30 UTC (rev 976)
@@ -31,6 +31,9 @@

 
     String ecalSubdetectorName = "Ecal";
     String svtSubdetectorName = "Tracker";

+    
+    boolean loadSvtConditions = true;
+    boolean loadEcalConditions = true;

 
     /**
      * Constructor which initializes the conditions manager with default connection

@@ -58,6 +61,14 @@

     public void setConnectionResource(String resource) {
         manager.setConnectionResource(resource);
     }

+    
+    public void setLoadSvtConditions(boolean loadSvtConditions) {
+        this.loadSvtConditions = loadSvtConditions;
+    }
+    
+    public void setLoadEcalConditions(boolean loadEcaltConditions) {
+        this.loadEcalConditions = loadSvtConditions;
+    }

 
     /**
      * Set the class of the conditions reader to use.

@@ -82,16 +93,19 @@

     public void setSvtSubdetectorName(String svtSubdetectorName) {
         this.svtSubdetectorName = svtSubdetectorName;
     }

+    
+    

 
     /**
      * This method updates a new detector with SVT and ECal conditions data.
      */

-    // FIXME: Add here a check on the run number and if it is invalid then
-    // set a default before trying to load the conditions.

     public void detectorChanged(Detector detector) {

-        // Load conditions onto the detector.
-        loadSvtConditions(detector); 
-        loadEcalConditions(detector);

+        // Load SVT conditions onto the detector.
+        if (loadSvtConditions)
+            loadSvtConditions(detector);
+        // Load ECAL conditions onto the detector.
+        if (loadEcalConditions)
+            loadEcalConditions(detector);

     }
 
     /**

java/trunk/conditions/src/main/java/org/hps/conditions

--- java/trunk/conditions/src/main/java/org/hps/conditions/DatabaseConditionsManager.java	2014-09-09 23:31:18 UTC (rev 975)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/DatabaseConditionsManager.java	2014-09-10 01:40:30 UTC (rev 976)
@@ -151,7 +151,8 @@

         }
 
         // Let the super class do whatever it think it needs to do.

-        super.setDetector(detectorName, runNumber);

+        super.setDetector(detectorName, runNumber);        
+        //super.setConditionsReader(this.baseReader, detectorName);

     }
 
     /**

java/trunk/conditions/src/main/java/org/hps/conditions/config

--- java/trunk/conditions/src/main/java/org/hps/conditions/config/AbstractConfiguration.java	                        (rev 0)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/config/AbstractConfiguration.java	2014-09-10 01:40:30 UTC (rev 976)
@@ -0,0 +1,21 @@

+package org.hps.conditions.config;
+
+import org.hps.conditions.DatabaseConditionsManager;
+import org.lcsim.conditions.ConditionsReader;
+import org.lcsim.conditions.ConditionsManager.ConditionsNotFoundException;
+
+
+public abstract class AbstractConfiguration {
+
+    protected DatabaseConditionsManager manager;
+    
+    public abstract AbstractConfiguration setup();
+    
+    public final void load(String detectorName, int runNumber) {
+        try {
+            manager.setDetector(detectorName, runNumber);
+        } catch (ConditionsNotFoundException e) {
+            throw new RuntimeException(e);
+        }   
+    }           
+}

java/trunk/conditions/src/main/java/org/hps/conditions/config

--- java/trunk/conditions/src/main/java/org/hps/conditions/config/ConditionsDatabaseConfiguration.java	2014-09-09 23:31:18 UTC (rev 975)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/config/ConditionsDatabaseConfiguration.java	2014-09-10 01:40:30 UTC (rev 976)
@@ -1,49 +0,0 @@

-package org.hps.conditions.config;
-
-import org.hps.conditions.DatabaseConditionsManager;
-import org.lcsim.conditions.ConditionsReader;
-
-/**
- * Convenience class for setting up access to the conditions.
- */
-public class ConditionsDatabaseConfiguration {
-    
-    private String xmlConfig;
-    private String connectionProp;
-    private ConditionsReader reader;
-    private DatabaseConditionsManager manager;
-
-    /**
-     * Constructor with XML config, connection properties and ConditionsReader.
-     */
-    public ConditionsDatabaseConfiguration(
-            String xmlConfig, 
-            String connectionProp,
-            ConditionsReader reader) {
-        this.xmlConfig = xmlConfig;
-        this.connectionProp = connectionProp;
-        this.reader = reader;
-    }
-    
-    /**
-     * Constructor with XML config and connection properties.
-     */
-    public ConditionsDatabaseConfiguration(
-            String xmlConfig, 
-            String connectionProp) {
-        this.xmlConfig = xmlConfig;
-        this.connectionProp = connectionProp;
-    }    
-    
-    /**
-     * Setup the configuration on the conditions manager.
-     */
-    public void setup() {
-        manager = new DatabaseConditionsManager();
-        manager.configure(xmlConfig);
-        manager.setConnectionResource(connectionProp);
-        if (reader != null)
-            manager.setBaseConditionsReader(reader);
-        manager.register();
-    }    
-}

\ No newline at end of file

java/trunk/conditions/src/main/java/org/hps/conditions/config

--- java/trunk/conditions/src/main/java/org/hps/conditions/config/FileConfiguration.java	                        (rev 0)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/config/FileConfiguration.java	2014-09-10 01:40:30 UTC (rev 976)
@@ -0,0 +1,36 @@

+package org.hps.conditions.config;
+
+import java.io.File;
+
+import org.hps.conditions.DatabaseConditionsManager;
+
+/**
+ * Convenience class for setting up access to the conditions.
+ */
+public class FileConfiguration extends AbstractConfiguration {
+    
+    private File config;
+    private File prop;
+    private DatabaseConditionsManager manager;
+
+    /**
+     * Constructor with XML config, connection properties and ConditionsReader.
+     */
+    public FileConfiguration(
+            File config, 
+            File prop) {
+        this.config = config;
+        this.prop = prop;
+    }
+              
+    /**
+     * Setup the configuration on the conditions manager.
+     */
+    public AbstractConfiguration setup() {
+        manager = new DatabaseConditionsManager();       
+        manager.configure(config);
+        manager.setConnectionProperties(prop);
+        manager.register();       
+        return this;
+    }    
+}

\ No newline at end of file

java/trunk/conditions/src/test/java/org/hps/conditions

--- java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDriverTest.java	2014-09-09 23:31:18 UTC (rev 975)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDriverTest.java	2014-09-10 01:40:30 UTC (rev 976)
@@ -42,7 +42,9 @@

 
         // Configure the loop.
         loop.setLCIORecordSource(testFile);

-        loop.add(new ConditionsDriver());

+        ConditionsDriver conditionsDriver = new ConditionsDriver();
+        conditionsDriver.setLoadSvtConditions(false);
+        loop.add(conditionsDriver);

         RunNumberDriver runNumberDriver = new RunNumberDriver();
         loop.add(runNumberDriver);
 

@@ -80,31 +82,31 @@

      */
     static class RunNumberDriver extends Driver {
 

-        int _currentRun = -1;
-        int _nruns = 0;
-        List<Integer> _runsProcessed = new ArrayList<Integer>();
-        Set<Integer> _uniqueRuns = new LinkedHashSet<Integer>();

+        int currentRun = -1;
+        int nruns = 0;
+        List<Integer> runsProcessed = new ArrayList<Integer>();
+        Set<Integer> uniqueRuns = new LinkedHashSet<Integer>();

 
         public void process(EventHeader event) {
             int runNumber = event.getRunNumber();

-            if (runNumber != _currentRun) {
-                _currentRun = runNumber;
-                _uniqueRuns.add(_currentRun);
-                _runsProcessed.add(_currentRun);
-                _nruns++;

+            if (runNumber != currentRun) {
+                currentRun = runNumber;
+                uniqueRuns.add(currentRun);
+                runsProcessed.add(currentRun);
+                nruns++;

             }
         }
 
         int getNumberOfRuns() {

-            return _nruns;

+            return nruns;

         }
 
         List<Integer> getRunsProcessed() {

-            return _runsProcessed;

+            return runsProcessed;

         }
 
         Set<Integer> getUniqueRuns() {

-            return _uniqueRuns;

+            return uniqueRuns;

         }
     }
 }

java/trunk/conditions/src/test/java/org/hps/conditions

--- java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsObjectTest.java	2014-09-09 23:31:18 UTC (rev 975)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsObjectTest.java	2014-09-10 01:40:30 UTC (rev 976)
@@ -2,7 +2,7 @@

 
 import junit.framework.TestCase;
 

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

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

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

@@ -19,7 +19,8 @@

     DatabaseConditionsManager conditionsManager;
 
     public void setUp() {

-        conditionsManager = new DefaultTestSetup().configure().setup();

+        new TestRunReadOnlyConfiguration(true);
+        conditionsManager = DatabaseConditionsManager.getInstance();

     }
 
     public void testBasicOperations() throws ConditionsObjectException {

java/trunk/conditions/src/test/java/org/hps/conditions

--- java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsSeriesConverterTest.java	2014-09-09 23:31:18 UTC (rev 975)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsSeriesConverterTest.java	2014-09-10 01:40:30 UTC (rev 976)
@@ -2,7 +2,7 @@

 
 import junit.framework.TestCase;
 

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

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

 import org.hps.conditions.svt.SvtBadChannel;
 import org.hps.conditions.svt.SvtBadChannel.SvtBadChannelCollection;
 

@@ -12,7 +12,8 @@

     DatabaseConditionsManager conditionsManager;
 
     public void setUp() {

-        conditionsManager = new DefaultTestSetup().configure().setup();

+        new TestRunReadOnlyConfiguration(true);
+        conditionsManager = DatabaseConditionsManager.getInstance();

     }
     
     public void testConditionsSeries() {

java/trunk/conditions/src/test/java/org/hps/conditions

--- java/trunk/conditions/src/test/java/org/hps/conditions/DatabaseConditionsManagerTest.java	2014-09-09 23:31:18 UTC (rev 975)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/DatabaseConditionsManagerTest.java	2014-09-10 01:40:30 UTC (rev 976)
@@ -1,24 +1,25 @@

 package org.hps.conditions;
 

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

 import junit.framework.TestCase;
 

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

 public class DatabaseConditionsManagerTest extends TestCase {
 

-    DatabaseConditionsManager _conditionsManager;

+    DatabaseConditionsManager conditionsManager;

 
     public void setUp() {

-        _conditionsManager = new DefaultTestSetup().configure().setup();

+        new TestRunReadOnlyConfiguration(true);
+        conditionsManager = DatabaseConditionsManager.getInstance();

     }
 
     @SuppressWarnings("rawtypes")
     public void testLoad() {
 
         // Load data from every table registered with the manager.

-        for (TableMetaData metaData : _conditionsManager.getTableMetaDataList()) {

+        for (TableMetaData metaData : conditionsManager.getTableMetaDataList()) {

             System.out.println(">>>> loading conditions from table: " + metaData.getKey());

-            ConditionsObjectCollection conditionsObjects = _conditionsManager.getConditionsData(metaData.getCollectionClass(), metaData.getKey());

+            ConditionsObjectCollection conditionsObjects = conditionsManager.getConditionsData(metaData.getCollectionClass(), metaData.getKey());

             System.out.println("  " + conditionsObjects.getObjects().size() + " " + conditionsObjects.get(0).getClass().getSimpleName() + " objects were created.");
         }
     }

java/trunk/conditions/src/test/java/org/hps/conditions/beam

--- java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java	2014-09-09 23:31:18 UTC (rev 975)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java	2014-09-10 01:40:30 UTC (rev 976)
@@ -57,7 +57,9 @@

 
         // Configure and run the loop.
         loop.setLCIORecordSource(testFile);

-        loop.add(new ConditionsDriver());

+        ConditionsDriver conditionsDriver = new ConditionsDriver();
+        conditionsDriver.setLoadSvtConditions(false);
+        loop.add(conditionsDriver);

         loop.add(new BeamCurrentChecker());
         loop.loop(-1, null);
     }

java/trunk/conditions/src/test/java/org/hps/conditions/ecal

--- java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalConditionsConverterTest.java	2014-09-09 23:31:18 UTC (rev 975)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalConditionsConverterTest.java	2014-09-10 01:40:30 UTC (rev 976)
@@ -3,7 +3,7 @@

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

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

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

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

@@ -11,14 +11,14 @@

  */
 public class EcalConditionsConverterTest extends TestCase {
 

+    DatabaseConditionsManager conditionsManager;
+    

     public void setUp() {

-        new DefaultTestSetup().configure().setup();

+        new TestRunReadOnlyConfiguration(true);
+        conditionsManager = DatabaseConditionsManager.getInstance();

     }
 

-    public void test() {
-
-        DatabaseConditionsManager conditionsManager = DatabaseConditionsManager.getInstance();
-

+    public void test() {       

         // Test that the manager gets ECAL conditions.
         EcalConditions conditions = conditionsManager.getCachedConditions(EcalConditions.class, "ecal_conditions").getCachedData();
         assertNotNull(conditions);

java/trunk/conditions/src/test/java/org/hps/conditions/ecal

--- java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalConditionsLoaderTest.java	2014-09-09 23:31:18 UTC (rev 975)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalConditionsLoaderTest.java	2014-09-10 01:40:30 UTC (rev 976)
@@ -5,7 +5,7 @@

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

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

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

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

@@ -34,7 +34,7 @@

     private static final int CRYSTAL_COUNT = 442;
 
     public void setUp() {

-        new DefaultTestSetup().configure().setup();

+        new TestRunReadOnlyConfiguration(true);

     }
 
     /**

java/trunk/conditions/src/test/java/org/hps/conditions/ecal

--- java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalGainCompareTest.java	2014-09-09 23:31:18 UTC (rev 975)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalGainCompareTest.java	2014-09-10 01:40:30 UTC (rev 976)
@@ -1,17 +1,16 @@

 package org.hps.conditions.ecal;
 

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

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

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

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

 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;
-

 /**
  * This is a test to compare the ECAL channel gain values between
  * the old text-based conditions and the new database system, in order

@@ -23,28 +22,31 @@

     
     DatabaseConditionsManager conditionsManager;
     

-    static final String detectorName = "HPS-TestRun-v8-5";
-    static final int runNumber = 1351;
-    

     public void setUp() {

-        conditionsManager = new DetectorSetup(detectorName, 0).configure().setup();

+        new TestRunReadOnlyConfiguration(true);
+        conditionsManager = DatabaseConditionsManager.getInstance();

     }
     
     public void testEcalGainCompareTest() {
         

+        // Load the old text-based conditions for the ECAL in order to compare against database values.

         CalibrationDriver calibrationDriver = new CalibrationDriver();
         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);

-        for (EcalGain gain : gains) {
-            
-            EcalChannel channel = channels.findChannel(gain.getChannelId());
-            

+        
+        // Loop over the gain values and compare them with each other.
+        int nCompared = 0;
+        for (EcalGain gain : gains) {            
+            EcalChannel channel = channels.findChannel(gain.getChannelId());            

             long physicalID = makePhysicalID(channel.getX(), channel.getY());

-            double oldGainValue = physicalToGain(physicalID);
-            

+            double oldGainValue = physicalToGain(physicalID);            

             assertEquals("The new and old gain values are different.", gain.getGain(), oldGainValue);

+            ++nCompared;

         }

+        System.out.println("Compared " + nCompared + " ECAL gain values.");
+        assertEquals("Wrong number of gain values compared.", 442, nCompared);

     }    
 }

java/trunk/conditions/src/test/java/org/hps/conditions/ecal

--- java/trunk/conditions/src/test/java/org/hps/conditions/ecal/PhysicalToGainTest.java	2014-09-09 23:31:18 UTC (rev 975)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ecal/PhysicalToGainTest.java	2014-09-10 01:40:30 UTC (rev 976)
@@ -43,7 +43,9 @@

 
         // Configure the loop.
         loop.setLCIORecordSource(testFile);

-        loop.add(new ConditionsDriver());

+        ConditionsDriver conditionsDriver = new ConditionsDriver();
+        conditionsDriver.setLoadSvtConditions(false);
+        loop.add(conditionsDriver);

         loop.add(new PhysicalToGainDriver());
 
         // Run a few events.

java/trunk/conditions/src/test/java/org/hps/conditions/svt

--- java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtConditionsConverterTest.java	2014-09-09 23:31:18 UTC (rev 975)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtConditionsConverterTest.java	2014-09-10 01:40:30 UTC (rev 976)
@@ -3,7 +3,7 @@

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

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

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

 
 /**
  * This test loads and prints {@link SvtConditions}, which internally uses the

@@ -13,17 +13,17 @@

  */
 public class SvtConditionsConverterTest extends TestCase {
 

+    DatabaseConditionsManager conditionsManager;
+    

     public void setUp() {

-        new DefaultTestSetup().configure().setup();

+        new TestRunReadOnlyConfiguration(true);
+        conditionsManager = DatabaseConditionsManager.getInstance();

     }
 
     /**
      * Load and print all SVT conditions for a certain run number.
      */

-    public void test() {
-
-        DatabaseConditionsManager conditionsManager = DatabaseConditionsManager.getInstance();
-

+    public void test() {        

         // Get conditions and print them out.
         SvtConditions svt = conditionsManager.getCachedConditions(SvtConditions.class, "svt_conditions").getCachedData();
         assertNotNull(svt);

java/trunk/conditions/src/test/java/org/hps/conditions/svt

--- java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtConditionsLoaderTest.java	2014-09-09 23:31:18 UTC (rev 975)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtConditionsLoaderTest.java	2014-09-10 01:40:30 UTC (rev 976)
@@ -5,7 +5,7 @@

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

-import org.hps.conditions.config.DevDatabaseReadOnlyConfig;

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

 import org.lcsim.detector.tracker.silicon.HpsSiSensor;
 import org.lcsim.geometry.Detector;
 

@@ -25,15 +25,10 @@

 	//-----------------//
 	
 	// Total number of SVT sensors

-	public static final int TOTAL_NUMBER_OF_SENSORS = 36;
-	
-	//-----------------//
-	
-    DevDatabaseReadOnlyConfig dbConfig = new DevDatabaseReadOnlyConfig();
-    

+	public static final int TOTAL_NUMBER_OF_SENSORS = 36;	
+	   

 	public void setUp(){

-		dbConfig.setup();
-		dbConfig.load("HPS-Proposal2014-v7-2pt2", 0);

+	    new DevReadOnlyConfiguration().setup().load("HPS-Proposal2014-v7-2pt2", 0);

 	}
 
     /**

@@ -66,7 +61,7 @@

         	totalSensors++; 
         	
         	// Check that hardware information seems reasonable.

-            int  febHybridID = sensor.getFebHybridID();

+            int febHybridID = sensor.getFebHybridID();

             int febID = sensor.getFebID();
 
             for (int channel = 0; channel < nChannels; channel++) {

java/trunk/conditions/src/test/java/org/hps/conditions/svt

--- java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtConfigurationTest.java	2014-09-09 23:31:18 UTC (rev 975)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtConfigurationTest.java	2014-09-10 01:40:30 UTC (rev 976)
@@ -6,7 +6,7 @@

 
 import org.hps.conditions.DatabaseConditionsManager;
 import org.hps.conditions.TableConstants;

-import org.hps.conditions.config.ConditionsDatabaseConfiguration;

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

 import org.hps.conditions.svt.SvtConfiguration.SvtConfigurationCollection;
 import org.jdom.Document;
 import org.jdom.JDOMException;

@@ -16,7 +16,7 @@

     DatabaseConditionsManager manager;
     
     public void setUp() {

-        new ConditionsDatabaseConfiguration(

+        new ResourceConfiguration(

                 "/org/hps/conditions/config/conditions_dev.xml", 
                 "/org/hps/conditions/config/conditions_dev_local.properties").setup();
         manager = DatabaseConditionsManager.getInstance();

java/trunk/conditions/src/test/java/org/hps/conditions/svt

--- java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtDaqMappingTest.java	2014-09-09 23:31:18 UTC (rev 975)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtDaqMappingTest.java	2014-09-10 01:40:30 UTC (rev 976)
@@ -3,7 +3,7 @@

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

-import org.hps.conditions.config.DevDatabaseReadOnlyConfig;

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

 import org.hps.conditions.svt.SvtDaqMapping.SvtDaqMappingCollection;
 
 

@@ -29,7 +29,7 @@

 	
 	//-----------------//
 

-	DevDatabaseReadOnlyConfig dbConfig = new DevDatabaseReadOnlyConfig();

+	DevReadOnlyConfiguration dbConfig = new DevReadOnlyConfiguration();

 	
 	public void setUp(){
 		dbConfig.setup();