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

Timestamp:

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

Author:

Don-vip

Message:

unit tests code refactoring/cleanup

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• TestUtils.java (modified) (2 diffs)
• actions/CombineWayActionTest.java (modified) (4 diffs)
• actions/JoinAreasActionTest.java (modified) (3 diffs)
• actions/PurgeActionTest.java (modified) (2 diffs)
• data/imagery/WMTSTileSourceTest.java (modified) (2 diffs)
• data/osm/MultipolygonBuilderTest.java (modified) (3 diffs)
• data/osm/OsmPrimitiveTest.java (modified) (1 diff)
• data/osm/WaySegmentTest.java (modified) (1 diff)
• gui/DefaultNameFormatterTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/TestUtils.java

@@ -4 +4 @@
 import static org.junit.Assert.fail;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Comparator;
+
+import org.openstreetmap.josm.io.Compression;
 
 /**
@@ -46 +51 @@
     public static String getRegressionDataFile(int ticketid, String filename) {
         return getRegressionDataDir(ticketid) + '/' + filename;
+    }
+
+    /**
+     * Gets input stream to given file in test data directory for given ticket id.
+     * @param ticketid Ticket numeric identifier
+     * @param filename File name
+     * @return path to given file in test data directory for given ticket id
+     * @throws IOException if any I/O error occurs
+     */
+    public static InputStream getRegressionDataStream(int ticketid, String filename) throws IOException {
+        return Compression.getUncompressedFileInputStream(new File(getRegressionDataDir(ticketid) + '/' + filename));
     }
 

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));

trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java

@@ -14 +14 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -24 +25 @@
 
     private ImageryInfo testImageryTMS =  new ImageryInfo("test imagery", "http://localhost", "tms", null, null);
-    private ImageryInfo testImageryPSEUDO_MERCATOR = getImagery("test/data/wmts/getcapabilities-pseudo-mercator.xml");
-    private ImageryInfo testImageryTOPO_PL = getImagery("test/data/wmts/getcapabilities-TOPO.xml");
-    private ImageryInfo testImageryORTO_PL = getImagery("test/data/wmts/getcapabilities-ORTO.xml");
-    private ImageryInfo testImageryWIEN = getImagery("test/data/wmts/getCapabilities-wien.xml");
-    private ImageryInfo testImageryWALLONIE = getImagery("test/data/wmts/WMTSCapabilities-Wallonie.xml");
-    private ImageryInfo testImageryOntario = getImagery("test/data/wmts/WMTSCapabilities-Ontario.xml");
-    private ImageryInfo testImagery12168 = getImagery("test/data/wmts/bug12168-WMTSCapabilities.xml");
-    private ImageryInfo testLotsOfLayers = getImagery("test/data/wmts/getCapabilities-lots-of-layers.xml");
+    private ImageryInfo testImageryPSEUDO_MERCATOR = getImagery(TestUtils.getTestDataRoot() + "wmts/getcapabilities-pseudo-mercator.xml");
+    private ImageryInfo testImageryTOPO_PL = getImagery(TestUtils.getTestDataRoot() + "wmts/getcapabilities-TOPO.xml");
+    private ImageryInfo testImageryORTO_PL = getImagery(TestUtils.getTestDataRoot() + "wmts/getcapabilities-ORTO.xml");
+    private ImageryInfo testImageryWIEN = getImagery(TestUtils.getTestDataRoot() + "wmts/getCapabilities-wien.xml");
+    private ImageryInfo testImageryWALLONIE = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-Wallonie.xml");
+    private ImageryInfo testImageryOntario = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-Ontario.xml");
+    private ImageryInfo testImagery12168 = getImagery(TestUtils.getTestDataRoot() + "wmts/bug12168-WMTSCapabilities.xml");
+    private ImageryInfo testLotsOfLayers = getImagery(TestUtils.getTestDataRoot() + "wmts/getCapabilities-lots-of-layers.xml");
 
     /**

trunk/test/unit/org/openstreetmap/josm/data/osm/MultipolygonBuilderTest.java

@@ -4 +4 @@
 import static org.junit.Assert.assertNull;
 
-import java.io.FileInputStream;
 import java.io.InputStream;
 
@@ -13 +12 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.io.Compression;
 import org.openstreetmap.josm.io.OsmReader;
 
@@ -41 +39 @@
     @Test
     public void testTicket12376() throws Exception {
-        try (InputStream is = new FileInputStream(TestUtils.getRegressionDataFile(12376, "multipolygon_hang.osm.bz2"))) {
-            DataSet ds = OsmReader.parseDataSet(Compression.BZIP2.getUncompressedInputStream(is), null);
-            for (Relation r : ds.getRelations()) {
+        try (InputStream is = TestUtils.getRegressionDataStream(12376, "multipolygon_hang.osm.bz2")) {
+            for (Relation r : OsmReader.parseDataSet(is, null).getRelations()) {
                 assertNull(new MultipolygonBuilder().makeFromWays(r.getMemberPrimitives(Way.class)));
             }

trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.projection.Projections;
 
+/**
+ * Unit tests of the {@code OsmPrimitive} class.
+ */
 public class OsmPrimitiveTest {
 

trunk/test/unit/org/openstreetmap/josm/data/osm/WaySegmentTest.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 
+/**
+ * Unit tests of the {@code WaySegment} class.
+ */
 public class WaySegmentTest {
 
+    /**
+     * Setup test.
+     */
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         JOSMFixture.createUnitTestFixture().init();
     }

trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java

@@ -5 +5 @@
 import static org.junit.Assert.assertSame;
 
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -24 +23 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
-import org.openstreetmap.josm.io.Compression;
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.OsmReader;
@@ -55 +53 @@
         Comparator<Relation> comparator = DefaultNameFormatter.getInstance().getRelationComparator();
 
-        try (InputStream is = new FileInputStream(TestUtils.getRegressionDataFile(9632, "data.osm.zip"))) {
-            DataSet ds = OsmReader.parseDataSet(Compression.ZIP.getUncompressedInputStream(is), null);
+        try (InputStream is = TestUtils.getRegressionDataStream(9632, "data.osm.zip")) {
+            DataSet ds = OsmReader.parseDataSet(is, null);
 
             // Test with 3 known primitives causing the problem. Correct order is p1, p3, p2 with this preset