Ticket #13017: patch-test-enable-default-timeout.patch

File patch-test-enable-default-timeout.patch, 1.4 KB (added by michael2402, 10 years ago)

  • test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java 

    diff --git a/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java b/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
index 39dae30..cae7e1e 100644
    a b package org.openstreetmap.josm.testutils;  
    44import java.io.File;
    55import java.io.IOException;
    66
     7import org.junit.rules.DisableOnDebug;
    78import org.junit.rules.TemporaryFolder;
    89import org.junit.rules.TestRule;
    910import org.junit.rules.Timeout;
    … … import org.openstreetmap.josm.tools.I18n;  
    2728 * @author Michael Zangl
    2829 */
    2930public class JOSMTestRules implements TestRule {
    30     //We should make this the default when running from ant: Timeout.seconds(10);
    31     private Timeout timeout = null;
     31    private Timeout timeout = Timeout.seconds(10);
    3232    private TemporaryFolder josmHome;
    3333    private boolean usePreferences = false;
    3434    private APIType useAPI = APIType.NONE;
    … … public class JOSMTestRules implements TestRule {  
    143143            }
    144144        };
    145145        if (timeout != null) {
    146             statement = timeout.apply(statement, description);
     146            statement = new DisableOnDebug(timeout).apply(statement, description);
    147147        }
    148148        if (josmHome != null) {
    149149            statement = josmHome.apply(statement, description);