Changeset 15034 in josm for trunk/test/unit/org/openstreetmap/josm/data/validation/tests

Timestamp:

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

Author:

Don-vip

Message:

checkstyle/PMD

Location:

trunk/test/unit/org/openstreetmap/josm/data/validation/tests

Files:

• UnconnectedWaysTest.java (modified) (2 diffs)
• ValidatorTestUtils.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java

@@ -5 +5 @@
 import static org.junit.Assert.assertThat;
 
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 
 import org.junit.Before;
@@ -45 +46 @@
     @Test
     public void testTicket6313() throws IOException, IllegalDataException, FileNotFoundException {
-        try (InputStream fis = new FileInputStream("data_nodist/UnconnectedWaysTest.osm")) {
+        try (InputStream fis = Files.newInputStream(Paths.get("data_nodist/UnconnectedWaysTest.osm"))) {
             final DataSet ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE);
             bib.visit(ds.allPrimitives());

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/ValidatorTestUtils.java

@@ -6 +6 @@
 import static org.junit.Assert.fail;
 
-import java.io.FileInputStream;
 import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -35 +36 @@
             Function<DataSet, Iterable<T>> provider, Predicate<String> namePredicate,
             Test... tests) throws Exception {
-        try (InputStream is = new FileInputStream(sampleFile)) {
+        try (InputStream is = Files.newInputStream(Paths.get(sampleFile))) {
             for (T t: provider.apply(OsmReader.parseDataSet(is, null))) {
                 String name = DefaultNameFormatter.getInstance().format(t);