Print

Print
Commit in GeomConverter/test/org/lcsim/detector on MAIN
ParametersTest.java+53added 1.1
ShapeRotateTest.java+12-11.4 -> 1.5
+65-1
1 added + 1 modified, total 2 files
JM: Modifcations to support parameters in org.lcsim.detector pacakge.
GeomConverter/test/org/lcsim/detector
ParametersTest.java added at 1.1
diff -N ParametersTest.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ParametersTest.java	9 Apr 2007 21:05:32 -0000	1.1
@@ -0,0 +1,53 @@

+package org.lcsim.detector;
+
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class ParametersTest extends TestCase
+{
+    private IParameters parameters = new Parameters();
+    
+    public ParametersTest(String name)
+    {
+        super(name);
+    }
+    
+    public static junit.framework.Test suite()
+    {
+        return new TestSuite(ParametersTest.class);
+    }
+    
+    public void setUp() throws Exception
+    {
+        parameters.addStringParameter("string", "foo");
+        parameters.addStringArrayParameter("stringArray", new String[] {"foo","bar"});
+        
+        parameters.addDoubleParameter("double", 1.1);
+        parameters.addDoubleArrayParameter("doubleArray", new double[] {1.1,2.1});
+        
+        parameters.addIntegerParameter("integer", 1);
+        parameters.addIntegerArrayParameter("integerArray", new int[] {1,2} );
+        
+        parameters.addBooleanParameter("boolean", true);
+        parameters.addBooleanArrayParameter("booleanArray", new boolean[] {true,false});      
+    }
+    
+    public void testParameterValues()
+    {
+        assertTrue(parameters.getStringParameter("string").equals("foo"));
+        assertTrue(parameters.getStringArrayParameter("stringArray")[0].equals("foo"));
+        assertTrue(parameters.getStringArrayParameter("stringArray")[1].equals("bar"));
+        
+        assertTrue(parameters.getDoubleParameter("double") == 1.1);
+        assertTrue(parameters.getDoubleArrayParameter("doubleArray")[0] == 1.1);
+        assertTrue(parameters.getDoubleArrayParameter("doubleArray")[1] == 2.1);
+        
+        assertTrue(parameters.getIntegerParameter("integer") == 1);
+        assertTrue(parameters.getIntegerArrayParameter("integerArray")[0] == 1);
+        assertTrue(parameters.getIntegerArrayParameter("integerArray")[1] == 2);
+        
+        assertTrue(parameters.getBooleanParameter("boolean") == true);
+        assertTrue(parameters.getBooleanArrayParameter("booleanArray")[0] == true);
+        assertTrue(parameters.getBooleanArrayParameter("booleanArray")[1] == false);
+    }
+}

\ No newline at end of file
GeomConverter/test/org/lcsim/detector
ShapeRotateTest.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- ShapeRotateTest.java	29 Mar 2007 22:43:19 -0000	1.4
+++ ShapeRotateTest.java	9 Apr 2007 21:05:32 -0000	1.5
@@ -26,6 +26,16 @@

 import org.lcsim.detector.material.MaterialElement;
 import org.lcsim.detector.solids.Box;
 

+/**
+ * Test case that writes out a heprep file called
+ * ShapeRotateTest.heprep which shows some
+ * DetectorElements that have translation and
+ * rotations.  Visually inspect to determine
+ * correctness.
+ * 
+ * @author Jeremy McCormick <[log in to unmask]>
+ *
+ */

 public class ShapeRotateTest 
 extends TestCase
 {

@@ -116,6 +126,7 @@

             new TestDE("par"+i,null,"/pv"+i);
         }
         

+        /*

         for (IDetectorElement de : DetectorElementStore.getInstance())
         {
             System.out.println(de.getName());

@@ -123,7 +134,7 @@

             {
                 System.out.println("     " + de.getGeometry().getPhysicalVolumePath());
             }

-        }

+        }*/

     }
   
     public final IPhysicalVolume createWorld()
CVSspam 0.2.8