Changeset 15034 in josm for trunk/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.java

Timestamp:

2019-05-02T04:33:57+02:00 (5 years ago)

Author:

Don-vip

Message:

checkstyle/PMD

File:

• trunk/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.java (modified) (5 diffs)

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

@@ -4 +4 @@
 import static org.junit.Assert.assertEquals;
 
-import java.io.FileInputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Collection;
 import java.util.Map;
@@ -74 +75 @@
     @Test
     public void testCreate1() throws Exception {
-        DataSet ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
+        DataSet ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "create_multipolygon.osm")), null);
         Pair<SequenceCommand, Relation> mp = CreateMultipolygonAction.createMultipolygonCommand(ds.getWays(), null);
         assertEquals("Sequence: Create multipolygon", mp.a.getDescriptionText());
@@ -82 +83 @@
     @Test
     public void testCreate2() throws Exception {
-        DataSet ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
+        DataSet ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "create_multipolygon.osm")), null);
         Relation mp = createMultipolygon(ds.getWays(), "ref=1 OR ref:1.1.", null, true);
         assertEquals("{1=outer, 1.1.1=inner, 1.1.2=inner}", getRefToRoleMap(mp).toString());
@@ -89 +90 @@
     @Test
     public void testUpdate1() throws Exception {
-        DataSet ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
+        DataSet ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "create_multipolygon.osm")), null);
         Relation mp = createMultipolygon(ds.getWays(), "ref=\".*1$\"", null, true);
         assertEquals(3, mp.getMembersCount());
@@ -100 +101 @@
     @Test
     public void testUpdate2() throws Exception {
-        DataSet ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
+        DataSet ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "create_multipolygon.osm")), null);
         Relation mp = createMultipolygon(ds.getWays(), "ref=1 OR ref:1.1.1", null, true);
         assertEquals("{1=outer, 1.1.1=inner}", getRefToRoleMap(mp).toString());