Changeset 30365 in osm for applications/editors/josm/plugins/turnrestrictions/test/src

Timestamp:

2014-03-24T22:35:16+01:00 (11 years ago)

Author:

donvip

Message:

[josm_turnrestrictions] code cleanup

Location:

applications/editors/josm/plugins/turnrestrictions/test/src/org/openstreetmap/josm/plugins/turnrestrictions

Files:

• AllUnitTests.java (modified) (1 diff)
• editor/AllEditorTests.java (modified) (1 diff)
• fixtures/JOSMFixture.java (modified) (1 diff)

applications/editors/josm/plugins/turnrestrictions/test/src/org/openstreetmap/josm/plugins/turnrestrictions/AllUnitTests.java

@@ -7 +7 @@
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-        AllEditorTests.class,
-        TurnRestrictionBuilderTest.class
+    AllEditorTests.class,
+    TurnRestrictionBuilderTest.class
 })
 public class AllUnitTests {}

applications/editors/josm/plugins/turnrestrictions/test/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AllEditorTests.java

@@ -8 +8 @@
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-        JosmSelectionListModelTest.class,
-        TurnRestrictionEditorModelUnitTest.class,
-        TurnRestrictionLegEditorUnitTest.class,
-        TurnRestrictionTypeRendererTest.class,
-        TurnRestrictionTypeTest.class,
-        ExceptValueModelTest.class
+    JosmSelectionListModelTest.class,
+    TurnRestrictionEditorModelUnitTest.class,
+    TurnRestrictionLegEditorUnitTest.class,
+    TurnRestrictionTypeRendererTest.class,
+    TurnRestrictionTypeTest.class,
+    ExceptValueModelTest.class
 })
 public class AllEditorTests extends TestCase{}

applications/editors/josm/plugins/turnrestrictions/test/src/org/openstreetmap/josm/plugins/turnrestrictions/fixtures/JOSMFixture.java

@@ -69 +69 @@
         //
         String url = OsmApi.getOsmApi().getBaseUrl().toLowerCase().trim();
-        if (url.startsWith("http://www.openstreetmap.org")
-                || url.startsWith("http://api.openstreetmap.org")) {
+        if (url.startsWith("http://www.openstreetmap.org") || url.startsWith("http://api.openstreetmap.org")
+         || url.startsWith("https://www.openstreetmap.org") || url.startsWith("https://api.openstreetmap.org")) {
             fail(MessageFormat.format("configured server url ''{0}'' seems to be a productive url, aborting.", url));
         }