Changeset 31425 in osm for applications/editors/josm/plugins/mapillary/test

Timestamp:

2015-07-31T18:23:44+02:00 (9 years ago)

Author:

nokutu

Message:

Fixed problem with ImageProvider and tests

Location:

applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary

Files:

• AbstractTest.java (modified) (1 diff)
• ImportTest.java (modified) (2 diffs)
• util/TestUtil.java (modified) (1 diff)

applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/AbstractTest.java

@@ -19 +19 @@
   @BeforeClass
   public static void setUpBeforeClass() {
-    if (!started) {
-      TestUtil.initPlugin();
-      started = true;
-    }
+    TestUtil.initPlugin();
   }
 }

applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/ImportTest.java

@@ -2 +2 @@
 
 import static org.junit.Assert.*;
+
 import org.junit.Test;
 
@@ -27 +28 @@
   @Test
   public void importNoTagsTest() {
-    File image = new File(MapillaryPlugin.directory + "images/icon16.png");
-    MapillaryImportedImage img = MapillaryPlugin.importAction.readNoTags(image,
+    File image = new File("images/icon16.png");
+    MapillaryImportedImage img = new MapillaryImportAction().readNoTags(image,
         new LatLon(0, 0));
     assertEquals(0, img.getCa(), 0.01);

applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/util/TestUtil.java

@@ -41 +41 @@
       I18n.set(Main.pref.get("language", "en"));
       Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
-      try {
-        new MapillaryPlugin(new PluginInformation(new File(
-            "./build/libs/josm-mapillary-plugin.jar")));
-      } catch (PluginException e) {
-        e.printStackTrace();
-      }
       isInitialized = true;
     }