diff -u -r1.5 -r1.6
--- LayerStackTest.java	18 Jul 2005 18:00:07 -0000	1.5
+++ LayerStackTest.java	22 Jul 2006 23:35:36 -0000	1.6
@@ -6,7 +6,12 @@

 
 package org.lcsim.geometry.layer;
 

-import junit.framework.*;

+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+

 import org.lcsim.material.MaterialManager;
 
 /**

@@ -33,6 +38,7 @@

     protected void setUp() throws java.lang.Exception
     {
         MaterialManager.instance();

+        

         layerStack = new LayerStack();
         
         LayerSlice s1 = new LayerSlice(sliceMat[0], sliceThick[0], false);

@@ -41,16 +47,20 @@

         LayerSlice s4 = new LayerSlice(sliceMat[3], sliceThick[3], false);
         
         for ( int i = 0; i < numLayers; i++)

-        {
-            Layer l = new Layer();

+        {                       
+        	List<LayerSlice> list = new ArrayList<LayerSlice>();

-            l.addSlice(s1);
-            l.addSlice(s2);
-            l.addSlice(s3);
-            l.addSlice(s4);

+            list.add(s1);
+            list.add(s2);
+            list.add(s3);
+            list.add(s4);
+           
+            Layer l = new Layer(list);

             
             layerStack.addLayer(l);
         }

+        
+        System.out.println("layerStack.getTotalThickness = " + layerStack.getTotalThickness());

     }
     
     protected void tearDown() throws java.lang.Exception

@@ -64,12 +74,12 @@

     
     public void testLayerStack()
     {   

-        /* LayerStack number of layers. */

+        /* LayerStack number of layers. */    	

         assertEquals(layerStack.getNumberOfLayers(), numLayers);        
         

-        /* LayerStack total thickness. */

+        /* LayerStack total thickness. */ 

         assertEquals(layerStack.getTotalThickness(), layerStackThickness);

-        

+                

         /* Layer total thickness. */
         assertEquals(layerStack.getLayer(0).getThickness(), layerThickness);