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

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/data/osm

Files:

• MultipolygonBuilderTest.java (modified) (3 diffs)
• OsmPrimitiveTest.java (modified) (1 diff)
• WaySegmentTest.java (modified) (1 diff)

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