Index: trunk/test/tmcsim/cadsimulator/managers/TrafficModelManagerTest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/managers/TrafficModelManagerTest.java	(revision 204)
+++ trunk/test/tmcsim/cadsimulator/managers/TrafficModelManagerTest.java	(revision 204)
@@ -0,0 +1,77 @@
+
+package tmcsim.cadsimulator.managers;
+
+import atmsdriver.model.TrafficEvent;
+import java.text.ParseException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Scanner;
+import junit.framework.TestCase;
+import tmcsim.common.SimulationException;
+
+/**
+ *
+ * @author jdalbey
+ */
+public class TrafficModelManagerTest extends TestCase
+{
+    
+    public TrafficModelManagerTest(String testName)
+    {
+        super(testName);
+    }
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+
+    /**
+     * Test of readBatchFile method, of class TrafficModelManager.
+     */
+    public void testReadBatchFile() throws SimulationException, ParseException
+    {
+        System.out.println("readBatchFile");
+        String alpha = "181 00:00:01 405 N 2.2 20.1 Y";
+        String bravo = "187 00:00:37  55 S 6.88 0.2 R";
+        String dataIn = alpha + "\n" + bravo + "\n";
+        Scanner scan = new Scanner(dataIn);
+        TrafficEvent evtA = new TrafficEvent(alpha);
+        TrafficEvent evtB = new TrafficEvent(bravo);
+        
+        LinkedList<TrafficEvent> expResult = new LinkedList<TrafficEvent>();
+        expResult.add(evtA);
+        expResult.add(evtB);
+        
+        LinkedList<TrafficEvent> result = TrafficModelManager.readBatchFile(scan);
+        assertEquals(expResult, result);
+    }
+    
+    public void testCreateIncidentMap() throws ParseException
+    {
+        System.out.println("createIncidentMap");
+        String alpha = "181 00:00:01 405 N 2.2 20.1 Y";
+        String bravo = "187 00:00:37  55 S 6.88 0.2 R";
+        String dataIn = alpha + "\n" + bravo + "\n";
+        Scanner scan = new Scanner(dataIn);
+        TrafficEvent evtA = new TrafficEvent(alpha);
+        TrafficEvent evtB = new TrafficEvent(bravo);
+      
+        LinkedList<TrafficEvent> eventQueue = TrafficModelManager.readBatchFile(scan);
+        // Extract the incidents and create a map
+        Map<String, List<TrafficEvent>> incidents;
+        incidents = TrafficModelManager.createIncidentMap(eventQueue);
+        System.out.println(""+incidents.keySet());
+        assertTrue(incidents.keySet().contains("181"));
+        assertTrue(incidents.keySet().contains("187"));
+    }
+ 
+}