Changeset 15432 in josm for trunk/test/unit/org

Timestamp:

2019-10-06T15:22:40+02:00 (5 years ago)

Author:

Don-vip

Message:

see #2760 - fix unit tests

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• actions/SimplifyWayActionTest.java (modified) (1 diff)
• gui/layer/gpx/ConvertToDataLayerActionTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/SimplifyWayActionTest.java

@@ -66 +66 @@
     /**
      * Tests simplification
-     * @throws IOException
-     * @throws IllegalDataException
+     * @throws Exception in case of error
      */
     @Test
-    public void testSimplify() throws IllegalDataException, IOException {
+    public void testSimplify() throws Exception {
         DataSet DsSimplify = getDs("tracks");
         DataSet DsExpected = getDs("tracks-simplify15");

trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java

@@ -83 +83 @@
     }
 
-    private class genericNode {
-        public genericNode(Node n) {
+    private static class GenericNode {
+        final LatLon coor;
+        final Map<String, String> tags;
+
+        GenericNode(Node n) {
             coor = n.getCoor().getRoundedToOsmPrecision();
             tags = n.getKeys();
         }
-        public LatLon coor;
-        public Map<String, String> tags;
+
         @Override
         public boolean equals(Object obj) {
-            if (!(obj instanceof genericNode)) {
+            if (!(obj instanceof GenericNode)) {
                 return false;
             }
-            genericNode other = (genericNode) obj;
+            GenericNode other = (GenericNode) obj;
             return coor.equals(other.coor) && tags.equals(other.tags);
         }
+
         @Override
         public int hashCode() {
@@ -106 +109 @@
     private void testFromTrack(String expected) throws IOException, SAXException, IllegalDataException {
         final GpxData data = GpxReaderTest.parseGpxData(TestUtils.getTestDataRoot() + "tracks/tracks.gpx");
-        final DataSet osmExpected = OsmReader.parseDataSet(Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "tracks/" + expected + ".osm")), null);
+        final DataSet osmExpected = OsmReader.parseDataSet(Files.newInputStream(
+                Paths.get(TestUtils.getTestDataRoot(), "tracks/" + expected + ".osm")), null);
         final GpxLayer layer = new GpxLayer(data);
         final DataSet osm = new ConvertFromGpxLayerAction(layer).convert();
         //compare sorted coordinates/tags and total amount of primitives, because IDs and order will vary after reload
 
-        List<genericNode> nodes = osm.getNodes().stream()
-                .map(genericNode::new)
+        List<GenericNode> nodes = osm.getNodes().stream()
+                .map(GenericNode::new)
                 .sorted(Comparator.comparing(g -> g.coor.hashCode()))
                 .collect(Collectors.toList());
 
-        List<genericNode> nodesExpected = osmExpected.getNodes().stream()
-                .map(genericNode::new)
+        List<GenericNode> nodesExpected = osmExpected.getNodes().stream()
+                .map(GenericNode::new)
                 .sorted(Comparator.comparing(g -> g.coor.hashCode()))
                 .collect(Collectors.toList());