Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Re-enable skipped tests
  • Loading branch information
DanielBoudreau committed Jan 15, 2020
1 parent 0d5451d commit c3cf9e5
Showing 1 changed file with 21 additions and 7 deletions.
Expand Up @@ -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;
Expand Down Expand Up @@ -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());

Expand Down Expand Up @@ -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());

Expand All @@ -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());

Expand Down Expand Up @@ -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());

Expand Down Expand Up @@ -641,6 +650,7 @@ public void testSaveCarCaboose() {
Assert.assertTrue(car2.isCaboose());

JUnitUtil.dispose(f);
JUnitOperationsUtil.checkIdTagsShutDownTask();
}

@Test
Expand Down Expand Up @@ -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());

Expand Down Expand Up @@ -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());

Expand Down Expand Up @@ -766,6 +779,7 @@ public void testSaveCarHazardous() {
Assert.assertTrue(car2.isHazardous());

JUnitUtil.dispose(f);
JUnitOperationsUtil.checkIdTagsShutDownTask();
}

@Test
Expand Down

0 comments on commit c3cf9e5

Please sign in to comment.