java/trunk/integration-tests

--- java/trunk/integration-tests/pom.xml	2014-09-25 00:40:39 UTC (rev 1087)
+++ java/trunk/integration-tests/pom.xml	2014-09-25 00:51:46 UTC (rev 1088)
@@ -50,6 +50,28 @@

                     </plugin>
                 </plugins>
             </build>

-        </profile>    

+        </profile>  
+        <profile>
+            <id>no-slac-nfs</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <file>
+                    <missing>/nfs/slac/g/hps/</missing>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>org/hps/EcalReadoutSimTest.java</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>        
+        </profile>  

     </profiles>    
 </project>

java/trunk/integration-tests/src/test/java/org/hps

--- java/trunk/integration-tests/src/test/java/org/hps/EcalReadoutSimTest.java	2014-09-25 00:40:39 UTC (rev 1087)
+++ java/trunk/integration-tests/src/test/java/org/hps/EcalReadoutSimTest.java	2014-09-25 00:51:46 UTC (rev 1088)
@@ -7,7 +7,6 @@

 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;

-import java.net.URL;

 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

@@ -24,7 +23,6 @@

 import org.lcsim.job.JobControlManager;
 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;

-import org.lcsim.util.cache.FileCache;

 import org.lcsim.util.loop.LCSimLoop;
 
 /**

@@ -91,11 +89,10 @@

     static final String steeringResource = "/org/hps/steering/test/EcalReadoutSimTest.lcsim";
     static final String triggeredEventsResource = "/org/hps/test/EcalReadoutSimTest/triggered_events.txt";
     

-    // File information.    
-    //static final File inputFile = new File("/nfs/slac/g/hps3/data/testcase/ecal_readout_sim_input.slcio");

+    // File information.        
+    //static final String fileLocation = "ftp://ftp-hps.slac.stanford.edu/hps/hps_data/hps_java_test_case_data/EcalReadoutSimTest.slcio";
+    static final File inputFile = new File("/nfs/slac/g/hps/hps_data/hps_java_test_case_data/EcalReadoutSimTest.slcio");

-    static final String fileLocation = "ftp://ftp-hps.slac.stanford.edu/hps/hps_data/hps_java_test_case_data/EcalReadoutSimInput.slcio";
-    

     static final File outputDir = new File("./target/test-output/" + className);    
     static final File outputFile = new File(outputDir + File.separator + className);
     static final File aidaOutputFile = new File(outputDir + File.separator + className + ".aida");

@@ -138,8 +135,8 @@

      */
     private void runEcalReadoutSim() throws Exception {
         

-        FileCache cache = new FileCache();
-        File inputFile = cache.getCachedFile(new URL(fileLocation));

+        //FileCache cache = new FileCache();
+        //File inputFile = cache.getCachedFile(new URL(fileLocation));

                          
         outputDir.mkdirs();
         if (!outputDir.exists()) {

java/trunk/integration-tests/src/test/java/org/hps

--- java/trunk/integration-tests/src/test/java/org/hps/MCReconTest.java	2014-09-25 00:40:39 UTC (rev 1087)
+++ java/trunk/integration-tests/src/test/java/org/hps/MCReconTest.java	2014-09-25 00:51:46 UTC (rev 1088)
@@ -28,7 +28,7 @@

     static final String fileLocation = "ftp://ftp-hps.slac.stanford.edu/hps/hps_data/hps_java_test_case_data/MCReconTest.slcio";
     
     static final int TOTAL_CLUSTERS = 3960;        

-    static final int TOTAL_TRACKER_HITS = 28691;

+    static final int TOTAL_TRACKER_HITS = 28689;

     static final int TOTAL_CALORIMETER_HITS = 61924;
        
     static final long TOTAL_RECON_EVENTS = 945;

java/trunk/integration-tests/src/test/java/org/hps

--- java/trunk/integration-tests/src/test/java/org/hps/MockDataReconTest.java	2014-09-25 00:40:39 UTC (rev 1087)
+++ java/trunk/integration-tests/src/test/java/org/hps/MockDataReconTest.java	2014-09-25 00:51:46 UTC (rev 1088)
@@ -34,7 +34,6 @@

     static final File aidaFile = new File(outputFile.getAbsolutePath() + ".aida");    
 
     static final String steeringResource = "/org/hps/steering/test/MockDataReconTest.lcsim";

-    //static final String steeringResource = "/org/hps/steering/recon/HPS2014OfflineTruthRecon.lcsim";

     
     // TODO: Get some values for these and add test assertions!
     /*