Changeset 16321 in josm for trunk/test/unit

Timestamp:

2020-04-17T17:54:04+02:00 (5 years ago)

Author:

simon04

Message:

fix #18907 - Initialize Territories+RightAndLefthandTraffic together, remove "Edit boundaries" to save memory (unless started with --debug)

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• gui/dialogs/properties/TagEditHelperTest.java (modified) (1 diff)
• testutils/JOSMTestRules.java (modified) (4 diffs)
• tools/RightAndLefthandTrafficTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelperTest.java

@@ -51 +51 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().territories().rlTraffic().projection();
+    public JOSMTestRules test = new JOSMTestRules().territories().projection();
 
     private static TagEditHelper newTagEditHelper() {

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

@@ -65 +65 @@
 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.bugreport.ReportedException;
@@ -100 +99 @@
     private boolean useHttps;
     private boolean territories;
-    private boolean rlTraffic;
     private boolean metric;
     private boolean main;
@@ -270 +268 @@
      * @return this instance, for easy chaining
      * @since 12556
-     */
+     * @deprecated Use {@link #territories}
+     */
+    @Deprecated
     public JOSMTestRules rlTraffic() {
         territories();
-        rlTraffic = true;
         return this;
     }
@@ -551 +550 @@
         if (territories) {
             Territories.initializeInternalData();
-        }
-
-        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().projection().rlTraffic();
+    public JOSMTestRules rules = new JOSMTestRules().projection().territories();
 
     /**