Changeset 18494 in josm for trunk/test/unit

Timestamp:

2022-06-15T19:27:05+02:00 (3 years ago)

Author:

taylor.smock

Message:

Fix #22115: Extract methods from LatLon into ILatLon where they are generally applicable

This also removes calls to Node#getCoor where possible, which reduces
the number of memory allocations in SearchCompiler#match, and overall
allocations due to Node#getCoor

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• data/cache/JCSCacheManagerTest.java (modified) (2 diffs)
• data/coor/LatLonTest.java (modified) (1 diff)
• data/gpx/GpxDataTest.java (modified) (2 diffs)
• data/projection/ProjectionTest.java (modified) (2 diffs)
• gui/mappaint/RenderingCLIAreaTest.java (modified) (3 diffs)
• tools/GeometryTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCacheManagerTest.java

@@ -9 +9 @@
 import java.util.logging.Logger;
 
-import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
-
-import net.trajano.commons.testing.UtilityClassTestUtil;
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.apache.commons.jcs3.auxiliary.disk.block.BlockDiskCacheAttributes;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
+
+import net.trajano.commons.testing.UtilityClassTestUtil;
 
 /**
@@ -59 +59 @@
             CacheAccess<Object, Object> cache = JCSCacheManager.getCache("testUseBigDiskFile", 1, 100, "foobar");
             assertEquals(10*1024,
-                    ((BlockDiskCacheAttributes) cache.getCacheControl().getAuxCaches()[0].getAuxiliaryCacheAttributes()).getMaxKeySize(),
+                    ((BlockDiskCacheAttributes) cache.getCacheControl().getAuxCacheList().get(0).getAuxiliaryCacheAttributes()).getMaxKeySize(),
                     "BlockDiskCache use file size to calculate its size");
         }

trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java

@@ -170 +170 @@
     @Test
     void testBearing() {
-        LatLon c = new LatLon(47.000000, 19.000000);
-        LatLon e = new LatLon(47.000000, 19.000001);
-        LatLon n = new LatLon(47.000001, 19.000000);
+        ILatLon c = new LatLon(47.000000, 19.000000);
+        ILatLon e = new LatLon(47.000000, 19.000001);
+        ILatLon n = new LatLon(47.000001, 19.000000);
         assertEquals(0, Math.toDegrees(c.bearing(n)), EPSILON);
         assertEquals(90, Math.toDegrees(c.bearing(e)), EPSILON);

trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java

@@ -26 +26 @@
 import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeEvent;
@@ -322 +323 @@
         data.addTrack(track1);
         data.addTrack(track2);
-        assertEquals(3 * new LatLon(0, 0).greatCircleDistance(new LatLon(1, 1)), data.length(), 1);
+        assertEquals(3 * new LatLon(0, 0).greatCircleDistance((ILatLon) new LatLon(1, 1)), data.length(), 1);
     }
 

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

@@ -14 +14 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 
@@ -171 +172 @@
             LatLon ll2 = p.eastNorth2latlon(en);
             assertTrue(ll2.isValid(), p.toCode() + " at " + ll1 + " is " + ll2);
-            double dist = ll1.greatCircleDistance(ll2);
+            double dist = ll1.greatCircleDistance((ILatLon) ll2);
             if (dist > eps) {
                 error2 = true;

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/RenderingCLIAreaTest.java

@@ -16 +16 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -64 +65 @@
                 CoreMatchers.is(bFeldberg)});
 
-        LatLon aFeldberg = bFeldberg.getMin();
-        LatLon aFeldberg200mRight = new LatLon(aFeldberg.lat(), 13.433008399004041);
-        LatLon aFeldberg150mUp = new LatLon(53.33134745249311, aFeldberg.lon());
+        ILatLon aFeldberg = bFeldberg.getMin();
+        ILatLon aFeldberg200mRight = new LatLon(aFeldberg.lat(), 13.433008399004041);
+        ILatLon aFeldberg150mUp = new LatLon(53.33134745249311, aFeldberg.lon());
         assertThat(aFeldberg.greatCircleDistance(aFeldberg200mRight), isFP(200.0, 0.01));
         assertThat(aFeldberg.greatCircleDistance(aFeldberg150mUp), isFP(150.0, 0.01));
@@ -142 +143 @@
     }
 
-    private static String param(LatLon ll) {
+    private static String param(ILatLon ll) {
         return ll.lon() + "," + ll.lat();
     }

trunk/test/unit/org/openstreetmap/josm/tools/GeometryTest.java

@@ -24 +24 @@
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -503 +504 @@
         ProjectionRegistry.setProjection(projection);
         final double offset = offsetInMeters / projection.getMetersPerUnit();
-        final LatLon original = new LatLon(lat, lon);
-
-        final LatLon actual = (LatLon) Geometry.getLatLonFrom(original, Math.toRadians(angle), offset);
+        final ILatLon original = new LatLon(lat, lon);
+
+        final ILatLon actual = Geometry.getLatLonFrom(original, Math.toRadians(angle), offset);
         // Due to degree -> radian -> degree conversion, there is a limit to how precise it can be
         assertEquals(offsetInMeters, original.greatCircleDistance(actual), 0.000_000_1);