Changeset 12545 in josm for trunk

Timestamp:

2017-07-31T01:02:55+02:00 (7 years ago)

Author:

Don-vip

Message:

speed up TerritoriesTest

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• testutils/JOSMTestRules.java (modified) (5 diffs)
• tools/TerritoriesTest.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.Territories;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
@@ -51 +52 @@
     private boolean useMapStyles;
     private boolean useHttps;
+    private boolean territories;
 
     /**
@@ -156 +158 @@
 
     /**
-      * Allow the execution of commands using {@link Main#undoRedo}
-      * @return this instance, for easy chaining
-      */
+     * Allow the execution of commands using {@link Main#undoRedo}
+     * @return this instance, for easy chaining
+     */
     public JOSMTestRules commands() {
         commands = true;
@@ -181 +183 @@
         preferences();
         useMapStyles = true;
+        return this;
+    }
+
+    /**
+     * Use boundaries dataset in this test.
+     * @return this instance, for easy chaining
+     * @since 12545
+     */
+    public JOSMTestRules territories() {
+        territories = true;
         return this;
     }
@@ -274 +286 @@
             // Reset the map paint styles.
             MapPaintStyles.readFromPreferences();
+        }
+
+        if (territories) {
+            Territories.initialize();
         }
 

trunk/test/unit/org/openstreetmap/josm/tools/TerritoriesTest.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().territories();
 
     /**