Changeset 14138 in josm for trunk/test/unit/org/openstreetmap/josm/data/projection

Timestamp:

2018-08-12T02:21:19+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate Main.platform and related methods - new class PlatformManager

Location:

trunk/test/unit/org/openstreetmap/josm/data/projection

Files:

• ProjectionRefTest.java (modified) (5 diffs)
• SwissGridTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java

@@ -35 +35 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -42 +41 @@
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.Pair;
+import org.openstreetmap.josm.tools.PlatformManager;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -90 +90 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().platform().projectionNadGrids().timeout(90_000);
+    public JOSMTestRules test = new JOSMTestRules().projectionNadGrids().timeout(90_000);
 
     /**
@@ -104 +104 @@
             }
         }
-        Main.determinePlatformHook();
         Collection<RefEntry> refs = readData();
         refs = updateData(refs);
@@ -286 +285 @@
         // see http://geodesie.ign.fr/contenu/fichiers/documentation/algorithmes/notice/NT111_V1_HARMEL_TransfoNTF-RGF93_FormatGrilleNTV2.pdf
         def = def.replace("ntf_r93_b.gsb", "ntf_r93.gsb");
-        if (Main.isPlatformWindows()) {
+        if (PlatformManager.isPlatformWindows()) {
             def = def.replace("'", "\\'").replace("\"", "\\\"");
         }

trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java

@@ -26 +26 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().projectionNadGrids().platform();
+    public JOSMTestRules test = new JOSMTestRules().projectionNadGrids();
 
     /**