Changeset 10441 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2016-06-20T23:25:56+02:00 (8 years ago)

Author:

Don-vip

Message:

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

File:

• trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (modified) (3 diffs)

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

@@ -5 +5 @@
 import java.io.IOException;
 
+import org.junit.rules.DisableOnDebug;
 import org.junit.rules.TemporaryFolder;
 import org.junit.rules.TestRule;
@@ -28 +29 @@
  */
 public class JOSMTestRules implements TestRule {
-    //We should make this the default when running from ant: Timeout.seconds(10);
-    private Timeout timeout = null;
+    private Timeout timeout = Timeout.seconds(10);
     private TemporaryFolder josmHome;
     private boolean usePreferences = false;
@@ -144 +144 @@
         };
         if (timeout != null) {
-            statement = timeout.apply(statement, description);
+            statement = new DisableOnDebug(timeout).apply(statement, description);
         }
         if (josmHome != null) {