Ignore:
Timestamp:
2019-05-02T04:33:57+02:00 (5 years ago)
Author:
Don-vip
Message:

checkstyle/PMD

Location:
trunk/test/unit/org/openstreetmap/josm/actions
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r12740 r15034  
    44import static org.junit.Assert.assertEquals;
    55
    6 import java.io.FileInputStream;
     6import java.nio.file.Files;
     7import java.nio.file.Paths;
    78import java.util.Collection;
    89import java.util.Map;
    … …  
    7475    @Test
    7576    public void testCreate1() throws Exception {
    76         DataSet ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
     77        DataSet ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "create_multipolygon.osm")), null);
    7778        Pair<SequenceCommand, Relation> mp = CreateMultipolygonAction.createMultipolygonCommand(ds.getWays(), null);
    7879        assertEquals("Sequence: Create multipolygon", mp.a.getDescriptionText());
    … …  
    8283    @Test
    8384    public void testCreate2() throws Exception {
    84         DataSet ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
     85        DataSet ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "create_multipolygon.osm")), null);
    8586        Relation mp = createMultipolygon(ds.getWays(), "ref=1 OR ref:1.1.", null, true);
    8687        assertEquals("{1=outer, 1.1.1=inner, 1.1.2=inner}", getRefToRoleMap(mp).toString());
    … …  
    8990    @Test
    9091    public void testUpdate1() throws Exception {
    91         DataSet ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
     92        DataSet ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "create_multipolygon.osm")), null);
    9293        Relation mp = createMultipolygon(ds.getWays(), "ref=\".*1$\"", null, true);
    9394        assertEquals(3, mp.getMembersCount());
    … …  
    100101    @Test
    101102    public void testUpdate2() throws Exception {
    102         DataSet ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
     103        DataSet ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "create_multipolygon.osm")), null);
    103104        Relation mp = createMultipolygon(ds.getWays(), "ref=1 OR ref:1.1.1", null, true);
    104105        assertEquals("{1=outer, 1.1.1=inner}", getRefToRoleMap(mp).toString());

  • trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java

    r14138 r15034  
    55import static org.junit.Assert.assertTrue;
    66
    7 import java.io.FileInputStream;
    87import java.io.IOException;
    98import java.io.InputStream;
     9import java.nio.file.Files;
     10import java.nio.file.Paths;
    1011import java.util.Arrays;
    1112import java.util.Collection;
    … …  
    106107    public void testExamples() throws Exception {
    107108        DataSet dsToJoin, dsExpected;
    108         try (InputStream is = new FileInputStream("data_nodist/Join_Areas_Tests.osm")) {
     109        try (InputStream is = Files.newInputStream(Paths.get("data_nodist/Join_Areas_Tests.osm"))) {
    109110            dsToJoin = OsmReader.parseDataSet(is, NullProgressMonitor.INSTANCE);
    110111        }
    111         try (InputStream is = new FileInputStream("data_nodist/Join_Areas_Tests_joined.osm")) {
     112        try (InputStream is = Files.newInputStream(Paths.get("data_nodist/Join_Areas_Tests_joined.osm"))) {
    112113            dsExpected = OsmReader.parseDataSet(is, NullProgressMonitor.INSTANCE);
    113114        }

  • trunk/test/unit/org/openstreetmap/josm/actions/OrthogonalizeActionTest.java

    r12656 r15034  
    44import static org.junit.Assert.assertEquals;
    55
    6 import java.io.FileInputStream;
     6import java.io.InputStream;
     7import java.nio.file.Files;
     8import java.nio.file.Paths;
    79import java.util.ArrayList;
    810import java.util.List;
    … …  
    9799
    98100    DataSet performTest(String... search) throws Exception {
    99         try (FileInputStream in = new FileInputStream(TestUtils.getTestDataRoot() + "orthogonalize.osm")) {
     101        try (InputStream in = Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "orthogonalize.osm"))) {
    100102            final DataSet ds = OsmReader.parseDataSet(in, null);
    101103            // TODO: Executing commands depends on active edit layer
Note: See TracChangeset for help on using the changeset viewer.