Skip to content

Commit

Permalink
test cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
danielboudreau authored and danielboudreau committed Oct 4, 2018
1 parent e1ec532 commit 85e3882
Show file tree
Hide file tree
Showing 19 changed files with 138 additions and 140 deletions.
88 changes: 1 addition & 87 deletions java/test/jmri/jmrit/operations/OperationsTestCase.java
View file
@@ -1,105 +1,19 @@
package jmri.jmrit.operations;

import jmri.InstanceManager;
import jmri.jmrit.operations.locations.Location;
import jmri.jmrit.operations.locations.LocationManager;
import jmri.jmrit.operations.locations.Track;
import jmri.jmrit.operations.rollingstock.cars.Car;
import jmri.jmrit.operations.rollingstock.cars.CarManager;
import jmri.jmrit.operations.rollingstock.engines.Engine;
import jmri.jmrit.operations.rollingstock.engines.EngineManager;
import jmri.jmrit.operations.routes.Route;
import jmri.jmrit.operations.routes.RouteManager;
import jmri.jmrit.operations.trains.Train;
import jmri.jmrit.operations.trains.TrainManager;
import jmri.util.JUnitOperationsUtil;
import jmri.util.JUnitUtil;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;

/**
* Common setup and tear down for operation tests. Some common routines to
* create trains, locations, and routes.
* Common setup and tear down for operation tests.
*
* @author Dan Boudreau Copyright (C) 2015
* @author Paul Bender Copyright (C) 2016
*
*/
public class OperationsTestCase {

public void loadTrain(Location l) {
Assert.assertNotNull("Test Loc", l);
TrainManager trainManager = InstanceManager.getDefault(TrainManager.class);
Train trainA = trainManager.newTrain("Test Train A");
// train needs to service location "l" or error message when saving track edit frame
RouteManager routeManager = InstanceManager.getDefault(RouteManager.class);
Route route = routeManager.newRoute("Route Train A");
route.addLocation(l);
trainA.setRoute(route);
}

public void loadTrains() {
// Add some cars for the various tests in this suite
CarManager cm = InstanceManager.getDefault(CarManager.class);
String roadNames[] = Bundle.getMessage("carRoadNames").split(",");
// add caboose to the roster
Car c = cm.newCar(roadNames[2], "687");
c.setCaboose(true);
c = cm.newCar("CP", "435");
c.setCaboose(true);

// load engines
EngineManager emanager = InstanceManager.getDefault(EngineManager.class);
Engine e1 = emanager.newEngine("SP", "1");
e1.setModel("GP40");
Engine e2 = emanager.newEngine("PU", "2");
e2.setModel("GP40");
Engine e3 = emanager.newEngine("UP", "3");
e3.setModel("GP40");
Engine e4 = emanager.newEngine("UP", "4");
e4.setModel("FT");

TrainManager tmanager = InstanceManager.getDefault(TrainManager.class);
// turn off build fail messages
tmanager.setBuildMessagesEnabled(true);
// turn off print preview
tmanager.setPrintPreviewEnabled(false);

// load 5 trains
for (int i = 0; i < 5; i++) {
tmanager.newTrain("Test_Train " + i);
}

// load 6 locations
for (int i = 0; i < 6; i++) {
InstanceManager.getDefault(LocationManager.class).newLocation("Test_Location " + i);
}

// load 5 routes
InstanceManager.getDefault(RouteManager.class).newRoute("Test Route A");
InstanceManager.getDefault(RouteManager.class).newRoute("Test Route B");
InstanceManager.getDefault(RouteManager.class).newRoute("Test Route C");
InstanceManager.getDefault(RouteManager.class).newRoute("Test Route D");
InstanceManager.getDefault(RouteManager.class).newRoute("Test Route E");
}

public void loadLocations() {
// create 5 locations
LocationManager lManager = InstanceManager.getDefault(LocationManager.class);
Location l1 = lManager.newLocation("Test Loc E");
l1.addTrack("Test Track", Track.SPUR);
l1.setLength(1001);
Location l2 = lManager.newLocation("Test Loc D");
l2.setLength(1002);
Location l3 = lManager.newLocation("Test Loc C");
l3.setLength(1003);
Location l4 = lManager.newLocation("Test Loc B");
l4.setLength(1004);
Location l5 = lManager.newLocation("Test Loc A");
l5.setLength(1005);
}

@Before
public void setUp() {
jmri.util.JUnitUtil.setUp();
Expand Down
5 changes: 3 additions & 2 deletions java/test/jmri/jmrit/operations/locations/InterchangeEditFrameTest.java
View file
Expand Up @@ -5,6 +5,7 @@
import jmri.jmrit.operations.OperationsTestCase;
import jmri.jmrit.operations.rollingstock.cars.CarRoads;
import jmri.jmrit.operations.rollingstock.cars.CarTypes;
import jmri.util.JUnitOperationsUtil;
import jmri.util.JUnitUtil;
import jmri.util.swing.JemmyUtil;
import org.junit.After;
Expand Down Expand Up @@ -160,7 +161,7 @@ public void setUp() {
CarTypes ct = InstanceManager.getDefault(CarTypes.class);
ct.addName("Boxcar");

loadLocations();
JUnitOperationsUtil.loadFiveLocations();

// add UP road name
CarRoads cr = InstanceManager.getDefault(CarRoads.class);
Expand All @@ -169,7 +170,7 @@ public void setUp() {
lManager = InstanceManager.getDefault(LocationManager.class);
l = lManager.getLocationByName("Test Loc C");

loadTrain(l);
JUnitOperationsUtil.loadTrain(l);

}

Expand Down
3 changes: 2 additions & 1 deletion java/test/jmri/jmrit/operations/locations/LocationEditFrameTest.java
View file
Expand Up @@ -3,6 +3,7 @@
import java.awt.GraphicsEnvironment;
import jmri.InstanceManager;
import jmri.jmrit.operations.OperationsTestCase;
import jmri.util.JUnitOperationsUtil;
import jmri.util.JUnitUtil;
import jmri.util.swing.JemmyUtil;
import org.junit.After;
Expand All @@ -23,7 +24,7 @@ public class LocationEditFrameTest extends OperationsTestCase {
@Test
public void testLocationEditFrame() {
Assume.assumeFalse(GraphicsEnvironment.isHeadless());
loadLocations();
JUnitOperationsUtil.loadFiveLocations();

LocationEditFrame f = new LocationEditFrame(null);
f.setTitle("Test Add Location Frame");
Expand Down
3 changes: 2 additions & 1 deletion java/test/jmri/jmrit/operations/locations/LocationsTableFrameTest.java
View file
Expand Up @@ -2,6 +2,7 @@

import java.awt.GraphicsEnvironment;
import jmri.jmrit.operations.OperationsTestCase;
import jmri.util.JUnitOperationsUtil;
import jmri.util.JUnitUtil;
import jmri.util.JmriJFrame;
import org.junit.After;
Expand Down Expand Up @@ -119,7 +120,7 @@ public void testLocationsAddFrame() {
public void setUp() {
super.setUp();

loadLocations();
JUnitOperationsUtil.loadFiveLocations();
}

@Override
Expand Down
5 changes: 3 additions & 2 deletions java/test/jmri/jmrit/operations/locations/SidingEditFrameTest.java
View file
Expand Up @@ -9,6 +9,7 @@
import jmri.jmrit.operations.routes.RouteLocation;
import jmri.jmrit.operations.trains.Train;
import jmri.jmrit.operations.trains.TrainManager;
import jmri.util.JUnitOperationsUtil;
import jmri.util.JUnitUtil;
import jmri.util.JmriJFrame;
import jmri.util.swing.JemmyUtil;
Expand Down Expand Up @@ -306,11 +307,11 @@ public void testTrainServicesTrack() {
public void setUp() {
super.setUp();

loadLocations();
JUnitOperationsUtil.loadFiveLocations();
lManager = InstanceManager.getDefault(LocationManager.class);
l = lManager.getLocationByName("Test Loc C");

loadTrain(l);
JUnitOperationsUtil.loadTrain(l);
TrainManager trainManager = InstanceManager.getDefault(TrainManager.class);
trainA = trainManager.getTrainByName("Test Train A");
}
Expand Down
5 changes: 3 additions & 2 deletions java/test/jmri/jmrit/operations/locations/StagingEditFrameTest.java
View file
Expand Up @@ -3,6 +3,7 @@
import java.awt.GraphicsEnvironment;
import jmri.InstanceManager;
import jmri.jmrit.operations.OperationsTestCase;
import jmri.util.JUnitOperationsUtil;
import jmri.util.JUnitUtil;
import jmri.util.swing.JemmyUtil;
import org.junit.After;
Expand Down Expand Up @@ -169,12 +170,12 @@ public void testAddCloseAndReload() {
public void setUp() {
super.setUp();

loadLocations();
JUnitOperationsUtil.loadFiveLocations();

lManager = InstanceManager.getDefault(LocationManager.class);
l = lManager.getLocationByName("Test Loc C");

loadTrain(l);
JUnitOperationsUtil.loadTrain(l);

jmri.jmrit.operations.setup.Setup.setRfidEnabled(false); // turn off the ID Tag Reader field by default.
}
Expand Down
5 changes: 3 additions & 2 deletions java/test/jmri/jmrit/operations/locations/YardEditFrameTest.java
View file
Expand Up @@ -3,6 +3,7 @@
import java.awt.GraphicsEnvironment;
import jmri.InstanceManager;
import jmri.jmrit.operations.OperationsTestCase;
import jmri.util.JUnitOperationsUtil;
import jmri.util.JUnitUtil;
import jmri.util.swing.JemmyUtil;
import org.junit.After;
Expand Down Expand Up @@ -165,12 +166,12 @@ public void testCreateTracksAndReloadFrame() {
public void setUp() {
super.setUp();

loadLocations();
JUnitOperationsUtil.loadFiveLocations();

lManager = InstanceManager.getDefault(LocationManager.class);
l = lManager.getLocationByName("Test Loc C");

loadTrain(l);
JUnitOperationsUtil.loadTrain(l);
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion java/test/jmri/jmrit/operations/locations/schedules/ExportSchedulesTest.java
View file
Expand Up @@ -6,6 +6,7 @@
import jmri.jmrit.operations.locations.Location;
import jmri.jmrit.operations.locations.LocationManager;
import jmri.jmrit.operations.locations.Track;
import jmri.util.JUnitOperationsUtil;
import jmri.util.swing.JemmyUtil;
import org.junit.After;
import org.junit.Assert;
Expand Down Expand Up @@ -38,7 +39,7 @@ public void testCreateFile() {
ExportSchedules exportLoc = new ExportSchedules();
Assert.assertNotNull("exists", exportLoc);

loadLocations(); //only Test Loc E has a track
JUnitOperationsUtil.loadFiveLocations(); //only Test Loc E has a track

LocationManager lManager = InstanceManager.getDefault(LocationManager.class);
Location l1 = lManager.getLocationByName("Test Loc E");
Expand Down
3 changes: 2 additions & 1 deletion java/test/jmri/jmrit/operations/locations/schedules/ScheduleEditFrameGuiTest.java
View file
Expand Up @@ -8,6 +8,7 @@
import jmri.jmrit.operations.locations.Location;
import jmri.jmrit.operations.locations.LocationManager;
import jmri.jmrit.operations.locations.Track;
import jmri.util.JUnitOperationsUtil;
import jmri.util.JUnitUtil;
import jmri.util.swing.JemmyUtil;
import org.junit.After;
Expand Down Expand Up @@ -151,7 +152,7 @@ public void testScheduleComboBoxes() {
public void setUp() {
super.setUp();

loadLocations();
JUnitOperationsUtil.loadFiveLocations();
}

// The minimal setup for log4J
Expand Down
3 changes: 2 additions & 1 deletion java/test/jmri/jmrit/operations/locations/schedules/ScheduleGuiTests.java
View file
Expand Up @@ -5,6 +5,7 @@
import jmri.jmrit.operations.OperationsTestCase;
import jmri.jmrit.operations.locations.LocationManager;
import jmri.jmrit.operations.locations.Track;
import jmri.util.JUnitOperationsUtil;
import jmri.util.JUnitUtil;
import org.junit.After;
import org.junit.Assert;
Expand Down Expand Up @@ -72,7 +73,7 @@ public void testSchedulesTableFrame() {
public void setUp() {
super.setUp();

loadLocations();
JUnitOperationsUtil.loadFiveLocations();

}

Expand Down
3 changes: 2 additions & 1 deletion java/test/jmri/jmrit/operations/locations/tools/ExportLocationsTest.java
View file
Expand Up @@ -2,6 +2,7 @@

import java.awt.GraphicsEnvironment;
import jmri.jmrit.operations.OperationsTestCase;
import jmri.util.JUnitOperationsUtil;
import jmri.util.swing.JemmyUtil;
import org.junit.After;
import org.junit.Assert;
Expand All @@ -27,7 +28,7 @@ public void testCreateFile() {
ExportLocations exportLoc = new ExportLocations();
Assert.assertNotNull("exists", exportLoc);

loadLocations(); //only Test Loc E has a track
JUnitOperationsUtil.loadFiveLocations(); //only Test Loc E has a track

// should cause export complete dialog to appear
Thread export = new Thread(new Runnable() {
Expand Down
23 changes: 5 additions & 18 deletions java/test/jmri/jmrit/operations/routes/OperationsRoutesGuiTest.java
View file
Expand Up @@ -5,6 +5,7 @@
import jmri.InstanceManager;
import jmri.jmrit.operations.OperationsTestCase;
import jmri.jmrit.operations.locations.LocationManager;
import jmri.util.JUnitOperationsUtil;
import jmri.util.JUnitUtil;
import jmri.util.JmriJFrame;
import jmri.util.swing.JemmyUtil;
Expand All @@ -24,7 +25,7 @@ public class OperationsRoutesGuiTest extends OperationsTestCase {
@Test
public void testRoutesTableFrame() {
Assume.assumeFalse(GraphicsEnvironment.isHeadless());
loadRoutes();
JUnitOperationsUtil.loadFiveRoutes();

RoutesTableFrame f = new RoutesTableFrame();

Expand Down Expand Up @@ -63,7 +64,7 @@ public void testRouteEditFrame() {
f.commentTextField.setText("New Text Route Comment");
JemmyUtil.enterClickAndLeave(f.addRouteButton);

loadRoutes();
JUnitOperationsUtil.loadFiveRoutes();

RouteManager rManager = InstanceManager.getDefault(RouteManager.class);
Assert.assertEquals("should be 6 routes", 6, rManager.getRoutesByNameList().size());
Expand All @@ -72,7 +73,7 @@ public void testRouteEditFrame() {
Assert.assertEquals("route comment", "New Text Route Comment", newRoute.getComment());

// Add some locations to the route
loadLocations();
JUnitOperationsUtil.loadFiveLocations();
LocationManager lManager = InstanceManager.getDefault(LocationManager.class);
f.locationBox.setSelectedItem(lManager.getLocationByName("Test Loc B"));
//f.addLocationButton.doClick();
Expand Down Expand Up @@ -122,7 +123,7 @@ public void testRouteEditFrame() {
@Test
public void testRouteEditFrameRead() {
Assume.assumeFalse(GraphicsEnvironment.isHeadless());
loadRoutes();
JUnitOperationsUtil.loadFiveRoutes();
RouteManager lManager = InstanceManager.getDefault(RouteManager.class);
Route l2 = lManager.getRouteByName("Test Route C");

Expand All @@ -136,20 +137,6 @@ public void testRouteEditFrameRead() {
JUnitUtil.dispose(f);
}

private void loadRoutes() {
RouteManager rManager = InstanceManager.getDefault(RouteManager.class);
Route r1 = rManager.newRoute("Test Route E");
r1.setComment("Comment test route E");
Route r2 = rManager.newRoute("Test Route D");
r2.setComment("Comment test route D");
Route r3 = rManager.newRoute("Test Route C");
r3.setComment("Comment test route C");
Route r4 = rManager.newRoute("Test Route B");
r4.setComment("Comment test route B");
Route r5 = rManager.newRoute("Test Route A");
r5.setComment("Comment test route A");
}

@Override
@Before
public void setUp() {
Expand Down

0 comments on commit 85e3882

Please sign in to comment.