[Jmri-commits] test/jmri/jmrit/operations/routes OperationsRoutesGuiTest.java, 1.4, 1.5

[Dan B. <dan...@us...>]

Update of /cvsroot/jmri/test/jmri/jmrit/operations/routes
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27834/test/jmri/jmrit/operations/routes

Modified Files:
	OperationsRoutesGuiTest.java 
Log Message:
Reduce the number of operation frames during testing

Index: OperationsRoutesGuiTest.java
===================================================================
RCS file: /cvsroot/jmri/test/jmri/jmrit/operations/routes/OperationsRoutesGuiTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** OperationsRoutesGuiTest.java	14 Feb 2010 05:04:04 -0000	1.4
--- OperationsRoutesGuiTest.java	29 Mar 2010 05:02:55 -0000	1.5
***************
*** 9,12 ****
--- 9,13 ----
  import jmri.jmrit.operations.trains.TrainManagerXml;
  import jmri.jmrit.operations.locations.LocationManager;
+ import jmri.util.JmriJFrame;
  import junit.framework.Assert;
  import junit.framework.Test;
***************
*** 55,61 ****
  		//f.addButton.doClick();
  		getHelper().enterClickAndLeave( new MouseEventData( this, f.addButton ) );
! 		
  		// create edit route frame
  		f.routesModel.setValueAt(null, 2, RoutesTableModel.EDITCOLUMN);
  	}
  
--- 56,68 ----
  		//f.addButton.doClick();
  		getHelper().enterClickAndLeave( new MouseEventData( this, f.addButton ) );
! 	    // confirm panel creation
! 		JmriJFrame ref = JmriJFrame.getFrame("Add Route");
!         Assert.assertNotNull("route edit frame", ref);
! 
  		// create edit route frame
  		f.routesModel.setValueAt(null, 2, RoutesTableModel.EDITCOLUMN);
+ 		
+ 		ref.dispose();
+ 		f.dispose();
  	}
  
***************
*** 116,119 ****
--- 123,128 ----
  		getHelper().enterClickAndLeave( new MouseEventData( this, f.deleteRouteButton ) );
  		Assert.assertEquals("should be 5 routes", 5, rManager.getRoutesByNameList().size());
+ 		
+ 		f.dispose();
  	}
  	
***************
*** 128,131 ****
--- 137,142 ----
  		Assert.assertEquals("route name", "Test Route C", f.routeNameTextField.getText());
  		Assert.assertEquals("route comment", "Comment test route C", f.commentTextField.getText());
+ 		
+ 		f.dispose();
  	}