From 4623fda9e460b831118d2f5bd9452021b8bc0ffd Mon Sep 17 00:00:00 2001 From: George Warner Date: Sat, 28 Oct 2017 15:06:58 -0700 Subject: [PATCH] Fix test cases Add code to catch log.error("...")'s added to replaceTrackConnection. --- .../display/layoutEditor/PositionablePoint.java | 4 ++-- .../layoutEditor/PositionablePointTest.java | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/java/src/jmri/jmrit/display/layoutEditor/PositionablePoint.java b/java/src/jmri/jmrit/display/layoutEditor/PositionablePoint.java index 0ed363a0183..4e494d7c996 100644 --- a/java/src/jmri/jmrit/display/layoutEditor/PositionablePoint.java +++ b/java/src/jmri/jmrit/display/layoutEditor/PositionablePoint.java @@ -680,7 +680,7 @@ public boolean replaceTrackConnection(@Nullable TrackSegment oldTrack, @Nullable result = false; // can't replace null with null } if (!result) { - log.error("Attempt to remove non-existant track connection: {}", oldTrack.getName()); + log.error("Attempt to remove non-existant track connection: {}", oldTrack); } } else // already connected to newTrack? if ((connect1 != newTrack) && (connect2 != newTrack)) { @@ -705,7 +705,7 @@ public boolean replaceTrackConnection(@Nullable TrackSegment oldTrack, @Nullable result = false; } return result; - } + } // replaceTrackConnection void removeSML(SignalMast signalMast) { if (signalMast == null) { diff --git a/java/test/jmri/jmrit/display/layoutEditor/PositionablePointTest.java b/java/test/jmri/jmrit/display/layoutEditor/PositionablePointTest.java index e6cefc88d44..70300685be0 100644 --- a/java/test/jmri/jmrit/display/layoutEditor/PositionablePointTest.java +++ b/java/test/jmri/jmrit/display/layoutEditor/PositionablePointTest.java @@ -345,8 +345,9 @@ public void testSetTrackConnection() { // test null track segment Assert.assertFalse("pp.setTrackConnection(null) is false", pp.setTrackConnection(null)); + jmri.util.JUnitAppender.assertErrorMessage("Attempt to remove non-existant track connection: null"); - PositionablePoint ppA = new PositionablePoint("A", PositionablePoint.ANCHOR, new Point2D.Double( 0.0, 0.0), le); + PositionablePoint ppA = new PositionablePoint("A", PositionablePoint.ANCHOR, new Point2D.Double(0.0, 0.0), le); PositionablePoint ppB = new PositionablePoint("B", PositionablePoint.ANCHOR, new Point2D.Double(10.0, 10.0), le); PositionablePoint ppC = new PositionablePoint("C", PositionablePoint.ANCHOR, new Point2D.Double(20.0, 20.0), le); PositionablePoint ppD = new PositionablePoint("D", PositionablePoint.ANCHOR, new Point2D.Double(30.0, 30.0), le); @@ -361,20 +362,22 @@ public void testSetTrackConnection() { Assert.assertTrue("pp.setTrackConnection(tsAB) is true", pp.setTrackConnection(tsAB)); - // test already connected is true - Assert.assertTrue("pp.setTrackConnection(tsAB) is true", + // test already connected + Assert.assertFalse("pp.setTrackConnection(tsAB) is false", pp.setTrackConnection(tsAB)); + jmri.util.JUnitAppender.assertErrorMessage("Already connected to testAB"); // test 2nd non-null track segment Assert.assertTrue("pp.setTrackConnection(tsBC) is true", pp.setTrackConnection(tsBC)); - // test already connected is true - Assert.assertTrue("pp.setTrackConnection(tsBC) is true", + // test already connected + Assert.assertFalse("pp.setTrackConnection(tsBC) is false", pp.setTrackConnection(tsBC)); + jmri.util.JUnitAppender.assertErrorMessage("Already connected to testBC"); // test 3rd non-null track segment - Assert.assertFalse("pp.setTrackConnection(tsCD) is true", + Assert.assertFalse("pp.setTrackConnection(tsCD) is false", pp.setTrackConnection(tsCD)); jmri.util.JUnitAppender.assertErrorMessage("Attempt to assign more than allowed number of connections"); }