Print

Print
Commit in lcsim/test/org/lcsim on MAIN
digisim/DigiSimTest.java+3-31.9 -> 1.10
recon/cluster/fixedcone/FixedConeClustererTest.java+3-21.9 -> 1.10
util/heprep/LCSimHepRepConverterTest.java+2-11.6 -> 1.7
+8-6
3 modified files
use new test files
lcsim/test/org/lcsim/digisim
DigiSimTest.java 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- DigiSimTest.java	11 Sep 2007 00:21:00 -0000	1.9
+++ DigiSimTest.java	17 Mar 2009 22:01:39 -0000	1.10
@@ -2,12 +2,12 @@

 
 import java.io.File;
 import java.net.URL;

+

 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
 import org.lcsim.util.cache.FileCache;

-import org.lcsim.util.loop.LCIODriver;

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

@@ -31,7 +31,7 @@

    public void testDigiSim() throws Exception
    {
       // data file

-      URL url = new URL("http://www.lcsim.org/datasamples/zpole.slcio");

+      URL url = new URL("http://www.lcsim.org/test/lcio/mu_10.0GeV_Theta90_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid02.slcio");

       FileCache cache = new FileCache();
       File file = cache.getCachedFile(url);
 

@@ -44,7 +44,7 @@

       // save output
 //       loop.add(new LCIODriver(new File("digisim.slcio")));
 

-      loop.loop(10, null);  // -1 for all events

+      loop.loop(-1, null);  // -1 for all events

       loop.dispose();
    }
 }
lcsim/test/org/lcsim/recon/cluster/fixedcone
FixedConeClustererTest.java 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- FixedConeClustererTest.java	11 Sep 2007 00:21:03 -0000	1.9
+++ FixedConeClustererTest.java	17 Mar 2009 22:01:39 -0000	1.10
@@ -17,6 +17,7 @@

  *
  * @author ngraf
  */

+// FIXME: This test is not very good.  It does not make any assertions.  --JM

 public class FixedConeClustererTest extends TestCase
 {
    public FixedConeClustererTest(String testName)

@@ -31,7 +32,7 @@

 
    public static void testNNClusterer() throws IOException, LoopException
    {      

-      URL url = new URL("http://www.lcsim.org/datasamples/SLIC_v1r9p1_sdjan03_muons_Theta4-176_1-10GeV.slcio");

+      URL url = new URL("http://www.lcsim.org/test/lcio/mu_10.0GeV_Theta90_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid02.slcio");

       
       FileCache cache = new FileCache();
       File file = cache.getCachedFile(url);

@@ -44,7 +45,7 @@

       loop.setLCIORecordSource(file);
       loop.add(new FixedConeClusterDriver(radius, seed, minE));
       loop.add(new LCIODriver(new TestOutputFile("FixedConeRecon.slcio")));

-      loop.loop(10, null);

+      loop.loop(-1, null);

       loop.dispose();
    }
 }
lcsim/test/org/lcsim/util/heprep
LCSimHepRepConverterTest.java 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- LCSimHepRepConverterTest.java	11 Sep 2007 00:21:02 -0000	1.6
+++ LCSimHepRepConverterTest.java	17 Mar 2009 22:01:39 -0000	1.7
@@ -25,6 +25,7 @@

  *
  * @author tonyj
  */

+// FIXME: This test does not make any assertions.

 public class LCSimHepRepConverterTest extends TestCase
 {
    private HepRepConverter converter;

@@ -61,7 +62,7 @@

    public void testConvert() throws Exception
    {        
       LCSimConditionsManagerImplementation.register();

-      URL url = new URL("http://www.lcsim.org/datasamples/zpole.slcio");

+      URL url = new URL("http://www.lcsim.org/test/lcio/mu_10.0GeV_Theta90_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid02.slcio");

       FileCache cache = new FileCache();
       File file = cache.getCachedFile(url);
       LCIOReader reader = new LCIOReader(file);
CVSspam 0.2.8