GeomConverter/test/org/lcsim/material

diff -u -r1.4 -r1.5
--- XMLMaterialManagerTest.java	22 Jul 2005 00:11:33 -0000	1.4
+++ XMLMaterialManagerTest.java	22 Jul 2005 23:24:13 -0000	1.5
@@ -10,7 +10,6 @@

 import java.net.MalformedURLException;
 import java.net.URL;
 import junit.framework.*;

-import org.jdom.Element;

 import org.jdom.JDOMException;
 
 /**

@@ -23,7 +22,7 @@

     //static public final String materialName = "Aluminum";
     //static public final String formula = "Al";
     private static URL defURL = XMLMaterialManagerTest.class.getResource("test.xml");

-    XMLMaterialManager mgr;

+    XMLMaterialManager xmgr;

     
     public XMLMaterialManagerTest(String testName)
     {

@@ -37,8 +36,10 @@

     
     protected void setUp()
     {

-        try {
-            mgr = XMLMaterialManager.create(defURL);

+        try
+        {
+            xmgr = XMLMaterialManager.create(defURL);
+            xmgr.makeMaterials(null);

         }
         catch ( Exception e)
         {

@@ -46,22 +47,29 @@

         }
     }
     

-    public static void testLambdaNonzero() throws org.lcsim.material.MaterialNotFoundException

+    public void testLambdaNonzero() throws org.lcsim.material.MaterialNotFoundException

     {
         Material quartz = MaterialManager.instance().findMaterial("Quartz");
         Material epoxy = MaterialManager.instance().findMaterial("Epoxy");

-        Material g10 = MaterialManager.instance().findMaterial("G10");        

+        Material g10 = MaterialManager.instance().findMaterial("G10");

         
         double quartzNIL, epoxyNIL, g10NIL;
         quartzNIL = quartz.getNuclearInteractionLength();
         epoxyNIL = epoxy.getNuclearInteractionLength();

-        g10NIL = g10.getNuclearInteractionLength(); 

+        g10NIL = g10.getNuclearInteractionLength();

         
         assert(quartzNIL != 0);
         assert(epoxyNIL != 0);

-        assert(g10NIL != 0);

+        assert(g10NIL != 0);                
+        
+        //MaterialManager.instance().printMaterials();
+                
+        org.jdom.Element xwater = xmgr.getMaterial("Water");                
+        
+        //Material water = MaterialManager.instance().findMaterial("Water");
+        //System.out.println(water.toString());

-        //System.out.println(g10.toString() );       

+        //System.out.println(g10.toString() );

     }
     
     public void testBasic() throws JDOMException, IOException

GeomConverter/test/org/lcsim/material

diff -u -r1.3 -r1.4
--- test.xml	22 Jul 2005 00:11:33 -0000	1.3
+++ test.xml	22 Jul 2005 23:24:13 -0000	1.4
@@ -11,6 +11,32 @@

     <D type="density" unit="g/cm3" value="2.70" />
     <composite n="1" ref="Al" />
   </material>

+  
+    <material name="Epoxy">
+    <D type="density" value="1.3" unit="g/cm3"/>
+    <composite n="44" ref="H"/>
+    <composite n="15" ref="C"/>
+    <composite n="7" ref="O"/>
+  </material>
+
+  <material name="Quartz">
+    <D type="density" value="2.2" unit="g/cm3"/>
+    <composite n="1" ref="Si"/>
+    <composite n="2" ref="O"/>
+  </material>
+
+  <material name="G10">
+    <D type="density" value="1.7" unit="g/cm3"/>
+    <fraction n="0.08" ref="Cl"/>
+    <fraction n="0.773" ref="Quartz"/>
+    <fraction n="0.147" ref="Epoxy"/>
+  </material>
+  
+  <material name="Water">
+    <D type="density" value="1.0" unit="g/cm3"/>
+    <composite n="2" ref="H"/>
+    <composite n="1" ref="O"/>
+  </material>

 
   <!--
       <element name="Ar" Z="18.0" N="40" >

@@ -200,24 +226,4 @@

 </material>
   -->
 

-  <material name="Epoxy">
-    <D type="density" value="1.3" unit="g/cm3"/>
-    <composite n="44" ref="H"/>
-    <composite n="15" ref="C"/>
-    <composite n="7" ref="O"/>
-  </material>
-
-  <material name="Quartz">
-    <D type="density" value="2.2" unit="g/cm3"/>
-    <composite n="1" ref="Si"/>
-    <composite n="2" ref="O"/>
-  </material>
-
-  <material name="G10">
-    <D type="density" value="1.7" unit="g/cm3"/>
-    <fraction n="0.08" ref="Cl"/>
-    <fraction n="0.773" ref="Quartz"/>
-    <fraction n="0.147" ref="Epoxy"/>
-  </material>
-

 </materials>