[Jmri-commits] test/jmri/jmrit/beantable LRouteTableActionTest.java, 1.1, 1.2

[Bob J. <jac...@us...>]

Update of /cvsroot/jmri/test/jmri/jmrit/beantable
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8876/test/jmri/jmrit/beantable

Modified Files:
	LRouteTableActionTest.java 
Log Message:
move to JFCUnit for Swing test

Index: LRouteTableActionTest.java
===================================================================
RCS file: /cvsroot/jmri/test/jmri/jmrit/beantable/LRouteTableActionTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LRouteTableActionTest.java	12 Apr 2009 21:37:51 -0000	1.1
--- LRouteTableActionTest.java	22 Apr 2009 02:33:26 -0000	1.2
***************
*** 6,9 ****
--- 6,11 ----
  import junit.framework.*;
  
+ import jmri.util.*;
+ 
  import java.util.ResourceBundle;
  
***************
*** 23,27 ****
   * @author	Pete Cressman  Copyright 2009
   */
! public class LRouteTableActionTest extends TestCase {
  
  	static final ResourceBundle rbx = ResourceBundle
--- 25,29 ----
   * @author	Pete Cressman  Copyright 2009
   */
! public class LRouteTableActionTest extends SwingTestCase {
  
  	static final ResourceBundle rbx = ResourceBundle
***************
*** 71,77 ****
          apps.tests.Log4JFixture.setUp(); 
          _lRouteTable = new LRouteTableAction("LRoute");
!         InstanceManager.setSensorManager(new InternalSensorManager());
!         InstanceManager.setTurnoutManager(new InternalTurnoutManager());
!         InstanceManager.setLightManager(new jmri.jmrix.cmri.serial.SerialLightManager());
          for (int i=1; i<20; i++)
          {
--- 73,81 ----
          apps.tests.Log4JFixture.setUp(); 
          _lRouteTable = new LRouteTableAction("LRoute");
!         JUnitUtil.resetInstanceManager();
!         JUnitUtil.initInternalTurnoutManager();
!         JUnitUtil.initInternalLightManager();
!         JUnitUtil.initInternalSensorManager();
!         
          for (int i=1; i<20; i++)
          {
***************
*** 80,84 ****
              Turnout t = InstanceManager.turnoutManagerInstance().newTurnout("IT"+i, "Turnout"+i);
              assertNotNull("Turnout is null!", t);
!             Light l = InstanceManager.lightManagerInstance().newLight("CL"+(i), "Light"+i);
              assertNotNull(i+"th Light is null!", l);
              Conditional c = InstanceManager.conditionalManagerInstance().createNewConditional(
--- 84,88 ----
              Turnout t = InstanceManager.turnoutManagerInstance().newTurnout("IT"+i, "Turnout"+i);
              assertNotNull("Turnout is null!", t);
!             Light l = InstanceManager.lightManagerInstance().newLight("IL"+(i), "Light"+i);
              assertNotNull(i+"th Light is null!", l);
              Conditional c = InstanceManager.conditionalManagerInstance().createNewConditional(