[Jmri-commits] test/jmri/jmrit/roster RosterEntryPaneTest.java,1.5,1.6 RosterTest.java,1.12,1.13

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

Update of /cvsroot/jmri/test/jmri/jmrit/roster
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29997

Modified Files:
	RosterEntryPaneTest.java RosterTest.java 
Log Message:
changes for use of LocoSel, etc. More tests

Index: RosterEntryPaneTest.java
===================================================================
RCS file: /cvsroot/jmri/test/jmri/jmrit/roster/RosterEntryPaneTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RosterEntryPaneTest.java	29 Aug 2003 16:57:35 -0000	1.5
--- RosterEntryPaneTest.java	30 Jul 2005 16:40:52 -0000	1.6
***************
*** 11,20 ****
  
      // statics for test objects
!     org.jdom.Element e = null;
!     RosterEntry r = null;
  
      public void setUp() {
          // create Element
!         e = new org.jdom.Element("locomotive")
              .addAttribute("id","id info")
              .addAttribute("fileName","file here")
--- 11,22 ----
  
      // statics for test objects
!     org.jdom.Element eOld = null;
!     org.jdom.Element eNew = null;
!     RosterEntry rOld = null;
!     RosterEntry rNew = null;
  
      public void setUp() {
          // create Element
!         eOld = new org.jdom.Element("locomotive")
              .addAttribute("id","id info")
              .addAttribute("fileName","file here")
***************
*** 29,45 ****
              ; // end create element
  
!         r = new RosterEntry(e);
      }
  
      public void testCreate() {
!         RosterEntryPane p = new RosterEntryPane(r);
          // check for field text contents
!         Assert.assertEquals("file name ", "file here", p.filename.getText());
!         Assert.assertEquals("DCC Address ", "1234", p.dccAddress.getText());
!         Assert.assertEquals("road name ", "SP", p.roadName.getText());
!         Assert.assertEquals("road number ", "431", p.roadNumber.getText());
!         Assert.assertEquals("manufacturer ", "Athearn", p.mfg.getText());
!         Assert.assertEquals("model ", "33",p.decoderModel.getText());
!         Assert.assertEquals("family ", "91", p.decoderFamily.getText());
  
      }
--- 31,145 ----
              ; // end create element
  
!         rOld = new RosterEntry(eOld);
!         
!         eNew = new org.jdom.Element("locomotive")
!             .addAttribute("id","id info")
!             .addAttribute("fileName","file here")
!             .addAttribute("roadNumber","431")
!             .addAttribute("roadName","SP")
!             .addAttribute("mfg","Athearn")
!             .addContent(new org.jdom.Element("decoder")
!                         .addAttribute("family","91")
!                         .addAttribute("model","33")
!                         )
!             .addContent(new org.jdom.Element("locoaddress")
!                 .addContent(new org.jdom.Element("dcclocoaddress")
!                         .addAttribute("number","12")
!                         .addAttribute("longaddress","yes")
!                         )
!                 )
!             ; // end create element
! 
!         rNew = new RosterEntry(eNew);
      }
  
      public void testCreate() {
!         RosterEntryPane p = new RosterEntryPane(rOld);
!         
!         // copy to a new entry
!         
!         RosterEntry n = new RosterEntry();
!         p.update(n);
!         
          // check for field text contents
!         Assert.assertEquals("file name in pane", "file here", p.filename.getText());
!         Assert.assertEquals("file name returned", null, n.getFileName());
!         Assert.assertEquals("DCC Address ", "1234", n.getDccAddress());
!         Assert.assertEquals("road name ", "SP", n.getRoadName());
!         Assert.assertEquals("road number ", "431", n.getRoadNumber());
!         Assert.assertEquals("manufacturer ", "Athearn", n.getMfg());
!         Assert.assertEquals("model ", "33",n.getDecoderModel());
!         Assert.assertEquals("family ", "91", n.getDecoderFamily());
! 
!     }
! 
!     public void testGuiChanged1() {
!         RosterEntryPane p = new RosterEntryPane(rOld);
!         
!         // copy to a new entry
!                 
!         // check for unchanged
!         Assert.assertTrue("initially unchanged", !p.guiChanged(rOld));
!         
!         // change the roster road name entry and check
!         rOld.setRoadName("changed value");
!         Assert.assertTrue("detects change", p.guiChanged(rOld));
! 
!     }
! 
!     public void testGuiChanged2() {
!         RosterEntryPane p = new RosterEntryPane(rOld);
!         
!         // copy to a new entry
!                 
!         // check for unchanged
!         Assert.assertTrue("initially unchanged", !p.guiChanged(rOld));
!         
!         // change the roster road name entry and check
!         rOld.setDccAddress("4321");
!         Assert.assertTrue("detects change", p.guiChanged(rOld));
! 
!     }
! 
!     public void testGuiChanged3() {
!         RosterEntryPane p = new RosterEntryPane(rNew);
!         
!         // copy to a new entry
!                 
!         // check for unchanged
!         Assert.assertTrue("initially unchanged", !p.guiChanged(rNew));
!         
!         // change the roster address type entry and check
!         rNew.setDccAddress("1234");
!         Assert.assertTrue("detects no change", !p.guiChanged(rNew));
! 
!     }
! 
!     public void testGuiChanged4() {
!         RosterEntryPane p = new RosterEntryPane(rNew);
!         
!         // copy to a new entry
!                 
!         // check for unchanged
!         Assert.assertTrue("initially unchanged", !p.guiChanged(rNew));
!         
!         // change the roster address type entry and check
!         rNew.setDccAddress("4321");
!         Assert.assertTrue("detects change", p.guiChanged(rNew));
! 
!     }
! 
!     public void testGuiChanged5() {
!         RosterEntryPane p = new RosterEntryPane(rNew);
!         
!         // copy to a new entry
!                 
!         // check for unchanged
!         Assert.assertTrue("initially unchanged", !p.guiChanged(rNew));
!         
!         // change the roster address type entry and check
!         rNew.setDccAddress("12");
!         p.setDccAddressLong(false);
!         Assert.assertTrue("detects change", p.guiChanged(rNew));
  
      }

Index: RosterTest.java
===================================================================
RCS file: /cvsroot/jmri/test/jmri/jmrit/roster/RosterTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** RosterTest.java	2 Dec 2003 15:23:15 -0000	1.12
--- RosterTest.java	30 Jul 2005 16:40:52 -0000	1.13
***************
*** 131,134 ****
--- 131,135 ----
          e = new RosterEntry("file name Bob");
          e.setId("Bob");
+         e.setDccAddress("123");
          e.setRoadNumber("123");
          e.setRoadName("SP");
***************
*** 137,140 ****
--- 138,142 ----
          e = new RosterEntry("file name Bill");
          e.setId("Bill");
+         e.setDccAddress("456");
          e.setRoadNumber("123");
          e.setRoadName("ATSF");