Changeset 10441 in josm for trunk/test


Ignore:
Timestamp:
2016-06-20T23:25:56+02:00 (4 years ago)
Author:
Don-vip
Message:

fix #13017 - Enable default timeout of 10 seconds on JOSMTestRules (patch by michael2402) - gsoc-core

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

    r10432 r10441  
    55import java.io.IOException;
    66
     7import org.junit.rules.DisableOnDebug;
    78import org.junit.rules.TemporaryFolder;
    89import org.junit.rules.TestRule;
     
    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;
     
    144144        };
    145145        if (timeout != null) {
    146             statement = timeout.apply(statement, description);
     146            statement = new DisableOnDebug(timeout).apply(statement, description);
    147147        }
    148148        if (josmHome != null) {
Note: See TracChangeset for help on using the changeset viewer.