Menu
▾
▴
[Jmri-commits] test/jmri/jmrix/maple SerialAddressTest.java, 1.1, 1.2 SerialNodeTest.java, 1.1, 1.2 SerialSensorManagerTest.java, 1.1, 1.2 SerialTurnoutManagerTest.java, 1.1, 1.2 SerialTurnoutTest.java, 1.1, 1.2
Update of /cvsroot/jmri/test/jmri/jmrix/maple In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31176/java/test/jmri/jmrix/maple Modified Files: SerialAddressTest.java SerialNodeTest.java SerialSensorManagerTest.java SerialTurnoutManagerTest.java SerialTurnoutTest.java Log Message: switch to K system letter Index: SerialSensorManagerTest.java =================================================================== RCS file: /cvsroot/jmri/test/jmri/jmrix/maple/SerialSensorManagerTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SerialSensorManagerTest.java 29 Nov 2008 20:53:26 -0000 1.1 --- SerialSensorManagerTest.java 1 Dec 2008 19:47:03 -0000 1.2 *************** *** 42,46 **** Sensor sensor = s.provideSensor("3"); Assert.assertTrue("found sensor", sensor!=null); ! Assert.assertTrue("right name", sensor.getSystemName().equals("CS3")); Assert.assertTrue("UA 0", n0.sensorsActive() ); Assert.assertTrue("2nd none expected A1", !(n1.sensorsActive()) ); --- 42,46 ---- Sensor sensor = s.provideSensor("3"); Assert.assertTrue("found sensor", sensor!=null); ! Assert.assertTrue("right name", sensor.getSystemName().equals("KS3")); Assert.assertTrue("UA 0", n0.sensorsActive() ); Assert.assertTrue("2nd none expected A1", !(n1.sensorsActive()) ); *************** *** 51,55 **** s.provideSensor("19"); s.provideSensor("23"); ! s.provideSensor("CS2048"); Assert.assertTrue("2nd UA 0", n0.sensorsActive() ); Assert.assertTrue("3rd none expected UA 1", !(n1.sensorsActive()) ); --- 51,55 ---- s.provideSensor("19"); s.provideSensor("23"); ! s.provideSensor("KS2048"); Assert.assertTrue("2nd UA 0", n0.sensorsActive() ); Assert.assertTrue("3rd none expected UA 1", !(n1.sensorsActive()) ); Index: SerialNodeTest.java =================================================================== RCS file: /cvsroot/jmri/test/jmri/jmrix/maple/SerialNodeTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SerialNodeTest.java 29 Nov 2008 20:53:26 -0000 1.1 --- SerialNodeTest.java 1 Dec 2008 19:47:03 -0000 1.2 *************** *** 130,137 **** public void testMarkChangesInitial() { ! SerialSensor s1 = new SerialSensor("CS1","a"); ! Assert.assertEquals("check bit number",1,SerialAddress.getBitFromSystemName("CS1")); ! SerialSensor s2 = new SerialSensor("CS2","ab"); ! SerialSensor s3 = new SerialSensor("CS3","abc"); b.registerSensor(s1, 0); b.registerSensor(s2, 1); --- 130,137 ---- public void testMarkChangesInitial() { ! SerialSensor s1 = new SerialSensor("KS1","a"); ! Assert.assertEquals("check bit number",1,SerialAddress.getBitFromSystemName("KS1")); ! SerialSensor s2 = new SerialSensor("KS2","ab"); ! SerialSensor s3 = new SerialSensor("KS3","abc"); b.registerSensor(s1, 0); b.registerSensor(s2, 1); *************** *** 152,159 **** public void testMarkChangesDebounce() { ! SerialSensor s1 = new SerialSensor("CS1","a"); ! SerialSensor s2 = new SerialSensor("CS2","ab"); ! SerialSensor s3 = new SerialSensor("CS3","abc"); ! SerialSensor s4 = new SerialSensor("CS4","abcd"); b.registerSensor(s1, 0); b.registerSensor(s2, 1); --- 152,159 ---- public void testMarkChangesDebounce() { ! SerialSensor s1 = new SerialSensor("KS1","a"); ! SerialSensor s2 = new SerialSensor("KS2","ab"); ! SerialSensor s3 = new SerialSensor("KS3","abc"); ! SerialSensor s4 = new SerialSensor("KS4","abcd"); b.registerSensor(s1, 0); b.registerSensor(s2, 1); Index: SerialTurnoutManagerTest.java =================================================================== RCS file: /cvsroot/jmri/test/jmri/jmrix/maple/SerialTurnoutManagerTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SerialTurnoutManagerTest.java 29 Nov 2008 20:53:26 -0000 1.1 --- SerialTurnoutManagerTest.java 1 Dec 2008 19:47:03 -0000 1.2 *************** *** 34,43 **** public String getSystemName(int n) { ! return "CT"+n; } public void testAsAbstractFactory () { // ask for a Turnout, and check type ! Turnout o = l.newTurnout("CT21", "my name"); --- 34,43 ---- public String getSystemName(int n) { ! return "KT"+n; } public void testAsAbstractFactory () { // ask for a Turnout, and check type ! Turnout o = l.newTurnout("KT21", "my name"); *************** *** 46,53 **** // make sure loaded into tables ! if (log.isDebugEnabled()) log.debug("by system name: "+l.getBySystemName("CT21")); if (log.isDebugEnabled()) log.debug("by user name: "+l.getByUserName("my name")); ! assertTrue(null != l.getBySystemName("CT21")); assertTrue(null != l.getByUserName("my name")); --- 46,53 ---- // make sure loaded into tables ! if (log.isDebugEnabled()) log.debug("by system name: "+l.getBySystemName("KT21")); if (log.isDebugEnabled()) log.debug("by user name: "+l.getByUserName("my name")); ! assertTrue(null != l.getBySystemName("KT21")); assertTrue(null != l.getByUserName("my name")); Index: SerialTurnoutTest.java =================================================================== RCS file: /cvsroot/jmri/test/jmri/jmrix/maple/SerialTurnoutTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SerialTurnoutTest.java 29 Nov 2008 20:53:26 -0000 1.1 --- SerialTurnoutTest.java 1 Dec 2008 19:47:03 -0000 1.2 *************** *** 20,24 **** tcis = new SerialTrafficControlScaffold(); n = new SerialNode(0,SerialNode.SMINI); ! t = new SerialTurnout("CT4","t4"); } --- 20,24 ---- tcis = new SerialTrafficControlScaffold(); n = new SerialNode(0,SerialNode.SMINI); ! t = new SerialTurnout("KT4","t4"); } Index: SerialAddressTest.java =================================================================== RCS file: /cvsroot/jmri/test/jmri/jmrix/maple/SerialAddressTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SerialAddressTest.java 29 Nov 2008 20:53:26 -0000 1.1 --- SerialAddressTest.java 1 Dec 2008 19:47:03 -0000 1.2 *************** *** 41,118 **** public void testValidateSystemNameFormat() { ! Assert.assertTrue("valid format - CL2", SerialAddress.validSystemNameFormat("CL2",'L') ); ! Assert.assertTrue("valid format - CL0B2", SerialAddress.validSystemNameFormat("CL0B2",'L') ); ! Assert.assertTrue("invalid format - CL", !SerialAddress.validSystemNameFormat("CL",'L') ); ! JUnitAppender.assertErrorMessage("illegal character in number field of system name: CL"); ! Assert.assertTrue("invalid format - CLB2", !SerialAddress.validSystemNameFormat("CLB2",'L') ); ! JUnitAppender.assertErrorMessage("no node address before 'B' in system name: CLB2"); ! Assert.assertTrue("valid format - CL2005", SerialAddress.validSystemNameFormat("CL2005",'L') ); ! Assert.assertTrue("valid format - CL2B5", SerialAddress.validSystemNameFormat("CL2B5",'L') ); ! Assert.assertTrue("valid format - CT2005", SerialAddress.validSystemNameFormat("CT2005",'T') ); ! Assert.assertTrue("valid format - CT2B5", SerialAddress.validSystemNameFormat("CT2B5",'T') ); ! Assert.assertTrue("valid format - CS2005", SerialAddress.validSystemNameFormat("CS2005",'S') ); ! Assert.assertTrue("valid format - CS2B5", SerialAddress.validSystemNameFormat("CS2B5",'S') ); ! Assert.assertTrue("invalid format - CY2005", !SerialAddress.validSystemNameFormat("CY2005",'L') ); ! JUnitAppender.assertErrorMessage("illegal character in header field of system name: CY2005"); ! Assert.assertTrue("invalid format - CY2B5", !SerialAddress.validSystemNameFormat("CY2B5",'L') ); ! JUnitAppender.assertErrorMessage("illegal character in header field of system name: CY2B5"); ! Assert.assertTrue("valid format - CL22001", SerialAddress.validSystemNameFormat("CL22001",'L') ); ! Assert.assertTrue("valid format - CL22B1", SerialAddress.validSystemNameFormat("CL22B1",'L') ); ! Assert.assertTrue("invalid format - CL22000", !SerialAddress.validSystemNameFormat("CL22000",'L') ); ! JUnitAppender.assertErrorMessage("bit number not in range 1 - 999 in system name: CL22000"); ! Assert.assertTrue("invalid format - CL22B0", !SerialAddress.validSystemNameFormat("CL22B0",'L') ); ! JUnitAppender.assertErrorMessage("bit number field out of range in system name: CL22B0"); ! Assert.assertTrue("valid format - CL2999", SerialAddress.validSystemNameFormat("CL2999",'L') ); ! Assert.assertTrue("valid format - CL2B2048", SerialAddress.validSystemNameFormat("CL2B2048",'L') ); ! Assert.assertTrue("invalid format - CL2B2049", !SerialAddress.validSystemNameFormat("CL2B2049",'L') ); ! JUnitAppender.assertErrorMessage("bit number field out of range in system name: CL2B2049"); ! Assert.assertTrue("valid format - CL127999", SerialAddress.validSystemNameFormat("CL127999",'L') ); ! Assert.assertTrue("invalid format - CL128000", !SerialAddress.validSystemNameFormat("CL128000",'L') ); ! JUnitAppender.assertErrorMessage("number field out of range in system name: CL128000"); ! Assert.assertTrue("valid format - CL127B7", SerialAddress.validSystemNameFormat("CL127B7",'L') ); ! Assert.assertTrue("invalid format - CL128B7", !SerialAddress.validSystemNameFormat("CL128B7",'L') ); ! JUnitAppender.assertErrorMessage("node address field out of range in system name: CL128B7"); ! Assert.assertTrue("invalid format - CL2oo5", !SerialAddress.validSystemNameFormat("CL2oo5",'L') ); ! JUnitAppender.assertErrorMessage("illegal character in number field of system name: CL2oo5"); ! Assert.assertTrue("invalid format - CL2aB5", !SerialAddress.validSystemNameFormat("CL2aB5",'L') ); ! JUnitAppender.assertErrorMessage("illegal character in node address field of system name: CL2aB5"); ! Assert.assertTrue("invalid format - CL2B5x", !SerialAddress.validSystemNameFormat("CL2B5x",'L') ); ! JUnitAppender.assertErrorMessage("illegal character in bit number field of system name: CL2B5x"); } public void testGetBitFromSystemName() { ! Assert.assertEquals("CL2", 2, SerialAddress.getBitFromSystemName("CL2") ); ! Assert.assertEquals("CL2002", 2, SerialAddress.getBitFromSystemName("CL2002") ); ! Assert.assertEquals("CL1", 1, SerialAddress.getBitFromSystemName("CL1") ); ! Assert.assertEquals("CL2001", 1, SerialAddress.getBitFromSystemName("CL2001") ); ! Assert.assertEquals("CL999", 999, SerialAddress.getBitFromSystemName("CL999") ); ! Assert.assertEquals("CL2999", 999, SerialAddress.getBitFromSystemName("CL2999") ); ! Assert.assertEquals("CL29O9", 0, SerialAddress.getBitFromSystemName("CL29O9") ); ! JUnitAppender.assertErrorMessage("illegal character in number field of system name: CL29O9"); ! Assert.assertEquals("CL0B7", 7, SerialAddress.getBitFromSystemName("CL0B7") ); ! Assert.assertEquals("CL2B7", 7, SerialAddress.getBitFromSystemName("CL2B7") ); ! Assert.assertEquals("CL0B1", 1, SerialAddress.getBitFromSystemName("CL0B1") ); ! Assert.assertEquals("CL2B1", 1, SerialAddress.getBitFromSystemName("CL2B1") ); ! Assert.assertEquals("CL0B2048", 2048, SerialAddress.getBitFromSystemName("CL0B2048") ); ! Assert.assertEquals("CL11B2048", 2048, SerialAddress.getBitFromSystemName("CL11B2048") ); } --- 41,118 ---- public void testValidateSystemNameFormat() { ! Assert.assertTrue("valid format - KL2", SerialAddress.validSystemNameFormat("KL2",'L') ); ! Assert.assertTrue("valid format - KL0B2", SerialAddress.validSystemNameFormat("KL0B2",'L') ); ! Assert.assertTrue("invalid format - KL", !SerialAddress.validSystemNameFormat("KL",'L') ); ! JUnitAppender.assertErrorMessage("illegal character in number field of system name: KL"); ! Assert.assertTrue("invalid format - KLB2", !SerialAddress.validSystemNameFormat("KLB2",'L') ); ! JUnitAppender.assertErrorMessage("no node address before 'B' in system name: KLB2"); ! Assert.assertTrue("valid format - KL2005", SerialAddress.validSystemNameFormat("KL2005",'L') ); ! Assert.assertTrue("valid format - KL2B5", SerialAddress.validSystemNameFormat("KL2B5",'L') ); ! Assert.assertTrue("valid format - KT2005", SerialAddress.validSystemNameFormat("KT2005",'T') ); ! Assert.assertTrue("valid format - KT2B5", SerialAddress.validSystemNameFormat("KT2B5",'T') ); ! Assert.assertTrue("valid format - KS2005", SerialAddress.validSystemNameFormat("KS2005",'S') ); ! Assert.assertTrue("valid format - KS2B5", SerialAddress.validSystemNameFormat("KS2B5",'S') ); ! Assert.assertTrue("invalid format - KY2005", !SerialAddress.validSystemNameFormat("KY2005",'L') ); ! JUnitAppender.assertErrorMessage("illegal character in header field of system name: KY2005"); ! Assert.assertTrue("invalid format - KY2B5", !SerialAddress.validSystemNameFormat("KY2B5",'L') ); ! JUnitAppender.assertErrorMessage("illegal character in header field of system name: KY2B5"); ! Assert.assertTrue("valid format - KL22001", SerialAddress.validSystemNameFormat("KL22001",'L') ); ! Assert.assertTrue("valid format - KL22B1", SerialAddress.validSystemNameFormat("KL22B1",'L') ); ! Assert.assertTrue("invalid format - KL22000", !SerialAddress.validSystemNameFormat("KL22000",'L') ); ! JUnitAppender.assertErrorMessage("bit number not in range 1 - 999 in system name: KL22000"); ! Assert.assertTrue("invalid format - KL22B0", !SerialAddress.validSystemNameFormat("KL22B0",'L') ); ! JUnitAppender.assertErrorMessage("bit number field out of range in system name: KL22B0"); ! Assert.assertTrue("valid format - KL2999", SerialAddress.validSystemNameFormat("KL2999",'L') ); ! Assert.assertTrue("valid format - KL2B2048", SerialAddress.validSystemNameFormat("KL2B2048",'L') ); ! Assert.assertTrue("invalid format - KL2B2049", !SerialAddress.validSystemNameFormat("KL2B2049",'L') ); ! JUnitAppender.assertErrorMessage("bit number field out of range in system name: KL2B2049"); ! Assert.assertTrue("valid format - KL127999", SerialAddress.validSystemNameFormat("KL127999",'L') ); ! Assert.assertTrue("invalid format - KL128000", !SerialAddress.validSystemNameFormat("KL128000",'L') ); ! JUnitAppender.assertErrorMessage("number field out of range in system name: KL128000"); ! Assert.assertTrue("valid format - KL127B7", SerialAddress.validSystemNameFormat("KL127B7",'L') ); ! Assert.assertTrue("invalid format - KL128B7", !SerialAddress.validSystemNameFormat("KL128B7",'L') ); ! JUnitAppender.assertErrorMessage("node address field out of range in system name: KL128B7"); ! Assert.assertTrue("invalid format - KL2oo5", !SerialAddress.validSystemNameFormat("KL2oo5",'L') ); ! JUnitAppender.assertErrorMessage("illegal character in number field of system name: KL2oo5"); ! Assert.assertTrue("invalid format - KL2aB5", !SerialAddress.validSystemNameFormat("KL2aB5",'L') ); ! JUnitAppender.assertErrorMessage("illegal character in node address field of system name: KL2aB5"); ! Assert.assertTrue("invalid format - KL2B5x", !SerialAddress.validSystemNameFormat("KL2B5x",'L') ); ! JUnitAppender.assertErrorMessage("illegal character in bit number field of system name: KL2B5x"); } public void testGetBitFromSystemName() { ! Assert.assertEquals("KL2", 2, SerialAddress.getBitFromSystemName("KL2") ); ! Assert.assertEquals("KL2002", 2, SerialAddress.getBitFromSystemName("KL2002") ); ! Assert.assertEquals("KL1", 1, SerialAddress.getBitFromSystemName("KL1") ); ! Assert.assertEquals("KL2001", 1, SerialAddress.getBitFromSystemName("KL2001") ); ! Assert.assertEquals("KL999", 999, SerialAddress.getBitFromSystemName("KL999") ); ! Assert.assertEquals("KL2999", 999, SerialAddress.getBitFromSystemName("KL2999") ); ! Assert.assertEquals("KL29O9", 0, SerialAddress.getBitFromSystemName("KL29O9") ); ! JUnitAppender.assertErrorMessage("illegal character in number field of system name: KL29O9"); ! Assert.assertEquals("KL0B7", 7, SerialAddress.getBitFromSystemName("KL0B7") ); ! Assert.assertEquals("KL2B7", 7, SerialAddress.getBitFromSystemName("KL2B7") ); ! Assert.assertEquals("KL0B1", 1, SerialAddress.getBitFromSystemName("KL0B1") ); ! Assert.assertEquals("KL2B1", 1, SerialAddress.getBitFromSystemName("KL2B1") ); ! Assert.assertEquals("KL0B2048", 2048, SerialAddress.getBitFromSystemName("KL0B2048") ); ! Assert.assertEquals("KL11B2048", 2048, SerialAddress.getBitFromSystemName("KL11B2048") ); } *************** *** 125,151 **** SerialNode c = new SerialNode(17,SerialNode.SMINI); SerialNode b = new SerialNode(127,SerialNode.SMINI); ! Assert.assertEquals("node of CL14007", d, SerialAddress.getNodeFromSystemName("CL14007") ); ! Assert.assertEquals("node of CL14B7", d, SerialAddress.getNodeFromSystemName("CL14B7") ); ! Assert.assertEquals("node of CL127007", b, SerialAddress.getNodeFromSystemName("CL127007") ); ! Assert.assertEquals("node of CL127B7", b, SerialAddress.getNodeFromSystemName("CL127B7") ); ! Assert.assertEquals("node of CL17007", c, SerialAddress.getNodeFromSystemName("CL17007") ); ! Assert.assertEquals("node of CL17B7", c, SerialAddress.getNodeFromSystemName("CL17B7") ); ! Assert.assertEquals("node of CL11007", null, SerialAddress.getNodeFromSystemName("CL11007") ); ! Assert.assertEquals("node of CL11B7", null, SerialAddress.getNodeFromSystemName("CL11B7") ); } public void testGetNodeAddressFromSystemName() { ! Assert.assertEquals("CL14007", 14, SerialAddress.getNodeAddressFromSystemName("CL14007") ); ! Assert.assertEquals("CL14B7", 14, SerialAddress.getNodeAddressFromSystemName("CL14B7") ); ! Assert.assertEquals("CL127007", 127, SerialAddress.getNodeAddressFromSystemName("CL127007") ); ! Assert.assertEquals("CL127B7", 127, SerialAddress.getNodeAddressFromSystemName("CL127B7") ); ! Assert.assertEquals("CL0B7", 0, SerialAddress.getNodeAddressFromSystemName("CL0B7") ); ! Assert.assertEquals("CL7", 0, SerialAddress.getNodeAddressFromSystemName("CL7") ); ! Assert.assertEquals("CLB7", -1, SerialAddress.getNodeAddressFromSystemName("CLB7") ); ! JUnitAppender.assertErrorMessage("no node address before 'B' in system name: CLB7"); ! Assert.assertEquals("CR7", -1, SerialAddress.getNodeAddressFromSystemName("CR7") ); ! JUnitAppender.assertErrorMessage("illegal character in header field of system name: CR7"); } --- 125,151 ---- SerialNode c = new SerialNode(17,SerialNode.SMINI); SerialNode b = new SerialNode(127,SerialNode.SMINI); ! Assert.assertEquals("node of KL14007", d, SerialAddress.getNodeFromSystemName("KL14007") ); ! Assert.assertEquals("node of KL14B7", d, SerialAddress.getNodeFromSystemName("KL14B7") ); ! Assert.assertEquals("node of KL127007", b, SerialAddress.getNodeFromSystemName("KL127007") ); ! Assert.assertEquals("node of KL127B7", b, SerialAddress.getNodeFromSystemName("KL127B7") ); ! Assert.assertEquals("node of KL17007", c, SerialAddress.getNodeFromSystemName("KL17007") ); ! Assert.assertEquals("node of KL17B7", c, SerialAddress.getNodeFromSystemName("KL17B7") ); ! Assert.assertEquals("node of KL11007", null, SerialAddress.getNodeFromSystemName("KL11007") ); ! Assert.assertEquals("node of KL11B7", null, SerialAddress.getNodeFromSystemName("KL11B7") ); } public void testGetNodeAddressFromSystemName() { ! Assert.assertEquals("KL14007", 14, SerialAddress.getNodeAddressFromSystemName("KL14007") ); ! Assert.assertEquals("KL14B7", 14, SerialAddress.getNodeAddressFromSystemName("KL14B7") ); ! Assert.assertEquals("KL127007", 127, SerialAddress.getNodeAddressFromSystemName("KL127007") ); ! Assert.assertEquals("KL127B7", 127, SerialAddress.getNodeAddressFromSystemName("KL127B7") ); ! Assert.assertEquals("KL0B7", 0, SerialAddress.getNodeAddressFromSystemName("KL0B7") ); ! Assert.assertEquals("KL7", 0, SerialAddress.getNodeAddressFromSystemName("KL7") ); ! Assert.assertEquals("KLB7", -1, SerialAddress.getNodeAddressFromSystemName("KLB7") ); ! JUnitAppender.assertErrorMessage("no node address before 'B' in system name: KLB7"); ! Assert.assertEquals("KR7", -1, SerialAddress.getNodeAddressFromSystemName("KR7") ); ! JUnitAppender.assertErrorMessage("illegal character in header field of system name: KR7"); } *************** *** 160,216 **** d.setCardTypeByAddress (5,SerialNode.OUTPUT_CARD); SerialNode c = new SerialNode(10,SerialNode.SMINI); ! Assert.assertTrue("valid config CL4007", SerialAddress.validSystemNameConfig("CL4007",'L') ); ! Assert.assertTrue("valid config CL4B7", SerialAddress.validSystemNameConfig("CL4B7",'L') ); ! Assert.assertTrue("valid config CS10007", SerialAddress.validSystemNameConfig("CS10007",'S') ); ! Assert.assertTrue("valid config CS10B7", SerialAddress.validSystemNameConfig("CS10B7",'S') ); ! Assert.assertTrue("valid config CL10048", SerialAddress.validSystemNameConfig("CL10048",'L') ); ! Assert.assertTrue("valid config CL10B48", SerialAddress.validSystemNameConfig("CL10B48",'L') ); ! Assert.assertTrue("invalid config CL10049", !SerialAddress.validSystemNameConfig("CL10049",'L') ); ! Assert.assertTrue("invalid config CL10B49", !SerialAddress.validSystemNameConfig("CL10B49",'L') ); ! Assert.assertTrue("valid config CS10024", SerialAddress.validSystemNameConfig("CS10024",'S') ); ! Assert.assertTrue("valid config CS10B24", SerialAddress.validSystemNameConfig("CS10B24",'S') ); ! Assert.assertTrue("invalid config CS10025", !SerialAddress.validSystemNameConfig("CS10025",'S') ); ! Assert.assertTrue("invalid config CS10B25", !SerialAddress.validSystemNameConfig("CS10B25",'S') ); ! Assert.assertTrue("valid config CT4128", SerialAddress.validSystemNameConfig("CT4128",'T') ); ! Assert.assertTrue("valid config CT4B128", SerialAddress.validSystemNameConfig("CT4B128",'T') ); ! Assert.assertTrue("invalid config CT4129", !SerialAddress.validSystemNameConfig("CT4129",'T') ); ! Assert.assertTrue("invalid config CT4129", !SerialAddress.validSystemNameConfig("CT4B129",'T') ); ! Assert.assertTrue("valid config CS4064", SerialAddress.validSystemNameConfig("CS4064",'S') ); ! Assert.assertTrue("valid config CS4B64", SerialAddress.validSystemNameConfig("CS4B64",'S') ); ! Assert.assertTrue("invalid config CS4065", !SerialAddress.validSystemNameConfig("CS4065",'S') ); ! Assert.assertTrue("invalid config CS4B65", !SerialAddress.validSystemNameConfig("CS4B65",'S') ); ! Assert.assertTrue("invalid config CL11007", !SerialAddress.validSystemNameConfig("CL11007",'L') ); ! Assert.assertTrue("invalid config CL11B7", !SerialAddress.validSystemNameConfig("CL11B7",'L') ); } public void testConvertSystemNameFormat() { ! Assert.assertEquals("convert CL14007", "CL14B7", SerialAddress.convertSystemNameToAlternate("CL14007") ); ! Assert.assertEquals("convert CS7", "CS0B7", SerialAddress.convertSystemNameToAlternate("CS7") ); ! Assert.assertEquals("convert CT4007", "CT4B7", SerialAddress.convertSystemNameToAlternate("CT4007") ); ! Assert.assertEquals("convert CL14B7", "CL14007", SerialAddress.convertSystemNameToAlternate("CL14B7") ); ! Assert.assertEquals("convert CL0B7", "CL7", SerialAddress.convertSystemNameToAlternate("CL0B7") ); ! Assert.assertEquals("convert CS4B7", "CS4007", SerialAddress.convertSystemNameToAlternate("CS4B7") ); ! Assert.assertEquals("convert CL14B8", "CL14008", SerialAddress.convertSystemNameToAlternate("CL14B8") ); ! Assert.assertEquals("convert CL128B7", "", SerialAddress.convertSystemNameToAlternate("CL128B7") ); ! JUnitAppender.assertErrorMessage("node address field out of range in system name: CL128B7"); } public void testNormalizeSystemName() { ! Assert.assertEquals("normalize CL14007", "CL14007", SerialAddress.normalizeSystemName("CL14007") ); ! Assert.assertEquals("normalize CL007", "CL7", SerialAddress.normalizeSystemName("CL007") ); ! Assert.assertEquals("normalize CL004007", "CL4007", SerialAddress.normalizeSystemName("CL004007") ); ! Assert.assertEquals("normalize CL14B7", "CL14B7", SerialAddress.normalizeSystemName("CL14B7") ); ! Assert.assertEquals("normalize CL0B7", "CL0B7", SerialAddress.normalizeSystemName("CL0B7") ); ! Assert.assertEquals("normalize CL004B7", "CL4B7", SerialAddress.normalizeSystemName("CL004B7") ); ! Assert.assertEquals("normalize CL014B0008", "CL14B8", SerialAddress.normalizeSystemName("CL014B0008") ); ! Assert.assertEquals("normalize CL128B7", "", SerialAddress.normalizeSystemName("CL128B7") ); ! JUnitAppender.assertErrorMessage("node address field out of range in system name: CL128B7"); } public void testConstructSystemName() { ! Assert.assertEquals("make CL14007", "CL14007", SerialAddress.makeSystemName("L",14,7) ); ! Assert.assertEquals("make CT7", "CT7", SerialAddress.makeSystemName("T",0,7) ); Assert.assertEquals("make illegal 1", "", SerialAddress.makeSystemName("L",0,0) ); --- 160,216 ---- d.setCardTypeByAddress (5,SerialNode.OUTPUT_CARD); SerialNode c = new SerialNode(10,SerialNode.SMINI); ! Assert.assertTrue("valid config KL4007", SerialAddress.validSystemNameConfig("KL4007",'L') ); ! Assert.assertTrue("valid config KL4B7", SerialAddress.validSystemNameConfig("KL4B7",'L') ); ! Assert.assertTrue("valid config KS10007", SerialAddress.validSystemNameConfig("KS10007",'S') ); ! Assert.assertTrue("valid config KS10B7", SerialAddress.validSystemNameConfig("KS10B7",'S') ); ! Assert.assertTrue("valid config KL10048", SerialAddress.validSystemNameConfig("KL10048",'L') ); ! Assert.assertTrue("valid config KL10B48", SerialAddress.validSystemNameConfig("KL10B48",'L') ); ! Assert.assertTrue("invalid config KL10049", !SerialAddress.validSystemNameConfig("KL10049",'L') ); ! Assert.assertTrue("invalid config KL10B49", !SerialAddress.validSystemNameConfig("KL10B49",'L') ); ! Assert.assertTrue("valid config KS10024", SerialAddress.validSystemNameConfig("KS10024",'S') ); ! Assert.assertTrue("valid config KS10B24", SerialAddress.validSystemNameConfig("KS10B24",'S') ); ! Assert.assertTrue("invalid config KS10025", !SerialAddress.validSystemNameConfig("KS10025",'S') ); ! Assert.assertTrue("invalid config KS10B25", !SerialAddress.validSystemNameConfig("KS10B25",'S') ); ! Assert.assertTrue("valid config KT4128", SerialAddress.validSystemNameConfig("KT4128",'T') ); ! Assert.assertTrue("valid config KT4B128", SerialAddress.validSystemNameConfig("KT4B128",'T') ); ! Assert.assertTrue("invalid config KT4129", !SerialAddress.validSystemNameConfig("KT4129",'T') ); ! Assert.assertTrue("invalid config KT4129", !SerialAddress.validSystemNameConfig("KT4B129",'T') ); ! Assert.assertTrue("valid config KS4064", SerialAddress.validSystemNameConfig("KS4064",'S') ); ! Assert.assertTrue("valid config KS4B64", SerialAddress.validSystemNameConfig("KS4B64",'S') ); ! Assert.assertTrue("invalid config KS4065", !SerialAddress.validSystemNameConfig("KS4065",'S') ); ! Assert.assertTrue("invalid config KS4B65", !SerialAddress.validSystemNameConfig("KS4B65",'S') ); ! Assert.assertTrue("invalid config KL11007", !SerialAddress.validSystemNameConfig("KL11007",'L') ); ! Assert.assertTrue("invalid config KL11B7", !SerialAddress.validSystemNameConfig("KL11B7",'L') ); } public void testConvertSystemNameFormat() { ! Assert.assertEquals("convert KL14007", "KL14B7", SerialAddress.convertSystemNameToAlternate("KL14007") ); ! Assert.assertEquals("convert KS7", "KS0B7", SerialAddress.convertSystemNameToAlternate("KS7") ); ! Assert.assertEquals("convert KT4007", "KT4B7", SerialAddress.convertSystemNameToAlternate("KT4007") ); ! Assert.assertEquals("convert KL14B7", "KL14007", SerialAddress.convertSystemNameToAlternate("KL14B7") ); ! Assert.assertEquals("convert KL0B7", "KL7", SerialAddress.convertSystemNameToAlternate("KL0B7") ); ! Assert.assertEquals("convert KS4B7", "KS4007", SerialAddress.convertSystemNameToAlternate("KS4B7") ); ! Assert.assertEquals("convert KL14B8", "KL14008", SerialAddress.convertSystemNameToAlternate("KL14B8") ); ! Assert.assertEquals("convert KL128B7", "", SerialAddress.convertSystemNameToAlternate("KL128B7") ); ! JUnitAppender.assertErrorMessage("node address field out of range in system name: KL128B7"); } public void testNormalizeSystemName() { ! Assert.assertEquals("normalize KL14007", "KL14007", SerialAddress.normalizeSystemName("KL14007") ); ! Assert.assertEquals("normalize KL007", "KL7", SerialAddress.normalizeSystemName("KL007") ); ! Assert.assertEquals("normalize KL004007", "KL4007", SerialAddress.normalizeSystemName("KL004007") ); ! Assert.assertEquals("normalize KL14B7", "KL14B7", SerialAddress.normalizeSystemName("KL14B7") ); ! Assert.assertEquals("normalize KL0B7", "KL0B7", SerialAddress.normalizeSystemName("KL0B7") ); ! Assert.assertEquals("normalize KL004B7", "KL4B7", SerialAddress.normalizeSystemName("KL004B7") ); ! Assert.assertEquals("normalize KL014B0008", "KL14B8", SerialAddress.normalizeSystemName("KL014B0008") ); ! Assert.assertEquals("normalize KL128B7", "", SerialAddress.normalizeSystemName("KL128B7") ); ! JUnitAppender.assertErrorMessage("node address field out of range in system name: KL128B7"); } public void testConstructSystemName() { ! Assert.assertEquals("make KL14007", "KL14007", SerialAddress.makeSystemName("L",14,7) ); ! Assert.assertEquals("make KT7", "KT7", SerialAddress.makeSystemName("T",0,7) ); Assert.assertEquals("make illegal 1", "", SerialAddress.makeSystemName("L",0,0) ); *************** *** 223,229 **** JUnitAppender.assertErrorMessage("illegal type character proposed for system name"); ! Assert.assertEquals("make CL0B1770", "CL0B1770", SerialAddress.makeSystemName("L",0,1770) ); ! Assert.assertEquals("make CS127999", "CS127999", SerialAddress.makeSystemName("S",127,999) ); ! Assert.assertEquals("make CS14B1000", "CS14B1000", SerialAddress.makeSystemName("S",14,1000) ); } --- 223,229 ---- JUnitAppender.assertErrorMessage("illegal type character proposed for system name"); ! Assert.assertEquals("make KL0B1770", "KL0B1770", SerialAddress.makeSystemName("L",0,1770) ); ! Assert.assertEquals("make KS127999", "KS127999", SerialAddress.makeSystemName("S",127,999) ); ! Assert.assertEquals("make KS14B1000", "KS14B1000", SerialAddress.makeSystemName("S",14,1000) ); } *************** *** 233,260 **** // create a new turnout, controlled by two output bits jmri.TurnoutManager tMgr = jmri.InstanceManager.turnoutManagerInstance(); ! jmri.Turnout t1 = tMgr.newTurnout("CT18034","userT34"); t1.setNumberOutputBits(2); // check that turnout was created correctly ! Assert.assertEquals("create CT18034 check 1", "CT18034", t1.getSystemName() ); ! Assert.assertEquals("create CT18034 check 2", 2, t1.getNumberOutputBits() ); // create a new turnout, controlled by one output bit ! jmri.Turnout t2 = tMgr.newTurnout("CT18032","userT32"); // check that turnout was created correctly ! Assert.assertEquals("create CT18032 check 1", "CT18032", t2.getSystemName() ); ! Assert.assertEquals("create CT18032 check 2", 1, t2.getNumberOutputBits() ); // create two new lights jmri.LightManager lMgr = jmri.InstanceManager.lightManagerInstance(); ! jmri.Light lgt1 = lMgr.newLight("CL18036","userL36"); ! jmri.Light lgt2 = lMgr.newLight("CL18037","userL37"); // check that the lights were created as expected ! Assert.assertEquals("create CL18036 check", "CL18036", lgt1.getSystemName() ); ! Assert.assertEquals("create CL18037 check", "CL18037", lgt2.getSystemName() ); // test Assert.assertEquals("test bit 30", "", SerialAddress.isOutputBitFree(18,30) ); ! Assert.assertEquals("test bit 34", "CT18034", SerialAddress.isOutputBitFree(18,34) ); Assert.assertEquals("test bit 33", "", SerialAddress.isOutputBitFree(18,33) ); ! Assert.assertEquals("test bit 35", "CT18034", SerialAddress.isOutputBitFree(18,35) ); ! Assert.assertEquals("test bit 36", "CL18036", SerialAddress.isOutputBitFree(18,36) ); ! Assert.assertEquals("test bit 37", "CL18037", SerialAddress.isOutputBitFree(18,37) ); Assert.assertEquals("test bit 38", "", SerialAddress.isOutputBitFree(18,38) ); Assert.assertEquals("test bit 39", "", SerialAddress.isOutputBitFree(18,39) ); --- 233,260 ---- // create a new turnout, controlled by two output bits jmri.TurnoutManager tMgr = jmri.InstanceManager.turnoutManagerInstance(); ! jmri.Turnout t1 = tMgr.newTurnout("KT18034","userT34"); t1.setNumberOutputBits(2); // check that turnout was created correctly ! Assert.assertEquals("create KT18034 check 1", "KT18034", t1.getSystemName() ); ! Assert.assertEquals("create KT18034 check 2", 2, t1.getNumberOutputBits() ); // create a new turnout, controlled by one output bit ! jmri.Turnout t2 = tMgr.newTurnout("KT18032","userT32"); // check that turnout was created correctly ! Assert.assertEquals("create KT18032 check 1", "KT18032", t2.getSystemName() ); ! Assert.assertEquals("create KT18032 check 2", 1, t2.getNumberOutputBits() ); // create two new lights jmri.LightManager lMgr = jmri.InstanceManager.lightManagerInstance(); ! jmri.Light lgt1 = lMgr.newLight("KL18036","userL36"); ! jmri.Light lgt2 = lMgr.newLight("KL18037","userL37"); // check that the lights were created as expected ! Assert.assertEquals("create KL18036 check", "KL18036", lgt1.getSystemName() ); ! Assert.assertEquals("create KL18037 check", "KL18037", lgt2.getSystemName() ); // test Assert.assertEquals("test bit 30", "", SerialAddress.isOutputBitFree(18,30) ); ! Assert.assertEquals("test bit 34", "KT18034", SerialAddress.isOutputBitFree(18,34) ); Assert.assertEquals("test bit 33", "", SerialAddress.isOutputBitFree(18,33) ); ! Assert.assertEquals("test bit 35", "KT18034", SerialAddress.isOutputBitFree(18,35) ); ! Assert.assertEquals("test bit 36", "KL18036", SerialAddress.isOutputBitFree(18,36) ); ! Assert.assertEquals("test bit 37", "KL18037", SerialAddress.isOutputBitFree(18,37) ); Assert.assertEquals("test bit 38", "", SerialAddress.isOutputBitFree(18,38) ); Assert.assertEquals("test bit 39", "", SerialAddress.isOutputBitFree(18,39) ); *************** *** 262,269 **** Assert.assertEquals("test bit bad bit", "", SerialAddress.isOutputBitFree(18,0) ); ! JUnitAppender.assertWarnMessage("Turnout 'CT18034' refers to an undefined Serial Node."); ! JUnitAppender.assertWarnMessage("Turnout 'CT18032' refers to an undefined Serial Node."); ! JUnitAppender.assertWarnMessage("Light system Name does not refer to configured hardware: CL18036"); ! JUnitAppender.assertWarnMessage("Light system Name does not refer to configured hardware: CL18037"); JUnitAppender.assertErrorMessage("illegal bit number in free bit test"); --- 262,269 ---- Assert.assertEquals("test bit bad bit", "", SerialAddress.isOutputBitFree(18,0) ); ! JUnitAppender.assertWarnMessage("Turnout 'KT18034' refers to an undefined Serial Node."); ! JUnitAppender.assertWarnMessage("Turnout 'KT18032' refers to an undefined Serial Node."); ! JUnitAppender.assertWarnMessage("Light system Name does not refer to configured hardware: KL18036"); ! JUnitAppender.assertWarnMessage("Light system Name does not refer to configured hardware: KL18037"); JUnitAppender.assertErrorMessage("illegal bit number in free bit test"); *************** *** 275,303 **** jmri.SensorManager sMgr = jmri.InstanceManager.sensorManagerInstance(); // create 4 new sensors ! jmri.Sensor s1 = sMgr.newSensor("CS18016","userS16"); ! jmri.Sensor s2 = sMgr.newSensor("CS18014","userS14"); ! jmri.Sensor s3 = sMgr.newSensor("CS18017","userS17"); ! jmri.Sensor s4 = sMgr.newSensor("CS18012","userS12"); // check that the sensors were created as expected ! Assert.assertEquals("create CS18016 check", "CS18016", s1.getSystemName() ); ! Assert.assertEquals("create CS18014 check", "CS18014", s2.getSystemName() ); ! Assert.assertEquals("create CS18017 check", "CS18017", s3.getSystemName() ); ! Assert.assertEquals("create CS18012 check", "CS18012", s4.getSystemName() ); // test Assert.assertEquals("test bit 10", "", SerialAddress.isInputBitFree(18,10) ); Assert.assertEquals("test bit 11", "", SerialAddress.isInputBitFree(18,11) ); ! Assert.assertEquals("test bit 12", "CS18012", SerialAddress.isInputBitFree(18,12) ); Assert.assertEquals("test bit 13", "", SerialAddress.isInputBitFree(18,13) ); ! Assert.assertEquals("test bit 14", "CS18014", SerialAddress.isInputBitFree(18,14) ); Assert.assertEquals("test bit 15", "", SerialAddress.isInputBitFree(18,15) ); ! Assert.assertEquals("test bit 16", "CS18016", SerialAddress.isInputBitFree(18,16) ); ! Assert.assertEquals("test bit 17", "CS18017", SerialAddress.isInputBitFree(18,17) ); Assert.assertEquals("test bit 18", "", SerialAddress.isInputBitFree(18,18) ); Assert.assertEquals("test bit bad bit", "", SerialAddress.isInputBitFree(18,0) ); ! JUnitAppender.assertWarnMessage("Sensor CS18016 refers to an undefined Serial Node."); ! JUnitAppender.assertWarnMessage("Sensor CS18014 refers to an undefined Serial Node."); ! JUnitAppender.assertWarnMessage("Sensor CS18017 refers to an undefined Serial Node."); ! JUnitAppender.assertWarnMessage("Sensor CS18012 refers to an undefined Serial Node."); JUnitAppender.assertErrorMessage("illegal bit number in free bit test"); --- 275,303 ---- jmri.SensorManager sMgr = jmri.InstanceManager.sensorManagerInstance(); // create 4 new sensors ! jmri.Sensor s1 = sMgr.newSensor("KS18016","userS16"); ! jmri.Sensor s2 = sMgr.newSensor("KS18014","userS14"); ! jmri.Sensor s3 = sMgr.newSensor("KS18017","userS17"); ! jmri.Sensor s4 = sMgr.newSensor("KS18012","userS12"); // check that the sensors were created as expected ! Assert.assertEquals("create KS18016 check", "KS18016", s1.getSystemName() ); ! Assert.assertEquals("create KS18014 check", "KS18014", s2.getSystemName() ); ! Assert.assertEquals("create KS18017 check", "KS18017", s3.getSystemName() ); ! Assert.assertEquals("create KS18012 check", "KS18012", s4.getSystemName() ); // test Assert.assertEquals("test bit 10", "", SerialAddress.isInputBitFree(18,10) ); Assert.assertEquals("test bit 11", "", SerialAddress.isInputBitFree(18,11) ); ! Assert.assertEquals("test bit 12", "KS18012", SerialAddress.isInputBitFree(18,12) ); Assert.assertEquals("test bit 13", "", SerialAddress.isInputBitFree(18,13) ); ! Assert.assertEquals("test bit 14", "KS18014", SerialAddress.isInputBitFree(18,14) ); Assert.assertEquals("test bit 15", "", SerialAddress.isInputBitFree(18,15) ); ! Assert.assertEquals("test bit 16", "KS18016", SerialAddress.isInputBitFree(18,16) ); ! Assert.assertEquals("test bit 17", "KS18017", SerialAddress.isInputBitFree(18,17) ); Assert.assertEquals("test bit 18", "", SerialAddress.isInputBitFree(18,18) ); Assert.assertEquals("test bit bad bit", "", SerialAddress.isInputBitFree(18,0) ); ! JUnitAppender.assertWarnMessage("Sensor KS18016 refers to an undefined Serial Node."); ! JUnitAppender.assertWarnMessage("Sensor KS18014 refers to an undefined Serial Node."); ! JUnitAppender.assertWarnMessage("Sensor KS18017 refers to an undefined Serial Node."); ! JUnitAppender.assertWarnMessage("Sensor KS18012 refers to an undefined Serial Node."); JUnitAppender.assertErrorMessage("illegal bit number in free bit test"); *************** *** 307,320 **** public void testGetUserNameFromSystemName() { ! Assert.assertEquals("test CS18016", "userS16", SerialAddress.getUserNameFromSystemName("CS18016") ); ! Assert.assertEquals("test CS18012", "userS12", SerialAddress.getUserNameFromSystemName("CS18012") ); ! Assert.assertEquals("test CS18017", "userS17", SerialAddress.getUserNameFromSystemName("CS18017") ); ! Assert.assertEquals("test undefined CS18010", "", SerialAddress.getUserNameFromSystemName("CS18010") ); ! Assert.assertEquals("test CL18037", "userL37", SerialAddress.getUserNameFromSystemName("CL18037") ); ! Assert.assertEquals("test CL18036", "userL36", SerialAddress.getUserNameFromSystemName("CL18036") ); ! Assert.assertEquals("test undefined CL18030", "", SerialAddress.getUserNameFromSystemName("CL18030") ); ! Assert.assertEquals("test CT18032", "userT32", SerialAddress.getUserNameFromSystemName("CT18032") ); ! Assert.assertEquals("test CT18034", "userT34", SerialAddress.getUserNameFromSystemName("CT18034") ); ! Assert.assertEquals("test undefined CT18039", "", SerialAddress.getUserNameFromSystemName("CT18039") ); } --- 307,320 ---- public void testGetUserNameFromSystemName() { ! Assert.assertEquals("test KS18016", "userS16", SerialAddress.getUserNameFromSystemName("KS18016") ); ! Assert.assertEquals("test KS18012", "userS12", SerialAddress.getUserNameFromSystemName("KS18012") ); ! Assert.assertEquals("test KS18017", "userS17", SerialAddress.getUserNameFromSystemName("KS18017") ); ! Assert.assertEquals("test undefined KS18010", "", SerialAddress.getUserNameFromSystemName("KS18010") ); ! Assert.assertEquals("test KL18037", "userL37", SerialAddress.getUserNameFromSystemName("KL18037") ); ! Assert.assertEquals("test KL18036", "userL36", SerialAddress.getUserNameFromSystemName("KL18036") ); ! Assert.assertEquals("test undefined KL18030", "", SerialAddress.getUserNameFromSystemName("KL18030") ); ! Assert.assertEquals("test KT18032", "userT32", SerialAddress.getUserNameFromSystemName("KT18032") ); ! Assert.assertEquals("test KT18034", "userT34", SerialAddress.getUserNameFromSystemName("KT18034") ); ! Assert.assertEquals("test undefined KT18039", "", SerialAddress.getUserNameFromSystemName("KT18039") ); } |