Changeset 32868 in osm for applications/editors

Timestamp:

2016-08-23T01:59:35+02:00 (8 years ago)

Author:

donvip

Message:

update unit test to JOSM 10876

File:

• applications/editors/josm/plugins/ElevationProfile/test/unit/org/openstreetmap/josm/plugins/elevation/tests/EleVertexTest.java (modified) (6 diffs)

applications/editors/josm/plugins/ElevationProfile/test/unit/org/openstreetmap/josm/plugins/elevation/tests/EleVertexTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.elevation.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.awt.Color;
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
+import org.junit.Rule;
+import org.junit.Test;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.plugins.elevation.ColorMap;
 import org.openstreetmap.josm.plugins.elevation.grid.EleCoordinate;
 import org.openstreetmap.josm.plugins.elevation.grid.EleVertex;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 
-import junit.framework.TestCase;
+public class EleVertexTest {
 
-public class EleVertexTest extends TestCase {
+    private static final double EPS = 1e-10;
 
-    /**
-     * Setup test.
-     */
-    @Override
-    public void setUp() {
-        Main.pref = new Preferences();
-    }
+    @Rule
+    public JOSMTestRules rules = new JOSMTestRules().preferences();
 
+    @Test
     public void testDivide() {
         EleCoordinate p1 = new EleCoordinate(30.0, 30.0, 100.0);
@@ -36 +37 @@
         // 1st vertex (p1, p2, pN  105m)
         EleVertex v1 = list.get(0);
-        assertEquals(325 / 3D, v1.getEle());
+        assertEquals(325 / 3D, v1.getEle(), EPS);
         assertCoorEq(v1, 30D, 30D, 0);
         assertCoorEq(v1, 30D, 35D, 1);
@@ -44 +45 @@
         EleVertex v2 = list.get(1);
 
-        assertEquals(335/3D, v2.getEle());
+        assertEquals(335/3D, v2.getEle(), EPS);
         assertCoorEq(v2, 40D, 35D, 0);
         assertCoorEq(v2, 30D, 35D, 1);
@@ -50 +51 @@
     }
 
+    @Test
     public void testSimpleRecurse() {
         EleCoordinate c1 = new EleCoordinate(new LatLon(50.8328, 8.1337), 300);
@@ -89 +91 @@
     }*/
 
+    @Test
     public void testColorMap() {
         ColorMap testMap = ColorMap.create("Test", new Color[]{Color.white, Color.black}, new int[]{0, 1000});
@@ -111 +114 @@
 
     private void assertCoorEq(EleVertex v1, double x, double y, int n) {
-        assertEquals(x, v1.get(n).getX());
-        assertEquals(y, v1.get(n).getY());
+        assertEquals(x, v1.get(n).getX(), EPS);
+        assertEquals(y, v1.get(n).getY(), EPS);
     }
 }