test: Fix additional tests.

JMRI · Jul 5, 2019 · 9d89281 · 9d89281
1 parent 680a02c
commit 9d89281
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/java/test/jmri/managers/AbstractSensorMgrTestBase.java b/java/test/jmri/managers/AbstractSensorMgrTestBase.java
@@ -108,7 +108,12 @@ public void testDefaultSystemName() {
 
     @Test(expected=IllegalArgumentException.class)
     public void testProvideFailure() {
-        l.provideSensor("");
+        try {
+            l.provideSensor("");
+        } catch (IllegalArgumentException ex) {
+            jmri.util.JUnitAppender.assertErrorMessage("Invalid system name for Sensor: System name \"" + l.getSystemNamePrefix() + "\" is missing suffix.");
+            throw ex;
+        }
     }
 
     @Test

diff --git a/java/test/jmri/managers/AbstractTurnoutMgrTestBase.java b/java/test/jmri/managers/AbstractTurnoutMgrTestBase.java
@@ -55,7 +55,7 @@ public void testProvideFailure() {
         try {
             l.provideTurnout("");
         } catch (IllegalArgumentException ex) {
-          jmri.util.JUnitAppender.assertErrorMessage("Invalid system name for Turnout: \"\" needed non-empty suffix to follow " + l.getSystemNamePrefix());
+          jmri.util.JUnitAppender.assertErrorMessage("Invalid system name for Turnout: System name \"" + l.getSystemNamePrefix() + "\" is missing suffix.");
           throw ex;
         }
     }