Print

Print


Commit in java/trunk/conditions/src/test/java/org/hps/conditions on MAIN
ConditionsDevTest.java+1-11084 -> 1085
ConditionsDriverTest.java+2-21084 -> 1085
beam/BeamCurrentTest.java+2-21084 -> 1085
ecal/PhysicalToGainTest.java+2-21084 -> 1085
+7-7
4 modified files
Update test cases with new file location.

java/trunk/conditions/src/test/java/org/hps/conditions
ConditionsDevTest.java 1084 -> 1085
--- java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDevTest.java	2014-09-25 00:03:48 UTC (rev 1084)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDevTest.java	2014-09-25 00:09:11 UTC (rev 1085)
@@ -33,7 +33,7 @@
                     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
ConditionsDriverTest.java 1084 -> 1085
--- java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDriverTest.java	2014-09-25 00:03:48 UTC (rev 1084)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDriverTest.java	2014-09-25 00:09:11 UTC (rev 1085)
@@ -22,7 +22,7 @@
 public class ConditionsDriverTest extends TestCase {
 
     // This test file has a few events from each of the "good runs" of the 2012 Test Run.
-    private static final String TEST_FILE_URL = "http://www.lcsim.org/test/hps/conditions_test.slcio";
+    private static final String fileLocation = "ftp://ftp-hps.slac.stanford.edu/hps/hps_data/hps_java_test_case_data/ConditionsTest.slcio";
 
     // Number of runs that should be processed in the job.
     static final int NRUNS = 9;
@@ -35,7 +35,7 @@
 
         // Cache a data file from the www.
         FileCache cache = new FileCache();
-        File testFile = cache.getCachedFile(new URL(TEST_FILE_URL));
+        File testFile = cache.getCachedFile(new URL(fileLocation));
 
         // Create the record loop.
         LCSimLoop loop = new LCSimLoop();

java/trunk/conditions/src/test/java/org/hps/conditions/beam
BeamCurrentTest.java 1084 -> 1085
--- java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java	2014-09-25 00:03:48 UTC (rev 1084)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java	2014-09-25 00:09:11 UTC (rev 1085)
@@ -24,7 +24,7 @@
 public class BeamCurrentTest extends TestCase {
 
     /** This test file has a few events from the "good runs" of the Test Run. */
-    private static final String TEST_FILE_URL = "http://www.lcsim.org/test/hps/conditions_test.slcio";
+    private static final String fileLocation = "ftp://ftp-hps.slac.stanford.edu/hps/hps_data/hps_java_test_case_data/ConditionsTest.slcio";
 
     /** Answer key for beam current by run. */
     static Map<Integer, Double> beamCurrentAnswerKey = new HashMap<Integer, Double>();
@@ -50,7 +50,7 @@
 
         // Cache file locally from URL.
         FileCache cache = new FileCache();
-        File testFile = cache.getCachedFile(new URL(TEST_FILE_URL));
+        File testFile = cache.getCachedFile(new URL(fileLocation));
 
         // Create the LCSimLoop.
         LCSimLoop loop = new LCSimLoop();

java/trunk/conditions/src/test/java/org/hps/conditions/ecal
PhysicalToGainTest.java 1084 -> 1085
--- java/trunk/conditions/src/test/java/org/hps/conditions/ecal/PhysicalToGainTest.java	2014-09-25 00:03:48 UTC (rev 1084)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ecal/PhysicalToGainTest.java	2014-09-25 00:09:11 UTC (rev 1085)
@@ -29,14 +29,14 @@
 public class PhysicalToGainTest extends TestCase {
 
     // This test file has a few events from each of the "good runs" of the 2012 Test Run.
-    private static final String TEST_FILE_URL = "http://www.lcsim.org/test/hps/conditions_test.slcio";
+    private static final String fileLocation = "ftp://ftp-hps.slac.stanford.edu/hps/hps_data/hps_java_test_case_data/ConditionsTest.slcio";
 
     // Run the test.
     public void test() throws Exception {
 
         // Cache a data file from the www.
         FileCache cache = new FileCache();
-        File testFile = cache.getCachedFile(new URL(TEST_FILE_URL));
+        File testFile = cache.getCachedFile(new URL(fileLocation));
 
         // Create the record loop.
         LCSimLoop loop = new LCSimLoop();
SVNspam 0.1