Skip to content

Commit

Permalink
Merge pull request #5843 from danielb987/increase_coverage_4
Browse files Browse the repository at this point in the history 
Add tests to ConditionalVariableTest
  • Loading branch information
@bobjacobsen
bobjacobsen committed Sep 21, 2018
2 parents bcf4db5 + 3863c9d commit f40bd29
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
1 change: 1 addition & 0 deletions java/src/jmri/jmrit/conditional/ConditionalBundle.properties
View file
Expand Up @@ -365,6 +365,7 @@ AudioSourceFadeIn = Fade-in
AudioSourceFadeOut = Fade-out
AudioResetPosition = Reset Position

WarrantRoute = WarrantRoute
WarrantHalt = Halt
WarrantResume = Resume
WarrantAbort = Abort
Expand Down
23 changes: 23 additions & 0 deletions java/test/jmri/ConditionalVariableTest.java
View file
Expand Up @@ -34,27 +34,36 @@ public void testCtor() {
Assert.assertTrue("getNamedBean() returns correct bean", bean.equals(((NamedBeanHandle)cv.getNamedBean()).getBean()));
cv.setName(otherDeviceName);
Assert.assertTrue("setName() sets correct bean", otherBean.equals(((NamedBeanHandle)cv.getNamedBean()).getBean()));
Assert.assertTrue("toString() returns correct value",
"Sensor \"4\" state is \"Sensor Active\"".equals(cv.toString()));

bean = InstanceManager.getDefault(TurnoutManager.class).provideTurnout(deviceName);
otherBean = InstanceManager.getDefault(TurnoutManager.class).provideTurnout(otherDeviceName);
cv = new ConditionalVariable(false, Conditional.Operator.AND, TYPE_TURNOUT_THROWN, deviceName, false);
Assert.assertTrue("getNamedBean() returns correct bean", bean.equals(((NamedBeanHandle)cv.getNamedBean()).getBean()));
cv.setName(otherDeviceName);
Assert.assertTrue("setName() sets correct bean", otherBean.equals(((NamedBeanHandle)cv.getNamedBean()).getBean()));
Assert.assertTrue("toString() returns correct value",
"Turnout \"4\" state is \"Turnout Thrown\"".equals(cv.toString()));

bean = InstanceManager.getDefault(MemoryManager.class).provideMemory(deviceName);
otherBean = InstanceManager.getDefault(MemoryManager.class).provideMemory(otherDeviceName);
cv = new ConditionalVariable(false, Conditional.Operator.AND, TYPE_MEMORY_EQUALS, deviceName, false);
Assert.assertTrue("getNamedBean() returns correct bean", bean.equals(((NamedBeanHandle)cv.getNamedBean()).getBean()));
cv.setName(otherDeviceName);
Assert.assertTrue("setName() sets correct bean", otherBean.equals(((NamedBeanHandle)cv.getNamedBean()).getBean()));
cv.setDataString("A desired memory value");
Assert.assertTrue("toString() returns correct value",
"Memory \"4\" = value \"A desired memory value\"".equals(cv.toString()));

bean = InstanceManager.getDefault(LightManager.class).provideLight(deviceName);
otherBean = InstanceManager.getDefault(LightManager.class).provideLight(otherDeviceName);
cv = new ConditionalVariable(false, Conditional.Operator.AND, TYPE_LIGHT_ON, deviceName, false);
Assert.assertTrue("getNamedBean() returns correct bean", bean.equals(((NamedBeanHandle)cv.getNamedBean()).getBean()));
cv.setName(otherBean.getSystemName());
Assert.assertTrue("setName() sets correct bean", otherBean.equals(((NamedBeanHandle)cv.getNamedBean()).getBean()));
Assert.assertTrue("toString() returns correct value",
"Light \"IL4\" state is \"Light On\"".equals(cv.toString()));

// Note that the signal head IH1 created here are also used to test the signal mast.
SignalHead signalHeadIH1 = new VirtualSignalHead("IH1");
Expand All @@ -67,6 +76,8 @@ public void testCtor() {
Assert.assertTrue("getNamedBean() returns correct bean", bean.equals(((NamedBeanHandle)cv.getNamedBean()).getBean()));
cv.setName("IH2");
Assert.assertTrue("setName() sets correct bean", otherBean.equals(((NamedBeanHandle)cv.getNamedBean()).getBean()));
Assert.assertTrue("toString() returns correct value",
"Signal Head \"IH2\" Appearance is \"Red\"".equals(cv.toString()));

// The signal head IH1 created above is also used here in signal mast IF$shsm:AAR-1946:CPL(IH1)
bean = InstanceManager.getDefault(SignalMastManager.class).provideSignalMast("IF$shsm:AAR-1946:CPL(IH1)");
Expand All @@ -75,6 +86,9 @@ public void testCtor() {
Assert.assertTrue("getNamedBean() returns correct bean", bean.equals(((NamedBeanHandle)cv.getNamedBean()).getBean()));
cv.setName("IF$shsm:AAR-1946:CPL(IH2)");
Assert.assertTrue("setName() sets correct bean", otherBean.equals(((NamedBeanHandle)cv.getNamedBean()).getBean()));
cv.setDataString("Approach");
Assert.assertTrue("toString() returns correct value",
"Signal Mast \"IF$shsm:AAR-1946:CPL(IH2)\" Aspect is \"Approach\"".equals(cv.toString()));

InstanceManager.getDefault(LogixManager.class).createNewLogix("IX:AUTO:0002");
bean = InstanceManager.getDefault(ConditionalManager.class).createNewConditional("IX:AUTO:0001C1", "Conditional");
Expand All @@ -83,20 +97,29 @@ public void testCtor() {
Assert.assertTrue("getNamedBean() returns correct bean", bean.equals(((NamedBeanHandle)cv.getNamedBean()).getBean()));
cv.setName("IX:AUTO:0001C2");
Assert.assertTrue("setName() sets correct bean", otherBean.equals(((NamedBeanHandle)cv.getNamedBean()).getBean()));
cv.setGuiName("A Gui name");
Assert.assertTrue("toString() returns correct value",
"Conditional \"A Gui name\" state is \"Conditional True\"".equals(cv.toString()));

bean = InstanceManager.getDefault(WarrantManager.class).provideWarrant("IW3");
otherBean = InstanceManager.getDefault(WarrantManager.class).provideWarrant("IW4");
cv = new ConditionalVariable(false, Conditional.Operator.AND, TYPE_ROUTE_OCCUPIED, "IW3", false);
Assert.assertTrue("getNamedBean() returns correct bean", bean.equals(((NamedBeanHandle)cv.getNamedBean()).getBean()));
cv.setName("IW4");
Assert.assertTrue("setName() sets correct bean", otherBean.equals(((NamedBeanHandle)cv.getNamedBean()).getBean()));
Assert.assertTrue("toString() returns correct value",
"WarrantRoute \"IW4\" state is \"Occupied\"".equals(cv.toString()));

bean = InstanceManager.getDefault(OBlockManager.class).provideOBlock("OB3");
otherBean = InstanceManager.getDefault(OBlockManager.class).provideOBlock("OB4");
cv = new ConditionalVariable(false, Conditional.Operator.AND, TYPE_BLOCK_STATUS_EQUALS, "OB3", false);
Assert.assertTrue("getNamedBean() returns correct bean", bean.equals(((NamedBeanHandle)cv.getNamedBean()).getBean()));
cv.setName("OB4");
Assert.assertTrue("setName() sets correct bean", otherBean.equals(((NamedBeanHandle)cv.getNamedBean()).getBean()));
cv.setDataString("block error");
Assert.assertTrue("toString() returns correct value",
"OBlock Status \"OB4\" state is \"block error\"".equals(cv.toString()));

// Test a bad device name
cv.setName("A bad device name");
// setName should not change the bean if called with wrong name. For example, it should not set the bean to null.
Expand Down

0 comments on commit f40bd29

Please sign in to comment.