[Jmri-commits] test/jmri/jmrit/operations/locations OperationsLocationsTest.java, 1.28, 1.29

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

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

Modified Files:
	OperationsLocationsTest.java 
Log Message:
Use schedule id instead of schedule name when assigning a schedule to a track.  This allows a user to rename a schedule without having to update their sidings.

Index: OperationsLocationsTest.java
===================================================================
RCS file: /cvsroot/jmri/test/jmri/jmrit/operations/locations/OperationsLocationsTest.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** OperationsLocationsTest.java	12 Jan 2011 18:59:41 -0000	1.28
--- OperationsLocationsTest.java	20 Jan 2011 04:49:30 -0000	1.29
***************
*** 221,225 ****
  		
  		// now add a schedule to siding
! 		t.setScheduleName("new schedule");
  		
  		JComboBox box3 = sm.getSidingsByScheduleComboBox(s1);
--- 221,225 ----
  		
  		// now add a schedule to siding
! 		t.setScheduleId(sch1.getId());
  		
  		JComboBox box3 = sm.getSidingsByScheduleComboBox(s1);
***************
*** 639,644 ****
  		Assert.assertEquals("Location", l, t.getLocation());
  
! 		t.setScheduleName("Test Schedule Name");
! 		Assert.assertEquals("Location Track set Schedule Name", "Test Schedule Name", t.getScheduleName());
  		t.setScheduleItemId("Test Schedule Item Id");
  		Assert.assertEquals("Location Track set Schedule Item Id", "Test Schedule Item Id", t.getScheduleItemId());
--- 639,644 ----
  		Assert.assertEquals("Location", l, t.getLocation());
  
! 		t.setScheduleId("Test Schedule Id");
! 		Assert.assertEquals("Location Track set Schedule Name", "Test Schedule Id", t.getScheduleId());
  		t.setScheduleItemId("Test Schedule Item Id");
  		Assert.assertEquals("Location Track set Schedule Item Id", "Test Schedule Item Id", t.getScheduleItemId());
***************
*** 1069,1074 ****
  		
  		// tracks with schedules get priority
! 		
! 		t3.setScheduleName("dummy schedule");
  		
  		// get all tracks ids
--- 1069,1074 ----
  		
  		// tracks with schedules get priority
! 		Schedule sch = ScheduleManager.instance().newSchedule("dummy schedule");
! 		t3.setScheduleId(sch.getId());
  		
  		// get all tracks ids
***************
*** 1085,1089 ****
  		
  		// t4 has less moves than t3 so it will move up in priority
! 		t4.setScheduleName("dummy schedule");
  		
  		// get all tracks ids
--- 1085,1089 ----
  		
  		// t4 has less moves than t3 so it will move up in priority
! 		t4.setScheduleId(sch.getId());
  		
  		// get all tracks ids
***************
*** 1099,1102 ****
--- 1099,1105 ----
  		Assert.assertEquals("7th track", t6 ,l.getTrackById(tracks.get(6)));
  		
+ 		// remove dummy schedule
+ 		ScheduleManager.instance().deregister(sch);
+ 		
  	}