Changeset 12556 in josm

Timestamp:

2017-08-02T02:08:36+02:00 (7 years ago)

Author:

Don-vip

Message:

speedup RightAndLefthandTrafficTest

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• testutils/JOSMTestRules.java (modified) (4 diffs)
• tools/RightAndLefthandTrafficTest.java (modified) (1 diff)

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

@@ -27 +27 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MemoryManagerTest;
+import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
 import org.openstreetmap.josm.tools.Territories;
 import org.openstreetmap.josm.tools.date.DateUtils;
@@ -53 +54 @@
     private boolean useHttps;
     private boolean territories;
+    private boolean rlTraffic;
 
     /**
@@ -193 +195 @@
     public JOSMTestRules territories() {
         territories = true;
+        return this;
+    }
+
+    /**
+     * Use right and lefthand traffic dataset in this test.
+     * @return this instance, for easy chaining
+     * @since 12556
+     */
+    public JOSMTestRules rlTraffic() {
+        rlTraffic = true;
         return this;
     }
@@ -290 +302 @@
         if (territories) {
             Territories.initialize();
+        }
+
+        if (rlTraffic) {
+            RightAndLefthandTraffic.initialize();
         }
 

trunk/test/unit/org/openstreetmap/josm/tools/RightAndLefthandTrafficTest.java

@@ -21 +21 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules rules = new JOSMTestRules().platform().projection().commands();
+    public JOSMTestRules rules = new JOSMTestRules().platform().projection().rlTraffic();
 
     /**