Changeset 103 in tmcsimulator for trunk/test/atmsdriver

Timestamp:

10/12/2017 12:28:28 AM (9 years ago)

Author:

jtorres

Message:

trunk/src/atmsdriver/ConsoleDriver.java: Created console driver for ATMSDriver, completed and very nice. Still need to apply correct vol/occ values to actually change the colors. Still need to write a JUnit test for it. trunk/src/atmsdriver/ATMSDriver.java: Refactored to run the console driver. ATMSDriver runs in thread, console driver runs, and they share the highways instance. Renamed NetworkLoader?.java to FEPLineLoader.java. trunk/src/atmsdriver/model/Highways.java: refactored loadHighways() method to conform to new undirected highway abstraction. trunk/src/atmsdriver/model/Station.java: added updateByDirection(DIRECTION dir) method and supporting utility methods. trunk/test/atmsdriver/model/LoadHighwaysTest.java: Conformed LoadHighways? test to new undirected highway abstraction. trunk/test/atmsdriver/model/StationTest.java: Conformed StationTest?.java to new changes - very minor stuff. Went through all model classes and changed any final privates with a getter method to final public, for good OOP practice and simplicity. Went through ALL FILES and commented everything very well. minor application custom configuration changes. Removed all .class or .o.d files from svn repository

Location:

trunk/test/atmsdriver/model

Files:

• LoadHighwaysTest.java (modified) (6 diffs)
• StationTest.java (modified) (3 diffs)

trunk/test/atmsdriver/model/LoadHighwaysTest.java

@@ -1 +1 @@
 package atmsdriver.model;
 
-import atmsdriver.ATMSDriver;
-import atmsdriver.model.Station.DIRECTION;
-import java.io.File;
 import java.io.FileWriter;
 import java.io.PrintWriter;
@@ -70 +67 @@
         
         // Test for correct number of highways
-        ArrayList<Highway> result = highways.getHighways();
-        assertEquals(3, result.size());
+        ArrayList<Highway> result = highways.highways;
+        assertEquals(2, result.size());
         
         // Test 55 N was loaded
-        Highway fiftyfiveN = result.get(2);
-        assertEquals(new Integer(55), fiftyfiveN.highwayNumber);
+        Highway fiftyfiveN = result.get(0);
+        assertEquals(new Integer(55), fiftyfiveN.routeNumber);
         
         // Test 55 N stations are sorted by postmile
@@ -82 +79 @@
         for(Station station : stations)
         {
-            stationsPostmiles.add(station.getPostmile());
+            stationsPostmiles.add(station.postmile);
         }
+        
+        // Create expected station postmile list (sorted)
         ArrayList<Double> expectedStationsPostmiles = new ArrayList<>();
         expectedStationsPostmiles.add(new Double(4.58));
+        expectedStationsPostmiles.add(new Double(4.7));
+        expectedStationsPostmiles.add(new Double(5.06));
         expectedStationsPostmiles.add(new Double(5.51));
         expectedStationsPostmiles.add(new Double(9.41));
         expectedStationsPostmiles.add(new Double(10));
-        for(int i = 0; i < 4; i++)
+        expectedStationsPostmiles.add(new Double(10.4));
+        expectedStationsPostmiles.add(new Double(10.5));
+        for(int i = 0; i < 8; i++)
         {
             assertEquals(expectedStationsPostmiles.get(i), 
@@ -96 +99 @@
         
         // Test 55 S was loaded
-        Highway fiftyfiveS = result.get(0);
-        assertEquals(new Integer(55), fiftyfiveS.highwayNumber);
+        Highway fiftyfiveS = result.get(1);
+        assertEquals(new Integer(5), fiftyfiveS.routeNumber);
         
         // Test 55 S stations are sorted by postmile
@@ -104 +107 @@
         for(Station station : stations)
         {
-            stationsPostmiles.add(station.getPostmile());
-        }
-        expectedStationsPostmiles.clear();
-        expectedStationsPostmiles.add(new Double(4.7));
-        expectedStationsPostmiles.add(new Double(5.06));
-        expectedStationsPostmiles.add(new Double(10.4));
-        expectedStationsPostmiles.add(new Double(10.5));
-        for(int i = 0; i < 4; i++)
-        {
-            assertEquals(expectedStationsPostmiles.get(i), 
-                    stationsPostmiles.get(i));
-        }
-        
-        Highway fiveS = result.get(1);
-        assertEquals(new Integer(5), fiveS.highwayNumber);
-        
-        // Test 5 S stations are sorted by postmile
-        stations = fiveS.stations;
-        stationsPostmiles.clear();
-        for(Station station : stations)
-        {
-            stationsPostmiles.add(station.getPostmile());
+            stationsPostmiles.add(station.postmile);
         }
         expectedStationsPostmiles.clear();
@@ -131 +113 @@
         expectedStationsPostmiles.add(new Double(32.25));
         expectedStationsPostmiles.add(new Double(33));
-        for(int i = 0; i < 2; i++)
+        for(int i = 0; i < 3; i++)
         {
             assertEquals(expectedStationsPostmiles.get(i), 

trunk/test/atmsdriver/model/StationTest.java

@@ -33 +33 @@
     public void testGetHighwayNumber() {
         System.out.println("getHighwayNumber");
-        assertEquals(4, alpha.getHighwayNumber());
+        assertEquals(4, alpha.routeNumber);
     }
 
@@ -41 +41 @@
     public void testGetDirection() {
         System.out.println("getDirection");
-        assertEquals(DIRECTION.NORTH, alpha.getDirection());
+        assertEquals(DIRECTION.NORTH, alpha.direction);
     }
 
@@ -59 +59 @@
     public void testGetPostmile() {
         System.out.println("getPostmile");
-        assertEquals(1.0, alpha.getPostmile(),0.1);
+        assertEquals(1.0, alpha.postmile,0.1);
     }