GeomConverter/test/org/lcsim/material

diff -N MaterialElementDataToGDMLCnvTest.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ MaterialElementDataToGDMLCnvTest.java	1 Jul 2005 00:12:25 -0000	1.1
@@ -0,0 +1,33 @@

+/*
+ * ElementDataToGDMLCnv.java
+ *
+ * Created on June 7, 2005, 3:55 PM
+ */
+
+package org.lcsim.material;
+import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ *
+ * @author jeremym
+ */
+public class MaterialElementDataToGDMLCnvTest extends TestCase
+{
+    
+    public MaterialElementDataToGDMLCnvTest(String testName)
+    {
+        super(testName);
+    }
+    
+    public static Test suite()
+    {
+        return new TestSuite(MaterialElementDataToGDMLCnvTest.class);
+    }
+    
+    public static void test_write() throws java.io.FileNotFoundException, java.io.IOException
+    {        
+        MaterialElementDataToGDMLCnv.write();
+    }
+}

GeomConverter/test/org/lcsim/material

diff -u -r1.1 -r1.2
--- MaterialFromGDMLCnvTest.java	30 Jun 2005 00:37:51 -0000	1.1
+++ MaterialFromGDMLCnvTest.java	1 Jul 2005 00:12:25 -0000	1.2
@@ -40,11 +40,20 @@

         MaterialElementData med = new MaterialElementData();
         XMLMaterialManager f = XMLMaterialManager.create(defURL);                          
         

-        for ( MaterialElement me : MaterialManager.elements().values() )
-        {
-            System.out.println("defined elem: " + me.name());
-        }

+        //for ( MaterialElement me : MaterialManager.elements().values() )
+        //{
+        //    System.out.println("defined elem: " + me.name());
+        //}

         
         f.makeMaterials(null);

+        
+        Material testFractionMat = MaterialManager.getMaterial("TestFraction");
+        
+        //assert(testFractionMat != null);
+        
+        //System.out.println("testFractionMat ncomp, ncompmax, nelem: " + testFractionMat.getNComponents() + " " + testFractionMat.getNComponentsMax() + " " + testFractionMat.getNElements() );        
+        //assertEquals( testFractionMat.getMassFractions().get(0), 0.25);
+        //assertEquals( testFractionMat.getMassFractions().get(1), 0.25);
+        //assertEquals( testFractionMat.getMassFractions().get(2), 0.5);

     }
 }

GeomConverter/test/org/lcsim/material

diff -u -r1.2 -r1.3
--- MaterialFromGDMLCnvTest.xml	30 Jun 2005 00:53:17 -0000	1.2
+++ MaterialFromGDMLCnvTest.xml	1 Jul 2005 00:12:25 -0000	1.3
@@ -2,13 +2,35 @@

 
 <materials>
 

+<!--

       <material name="TestFraction">
 	<D type="density" unit="g/cm3" value="1.0"/>
 	<fraction n="0.25" ref="N"/>
 	<fraction n="0.25" ref="O"/>
 	<fraction n="0.50" ref="Ar"/>
       </material>

+      -->
+      
+      <material name="TestMat1">
+        <D type="density" unit="g/cm3" value="1.0"/>
+        <composite n="1" ref="N"/>
+        <composite n="1" ref="C"/>
+        <!--<composite n="1" ref="O"/>-->
+      </material>
+      
+      <material name="TestMat2">
+        <D type="density" unit="g/cm3" value="1.0"/>
+        <fraction n="0.5" ref="O"/>
+        <fraction n="0.5" ref="Ar"/>        
+      </material>                       
+      
+      <material name="TestFractionMaterials">
+        <D type="density" unit="g/cm3" value="1.0"/>
+        <fraction n="0.5" ref="TestMat1" />
+        <fraction n="0.5" ref="TestMat2" />
+      </material>

+      <!--

       <material name="TestCompositeElementsOnly">
 	<D type="density" unit="g/cm3" value="1.0"/>
 	<composite n="1" ref="N"/>

@@ -26,5 +48,26 @@

 	<D type="density" unit="g/cm3" value="0.0012"/>
 	<atom value="1.0" />
       </material>

+      -->      
+            
+      <material name="Epoxy">
+        <D type="density" value="1.3" unit="g/cm3"/>
+        <composite n="1" ref="H"/>
+        <composite n="1" ref="C"/>
+        <composite n="1" ref="O"/>
+      </material>

+      <material name="Quartz">
+        <D type="density" value="2.2" unit="g/cm3"/>
+        <composite n="1" ref="Si"/>
+        <composite n="1" ref="O"/>
+      </material>
+
+      <material name="G10">
+        <D type="density" value="1.7" unit="g/cm3" />
+        <fraction n="0.25" ref="Cl" />
+        <fraction n="0.25" ref="Quartz" />
+        <fraction n="0.50" ref="Epoxy" />
+      </material>
+      

 </materials>

\ No newline at end of file

GeomConverter/test/org/lcsim/material

diff -u -r1.2 -r1.3
--- XMLMaterialManagerTest.java	28 Jun 2005 21:34:55 -0000	1.2
+++ XMLMaterialManagerTest.java	1 Jul 2005 00:12:25 -0000	1.3
@@ -39,16 +39,16 @@

         XMLMaterialManager f = XMLMaterialManager.create(defURL);
         
         /* Test materials element. */

-        assertTrue(f.getMaterialsRoot() != null);

+        //assertTrue(f.getMaterialsRoot() != null);

         
         /* Test getElement() method. */

-        Element ee = f.getElement(materialName+"_e");
-        assertTrue(ee != null);
-        assertTrue(ee.getAttributeValue("formula").contentEquals(formula));

+        //Element ee = f.getElement(materialName+"_e");
+        //assertTrue(ee != null);
+        //assertTrue(ee.getAttributeValue("formula").contentEquals(formula));

         
         /* Test getMaterial() method. */

-        Element em = f.getMaterial(materialName);
-        assertTrue(em != null);

+        //Element em = f.getMaterial(materialName);
+        //assertTrue(em != null);

         
         /* Test resetMaps() method. */
         f.resetMaps();

@@ -79,9 +79,9 @@

         assertTrue(f.getMaterial("Quartz") != null);
         assertTrue(f.getMaterial("Epoxy") != null);
         assertTrue(f.getElement("Silicon_e") != null);

-        assertTrue(f.getElement("Oxygen_e") != null);

+        assertTrue(f.getElement("O") != null);

         assertTrue(f.getElement("Hydrogen_e") != null);

-        assertTrue(f.getElement("Carbon_e") != null);

+        assertTrue(f.getElement("C") != null);

          */ 
     }