Changeset 9489 in josm for trunk/test/unit/org/openstreetmap/josm/actions

Timestamp:

2016-01-16T16:41:44+01:00 (9 years ago)

Author:

Don-vip

Message:

unit tests code refactoring/cleanup

Location:

trunk/test/unit/org/openstreetmap/josm/actions

Files:

• CombineWayActionTest.java (modified) (4 diffs)
• JoinAreasActionTest.java (modified) (3 diffs)
• PurgeActionTest.java (modified) (2 diffs)

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

@@ -4 +4 @@
 import static org.junit.Assert.assertEquals;
 
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -10 +9 @@
 import java.util.List;
 import java.util.Set;
-
-import nl.jqno.equalsverifier.EqualsVerifier;
 
 import org.junit.BeforeClass;
@@ -23 +20 @@
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.OsmReader;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
 
 /**
@@ -44 +43 @@
     @Test
     public void testTicket11957() throws IOException, IllegalDataException {
-        try (InputStream is = new FileInputStream(TestUtils.getRegressionDataFile(11957, "data.osm"))) {
+        try (InputStream is = TestUtils.getRegressionDataStream(11957, "data.osm")) {
             DataSet ds = OsmReader.parseDataSet(is, null);
             NodeGraph graph = NodeGraph.createNearlyUndirectedGraphFromNodeWays(ds.getWays());

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

@@ -4 +4 @@
 import static org.junit.Assert.assertEquals;
 
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -39 +38 @@
     @Test
     public void testTicket10511() throws IOException, IllegalDataException {
-        try (InputStream is = new FileInputStream(TestUtils.getRegressionDataFile(10511, "10511_mini.osm"))) {
+        try (InputStream is = TestUtils.getRegressionDataStream(10511, "10511_mini.osm")) {
             DataSet ds = OsmReader.parseDataSet(is, null);
             Main.map.mapView.addLayer(new OsmDataLayer(ds, null, null));
@@ -54 +53 @@
     @Test
     public void testTicket11992() throws IOException, IllegalDataException {
-        try (InputStream is = new FileInputStream(TestUtils.getRegressionDataFile(11992, "shapes.osm"))) {
+        try (InputStream is = TestUtils.getRegressionDataStream(11992, "shapes.osm")) {
             DataSet ds = OsmReader.parseDataSet(is, null);
             assertEquals(10, ds.getWays().size());

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

@@ -5 +5 @@
 import static org.junit.Assert.assertTrue;
 
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -42 +41 @@
     @Test
     public void testCopyStringWayRelation() throws FileNotFoundException, IOException, IllegalDataException {
-        try (InputStream is = new FileInputStream(TestUtils.getRegressionDataFile(12038, "data.osm"))) {
+        try (InputStream is = TestUtils.getRegressionDataStream(12038, "data.osm")) {
             DataSet ds = OsmReader.parseDataSet(is, null);
             Main.map.mapView.addLayer(new OsmDataLayer(ds, null, null));