From c3cf9e5dd905babe4bbfbecad0750475c61414d4 Mon Sep 17 00:00:00 2001 From: DanielBoudreau Date: Wed, 15 Jan 2020 15:29:37 -0500 Subject: [PATCH] Re-enable skipped tests --- .../rollingstock/cars/CarEditFrameTest.java | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/java/test/jmri/jmrit/operations/rollingstock/cars/CarEditFrameTest.java b/java/test/jmri/jmrit/operations/rollingstock/cars/CarEditFrameTest.java index ea0077e35f3..40461e5a601 100644 --- a/java/test/jmri/jmrit/operations/rollingstock/cars/CarEditFrameTest.java +++ b/java/test/jmri/jmrit/operations/rollingstock/cars/CarEditFrameTest.java @@ -3,7 +3,10 @@ import java.awt.GraphicsEnvironment; import java.text.MessageFormat; -import org.junit.*; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Rule; +import org.junit.Test; import org.junit.rules.Timeout; import jmri.InstanceManager; @@ -91,7 +94,8 @@ public void testRoadNumberErrorConditions() { } @Test - @Ignore("AppVeyor:giving up after 3 failures. 12/31/2019") + //@Ignore("AppVeyor:giving up after 3 failures. 12/31/2019") + // please detail failure so test can be fixed public void testWeightErrorConditions() { Assume.assumeFalse(GraphicsEnvironment.isHeadless()); @@ -496,7 +500,8 @@ public void testSaveCar() { } @Test - @Ignore("AppVeyor:giving up after 3 failures. 12/31/2019") + //@Ignore("AppVeyor:giving up after 3 failures. 12/31/2019") + // please detail failure so test can be fixed public void testSaveExistingCar() { Assume.assumeFalse(GraphicsEnvironment.isHeadless()); @@ -518,10 +523,12 @@ public void testSaveExistingCar() { new Object[]{car.getTypeName()}), Bundle.getMessage("ButtonOK")); JUnitUtil.dispose(f); + JUnitOperationsUtil.checkIdTagsShutDownTask(); } @Test - @Ignore("AppVeyor:giving up after 3 failures. 12/31/2019") + //@Ignore("AppVeyor:giving up after 3 failures. 12/31/2019") + // please detail failure so test can be fixed public void testSaveCarPassenger() { Assume.assumeFalse(GraphicsEnvironment.isHeadless()); @@ -592,10 +599,12 @@ public void testSaveCarPassenger() { Assert.assertEquals("blocking order", 99, car2.getBlocking()); JUnitUtil.dispose(f); + JUnitOperationsUtil.checkIdTagsShutDownTask(); } @Test - @Ignore("AppVeyor:giving up after 3 failures. 12/31/2019") + //@Ignore("AppVeyor:giving up after 3 failures. 12/31/2019") + // please detail failure so test can be fixed public void testSaveCarCaboose() { Assume.assumeFalse(GraphicsEnvironment.isHeadless()); @@ -641,6 +650,7 @@ public void testSaveCarCaboose() { Assert.assertTrue(car2.isCaboose()); JUnitUtil.dispose(f); + JUnitOperationsUtil.checkIdTagsShutDownTask(); } @Test @@ -671,7 +681,8 @@ public void testSaveCarFred() { } @Test - @Ignore("AppVeyor:giving up after 3 failures. 12/31/2019") + //@Ignore("AppVeyor:giving up after 3 failures. 12/31/2019") + // please detail failure so test can be fixed public void testSaveCarUtility() { Assume.assumeFalse(GraphicsEnvironment.isHeadless()); @@ -717,10 +728,12 @@ public void testSaveCarUtility() { Assert.assertTrue(car2.isUtility()); JUnitUtil.dispose(f); + JUnitOperationsUtil.checkIdTagsShutDownTask(); } @Test - @Ignore("AppVeyor:giving up after 3 failures. 12/31/2019") + //@Ignore("AppVeyor:giving up after 3 failures. 12/31/2019") + // please detail failure so test can be fixed public void testSaveCarHazardous() { Assume.assumeFalse(GraphicsEnvironment.isHeadless()); @@ -766,6 +779,7 @@ public void testSaveCarHazardous() { Assert.assertTrue(car2.isHazardous()); JUnitUtil.dispose(f); + JUnitOperationsUtil.checkIdTagsShutDownTask(); } @Test