Author: [log in to unmask]
Date: Wed Oct 7 19:31:07 2015
New Revision: 3802
Log:
Move broken integration tests to sandbox (RIP) and move a few others into the main it package. Every test in this module should work now.
Added:
java/sandbox/broken_tests/APrimeReconTest.java
- copied unchanged from r3789, java/trunk/integration-tests/src/test/java/org/hps/APrimeReconTest.java
java/sandbox/broken_tests/EtSystemTest.java
- copied unchanged from r3789, java/trunk/integration-tests/src/test/java/org/hps/EtSystemTest.java
java/sandbox/broken_tests/HPSTestRunTracker2014GeometryTrackReconTest.java
- copied unchanged from r3789, java/trunk/integration-tests/src/test/java/org/hps/HPSTestRunTracker2014GeometryTrackReconTest.java
java/sandbox/broken_tests/HPSTracker2014GeometryTrackReconTest.java
- copied unchanged from r3789, java/trunk/integration-tests/src/test/java/org/hps/HPSTracker2014GeometryTrackReconTest.java
java/sandbox/broken_tests/MCFilteredReconTest.java
- copied unchanged from r3789, java/trunk/integration-tests/src/test/java/org/hps/MCFilteredReconTest.java
java/sandbox/broken_tests/MockDataReconTest.java
- copied, changed from r3789, java/trunk/integration-tests/src/test/java/org/hps/MockDataReconTest.java
java/sandbox/broken_tests/ReadoutToEvioTest.java
- copied, changed from r3789, java/trunk/integration-tests/src/test/java/org/hps/ReadoutToEvioTest.java
java/sandbox/broken_tests/SimpleMCReconTest.java
- copied unchanged from r3789, java/trunk/integration-tests/src/test/java/org/hps/SimpleMCReconTest.java
java/sandbox/broken_tests/SteeringFilesTest.java
- copied unchanged from r3789, java/trunk/integration-tests/src/test/java/org/hps/SteeringFilesTest.java
java/sandbox/broken_tests/TestRunEvioToLcioTest.java
- copied unchanged from r3789, java/trunk/integration-tests/src/test/java/org/hps/TestRunEvioToLcioTest.java
java/sandbox/broken_tests/TestRunReadoutToEvioTest.java
- copied unchanged from r3789, java/trunk/integration-tests/src/test/java/org/hps/TestRunReadoutToEvioTest.java
java/sandbox/broken_tests/TestRunReconTest.java
- copied unchanged from r3789, java/trunk/integration-tests/src/test/java/org/hps/TestRunReconTest.java
java/trunk/integration-tests/src/test/java/org/hps/test/it/DataQualityMonitorTest.java
- copied unchanged from r3800, java/trunk/integration-tests/src/test/java/org/hps/DataQualityMonitorTest.java
java/trunk/integration-tests/src/test/java/org/hps/test/it/ReadoutNoPileupTest.java
- copied, changed from r3789, java/trunk/integration-tests/src/test/java/org/hps/ReadoutNoPileupTest.java
java/trunk/integration-tests/src/test/java/org/hps/test/it/ReadoutToLcioTest.java
- copied, changed from r3789, java/trunk/integration-tests/src/test/java/org/hps/ReadoutToLcioTest.java
java/trunk/integration-tests/src/test/java/org/hps/test/it/SimpleSvtReadoutTest.java
- copied, changed from r3789, java/trunk/integration-tests/src/test/java/org/hps/SimpleSvtReadoutTest.java
Removed:
java/trunk/integration-tests/src/test/java/org/hps/APrimeReconTest.java
java/trunk/integration-tests/src/test/java/org/hps/DataQualityMonitorTest.java
java/trunk/integration-tests/src/test/java/org/hps/EcalReadoutSimTest.java
java/trunk/integration-tests/src/test/java/org/hps/EtSystemTest.java
java/trunk/integration-tests/src/test/java/org/hps/HPSTestRunTracker2014GeometryTrackReconTest.java
java/trunk/integration-tests/src/test/java/org/hps/HPSTracker2014GeometryTrackReconTest.java
java/trunk/integration-tests/src/test/java/org/hps/MCFilteredReconTest.java
java/trunk/integration-tests/src/test/java/org/hps/MockDataReconTest.java
java/trunk/integration-tests/src/test/java/org/hps/ReadoutNoPileupTest.java
java/trunk/integration-tests/src/test/java/org/hps/ReadoutToEvioTest.java
java/trunk/integration-tests/src/test/java/org/hps/ReadoutToLcioTest.java
java/trunk/integration-tests/src/test/java/org/hps/SimpleMCReconTest.java
java/trunk/integration-tests/src/test/java/org/hps/SimpleSvtReadoutTest.java
java/trunk/integration-tests/src/test/java/org/hps/SteeringFilesTest.java
java/trunk/integration-tests/src/test/java/org/hps/TestRunEvioToLcioTest.java
java/trunk/integration-tests/src/test/java/org/hps/TestRunReadoutToEvioTest.java
java/trunk/integration-tests/src/test/java/org/hps/TestRunReconTest.java
Modified:
java/trunk/integration-tests/pom.xml
java/trunk/integration-tests/src/test/java/org/hps/test/it/EvioToLcioTest.java
Copied: java/sandbox/broken_tests/MockDataReconTest.java (from r3789, java/trunk/integration-tests/src/test/java/org/hps/MockDataReconTest.java)
=============================================================================
--- java/trunk/integration-tests/src/test/java/org/hps/MockDataReconTest.java (original)
+++ java/sandbox/broken_tests/MockDataReconTest.java Wed Oct 7 19:31:07 2015
@@ -1,4 +1,4 @@
-package org.hps;
+package org.hps.test.it;
import java.io.File;
import java.io.IOException;
Copied: java/sandbox/broken_tests/ReadoutToEvioTest.java (from r3789, java/trunk/integration-tests/src/test/java/org/hps/ReadoutToEvioTest.java)
=============================================================================
--- java/trunk/integration-tests/src/test/java/org/hps/ReadoutToEvioTest.java (original)
+++ java/sandbox/broken_tests/ReadoutToEvioTest.java Wed Oct 7 19:31:07 2015
@@ -2,11 +2,9 @@
import java.io.File;
import java.net.URL;
-import java.util.logging.Level;
import junit.framework.TestCase;
-import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.job.JobManager;
import org.lcsim.util.cache.FileCache;
import org.lcsim.util.test.TestUtil.TestOutputFile;
@@ -34,6 +32,8 @@
File inputFile = cache.getCachedFile(new URL("http://www.lcsim.org/test/hps-java/ReadoutToEvioTest.slcio"));
JobManager job = new JobManager();
+ job.addVariableDefinition("detector", "HPS-Proposal2014-v8-2pt2");
+ job.addVariableDefinition("run", "0");
job.addInputFile(inputFile);
File outputFile = new TestOutputFile(this.getClass().getSimpleName() + File.separator + this.getClass().getSimpleName() + "_readout");
job.addVariableDefinition("outputFile", outputFile.getPath());
Modified: java/trunk/integration-tests/pom.xml
=============================================================================
--- java/trunk/integration-tests/pom.xml (original)
+++ java/trunk/integration-tests/pom.xml Wed Oct 7 19:31:07 2015
@@ -29,9 +29,6 @@
<configuration>
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
- <excludes>
- <exclude>org/hps/**.java</exclude>
- </excludes>
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
Modified: java/trunk/integration-tests/src/test/java/org/hps/test/it/EvioToLcioTest.java
=============================================================================
--- java/trunk/integration-tests/src/test/java/org/hps/test/it/EvioToLcioTest.java (original)
+++ java/trunk/integration-tests/src/test/java/org/hps/test/it/EvioToLcioTest.java Wed Oct 7 19:31:07 2015
@@ -1,9 +1,9 @@
package org.hps.test.it;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import junit.framework.TestCase;
@@ -176,8 +176,10 @@
// Run the command line utility.
final String[] args = new String[] {"-l", outputFile.getPath(), "-d", "HPS-EngRun2015-Nominal-v1", INPUT_FILE,
- "-L", "WARNING", "-r", "-x", "/org/hps/steering/EventMarker.lcsim"};
- System.out.println("Running EvioToLcio on " + INPUT_FILE + " ...");
+ "-r", "-x", "/org/hps/steering/EventMarker.lcsim"};
+ System.out.println("Running EvioToLcio on " + INPUT_FILE);
+ Logger.getLogger("org.hps.evio").setLevel(Level.WARNING);
+ System.out.println("org.hps.evio logging level is " + Logger.getLogger("org.hps.evio").getLevel());
EvioToLcio cnv = new EvioToLcio();
cnv.parse(args);
long start = System.currentTimeMillis();
@@ -185,6 +187,9 @@
long elapsed = System.currentTimeMillis() - start;
System.out.println("Done running EvioToLcio!");
System.out.println("conversion to LCIO took " + elapsed + " ms");
+
+ // Check that the conversion did not take too long.
+ assertTrue("Conversion from EVIO to LCIO took too long.", elapsed < 1000000);
// Read in the LCIO file and run the CheckDriver on it.
System.out.println("Checking LCIO output ...");
@@ -194,25 +199,25 @@
loop.add(checkDriver);
loop.loop(-1);
- System.out.println("conversion took " + elapsed / loop.getTotalConsumed() + " ms/event");
-
- // Check for correct number of events processed by loop.
- System.out.println("Loop processed " + loop.getTotalCountableConsumed() + " events.");
- assertEquals("Loop processed wrong number of events.", PROCESSED_COUNT, loop.getTotalCountableConsumed());
+ System.out.println("conversion to LCIO took " + elapsed / loop.getTotalConsumed() + " ms/event");
+
+ // Check that correct number of events were processed by the loop.
+ System.out.println("LCSim loop processed " + loop.getTotalCountableConsumed() + " events.");
+ assertEquals("LCSim loop processed the wrong number of events.", PROCESSED_COUNT, loop.getTotalCountableConsumed());
// Check that the Driver saw the correct number of events.
System.out.println("CheckDriver processed " + checkDriver.processedCount + " events.");
- assertEquals("Driver saw wrong number of events.", PROCESSED_COUNT, checkDriver.processedCount);
-
- // Require that the correct number of events with EPICS data were found.
+ assertEquals("Wrong number of events processed by the check Driver.", PROCESSED_COUNT, checkDriver.processedCount);
+
+ // Check that the correct number of EPICS data collections were written out.
System.out.println("Found " + checkDriver.epicsDataCount + " events with EPICS data.");
- assertTrue("Missing EPICS data.", checkDriver.epicsDataCount == EPICS_DATA_COUNT);
-
- // Require that the correct number of events with scaler data were found.
+ assertTrue("EPICS data count is wrong.", checkDriver.epicsDataCount == EPICS_DATA_COUNT);
+
+ // Check that the correct number of scaler data collections were written out.
System.out.println("Found " + checkDriver.scalerDataCount + " events with scaler data.");
- assertTrue("Missing scaler data.", checkDriver.scalerDataCount == SCALER_DATA_COUNT);
-
- // Check if there were too many empty collections.
+ assertTrue("Scaler data count is wrong.", checkDriver.scalerDataCount == SCALER_DATA_COUNT);
+
+ // Check that there were not too many empty collections.
for (int i = 0; i < COLLECTION_NAMES.length; i++) {
final String collection = COLLECTION_NAMES[i];
final Integer nEmpty = checkDriver.emptyCollections.get(collection);
Copied: java/trunk/integration-tests/src/test/java/org/hps/test/it/ReadoutNoPileupTest.java (from r3789, java/trunk/integration-tests/src/test/java/org/hps/ReadoutNoPileupTest.java)
=============================================================================
--- java/trunk/integration-tests/src/test/java/org/hps/ReadoutNoPileupTest.java (original)
+++ java/trunk/integration-tests/src/test/java/org/hps/test/it/ReadoutNoPileupTest.java Wed Oct 7 19:31:07 2015
@@ -2,11 +2,9 @@
import java.io.File;
import java.net.URL;
-import java.util.logging.Level;
import junit.framework.TestCase;
-import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.job.JobManager;
import org.lcsim.util.cache.FileCache;
import org.lcsim.util.test.TestUtil.TestOutputFile;
@@ -38,6 +36,8 @@
JobManager job = new JobManager();
job.addInputFile(inputFile);
+ job.addVariableDefinition("detector", "HPS-Proposal2014-v8-2pt2");
+ job.addVariableDefinition("run", "0");
File outputFile = new TestOutputFile(this.getClass().getSimpleName() + File.separator + this.getClass().getSimpleName() + "_readout");
job.addVariableDefinition("outputFile", outputFile.getPath());
job.setup("/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim");
Copied: java/trunk/integration-tests/src/test/java/org/hps/test/it/ReadoutToLcioTest.java (from r3789, java/trunk/integration-tests/src/test/java/org/hps/ReadoutToLcioTest.java)
=============================================================================
--- java/trunk/integration-tests/src/test/java/org/hps/ReadoutToLcioTest.java (original)
+++ java/trunk/integration-tests/src/test/java/org/hps/test/it/ReadoutToLcioTest.java Wed Oct 7 19:31:07 2015
@@ -1,12 +1,10 @@
-package org.hps;
+package org.hps.test.it;
import java.io.File;
import java.net.URL;
-import java.util.logging.Level;
import junit.framework.TestCase;
-import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.job.JobManager;
import org.lcsim.util.cache.FileCache;
import org.lcsim.util.test.TestUtil.TestOutputFile;
@@ -35,6 +33,8 @@
File inputFile = cache.getCachedFile(new URL("http://www.lcsim.org/test/hps-java/ReadoutToLcioTest.slcio"));
JobManager job = new JobManager();
+ job.addVariableDefinition("detector", "HPS-Proposal2014-v8-2pt2");
+ job.addVariableDefinition("run", "0");
job.addInputFile(inputFile);
File outputFile = new TestOutputFile(this.getClass().getSimpleName() + File.separator + this.getClass().getSimpleName());
job.addVariableDefinition("outputFile", outputFile.getPath());
Copied: java/trunk/integration-tests/src/test/java/org/hps/test/it/SimpleSvtReadoutTest.java (from r3789, java/trunk/integration-tests/src/test/java/org/hps/SimpleSvtReadoutTest.java)
=============================================================================
--- java/trunk/integration-tests/src/test/java/org/hps/SimpleSvtReadoutTest.java (original)
+++ java/trunk/integration-tests/src/test/java/org/hps/test/it/SimpleSvtReadoutTest.java Wed Oct 7 19:31:07 2015
@@ -1,13 +1,11 @@
-package org.hps;
+package org.hps.test.it;
import java.io.File;
import java.net.URL;
import java.util.List;
-import java.util.logging.Level;
import junit.framework.TestCase;
-import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.job.JobManager;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
@@ -23,7 +21,6 @@
*/
public class SimpleSvtReadoutTest extends TestCase {
-
static final String fileUrl = "http://www.lcsim.org/test/hps-java/ReadoutToLcioTest.slcio";
static final File outputDir = new File("./target/test-output/" + SimpleSvtReadoutTest.class.getSimpleName());
static final File outputFile = new File(outputDir + File.separator + SimpleSvtReadoutTest.class.getSimpleName());
@@ -49,6 +46,8 @@
JobManager job = new JobManager();
job.addInputFile(inputFile);
job.addVariableDefinition("outputFile", outputFile.getPath());
+ job.addVariableDefinition("detector", "HPS-Proposal2014-v8-2pt2");
+ job.addVariableDefinition("run", "0");
job.setup("/org/hps/steering/readout/HPS2014TruthReadoutToLcio.lcsim");
job.getLCSimLoop().add(checker);
job.setNumberOfEvents(10000);
