Ignore:
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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/atmsdriver/model/LoadHighwaysTest.java

    r96 r103  
    11package atmsdriver.model; 
    22 
    3 import atmsdriver.ATMSDriver; 
    4 import atmsdriver.model.Station.DIRECTION; 
    5 import java.io.File; 
    63import java.io.FileWriter; 
    74import java.io.PrintWriter; 
    … …  
    7067         
    7168        // Test for correct number of highways 
    72         ArrayList<Highway> result = highways.getHighways(); 
    73         assertEquals(3, result.size()); 
     69        ArrayList<Highway> result = highways.highways; 
     70        assertEquals(2, result.size()); 
    7471         
    7572        // Test 55 N was loaded 
    76         Highway fiftyfiveN = result.get(2); 
    77         assertEquals(new Integer(55), fiftyfiveN.highwayNumber); 
     73        Highway fiftyfiveN = result.get(0); 
     74        assertEquals(new Integer(55), fiftyfiveN.routeNumber); 
    7875         
    7976        // Test 55 N stations are sorted by postmile 
    … …  
    8279        for(Station station : stations) 
    8380        { 
    84             stationsPostmiles.add(station.getPostmile()); 
     81            stationsPostmiles.add(station.postmile); 
    8582        } 
     83         
     84        // Create expected station postmile list (sorted) 
    8685        ArrayList<Double> expectedStationsPostmiles = new ArrayList<>(); 
    8786        expectedStationsPostmiles.add(new Double(4.58)); 
     87        expectedStationsPostmiles.add(new Double(4.7)); 
     88        expectedStationsPostmiles.add(new Double(5.06)); 
    8889        expectedStationsPostmiles.add(new Double(5.51)); 
    8990        expectedStationsPostmiles.add(new Double(9.41)); 
    9091        expectedStationsPostmiles.add(new Double(10)); 
    91         for(int i = 0; i < 4; i++) 
     92        expectedStationsPostmiles.add(new Double(10.4)); 
     93        expectedStationsPostmiles.add(new Double(10.5)); 
     94        for(int i = 0; i < 8; i++) 
    9295        { 
    9396            assertEquals(expectedStationsPostmiles.get(i),  
    … …  
    9699         
    97100        // Test 55 S was loaded 
    98         Highway fiftyfiveS = result.get(0); 
    99         assertEquals(new Integer(55), fiftyfiveS.highwayNumber); 
     101        Highway fiftyfiveS = result.get(1); 
     102        assertEquals(new Integer(5), fiftyfiveS.routeNumber); 
    100103         
    101104        // Test 55 S stations are sorted by postmile 
    … …  
    104107        for(Station station : stations) 
    105108        { 
    106             stationsPostmiles.add(station.getPostmile()); 
    107         } 
    108         expectedStationsPostmiles.clear(); 
    109         expectedStationsPostmiles.add(new Double(4.7)); 
    110         expectedStationsPostmiles.add(new Double(5.06)); 
    111         expectedStationsPostmiles.add(new Double(10.4)); 
    112         expectedStationsPostmiles.add(new Double(10.5)); 
    113         for(int i = 0; i < 4; i++) 
    114         { 
    115             assertEquals(expectedStationsPostmiles.get(i),  
    116                     stationsPostmiles.get(i)); 
    117         } 
    118          
    119         Highway fiveS = result.get(1); 
    120         assertEquals(new Integer(5), fiveS.highwayNumber); 
    121          
    122         // Test 5 S stations are sorted by postmile 
    123         stations = fiveS.stations; 
    124         stationsPostmiles.clear(); 
    125         for(Station station : stations) 
    126         { 
    127             stationsPostmiles.add(station.getPostmile()); 
     109            stationsPostmiles.add(station.postmile); 
    128110        } 
    129111        expectedStationsPostmiles.clear(); 
    … …  
    131113        expectedStationsPostmiles.add(new Double(32.25)); 
    132114        expectedStationsPostmiles.add(new Double(33)); 
    133         for(int i = 0; i < 2; i++) 
     115        for(int i = 0; i < 3; i++) 
    134116        { 
    135117            assertEquals(expectedStationsPostmiles.get(i),  
Note: See TracChangeset for help on using the changeset viewer.