Changeset 8876 in josm for trunk/test/unit/org/openstreetmap/josm/io/session

Timestamp:

2015-10-14T23:35:44+02:00 (9 years ago)

Author:

Don-vip

Message:

cleanup unit tests

Location:

trunk/test/unit/org/openstreetmap/josm/io/session

Files:

• SessionReaderTest.java (modified) (1 diff)
• SessionWriterTest.java (modified) (11 diffs)

trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java

@@ -114 +114 @@
     }
 
+    /**
+     * Tests to read a .jos file containing Bing imagery.
+     * @throws IOException if any I/O error occurs
+     * @throws IllegalDataException is the test file is considered as invalid
+     */
     @Test
     public void testReadImage() throws IOException, IllegalDataException {

trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io.session;
+
+import static org.junit.Assert.fail;
 
 import java.io.File;
@@ -85 +87 @@
     }
 
-    private void testWrite(List<Layer> layers, final boolean zip) throws IOException {
+    private void testWrite(List<Layer> layers, final boolean zip) {
         Map<Layer, SessionLayerExporter> exporters = new HashMap<>();
         if (zip) {
@@ -101 +103 @@
         try {
             sw.write(file);
+        } catch (IOException e) {
+            e.printStackTrace();
+            fail(e.getMessage());
         } finally {
             if (file.exists()) {
@@ -135 +140 @@
     /**
      * Tests to write an empty .jos file.
-     * @throws IOException if any I/O error occurs
-     */
-    @Test
-    public void testWriteEmptyJos() throws IOException {
+     */
+    @Test
+    public void testWriteEmptyJos() {
         testWrite(Collections.<Layer>emptyList(), false);
     }
@@ -144 +148 @@
     /**
      * Tests to write an empty .joz file.
-     * @throws IOException if any I/O error occurs
-     */
-    @Test
-    public void testWriteEmptyJoz() throws IOException {
+     */
+    @Test
+    public void testWriteEmptyJoz() {
         testWrite(Collections.<Layer>emptyList(), true);
     }
@@ -153 +156 @@
     /**
      * Tests to write a .jos file containing OSM data.
-     * @throws IOException if any I/O error occurs
-     */
-    @Test
-    public void testWriteOsmJos() throws IOException {
+     */
+    @Test
+    public void testWriteOsmJos() {
         testWrite(Collections.<Layer>singletonList(createOsmLayer()), false);
     }
@@ -162 +164 @@
     /**
      * Tests to write a .joz file containing OSM data.
-     * @throws IOException if any I/O error occurs
-     */
-    @Test
-    public void testWriteOsmJoz() throws IOException {
+     */
+    @Test
+    public void testWriteOsmJoz() {
         testWrite(Collections.<Layer>singletonList(createOsmLayer()), true);
     }
@@ -171 +172 @@
     /**
      * Tests to write a .jos file containing GPX data.
-     * @throws IOException if any I/O error occurs
-     */
-    @Test
-    public void testWriteGpxJos() throws IOException {
+     */
+    @Test
+    public void testWriteGpxJos() {
         testWrite(Collections.<Layer>singletonList(createGpxLayer()), false);
     }
@@ -180 +180 @@
     /**
      * Tests to write a .joz file containing GPX data.
-     * @throws IOException if any I/O error occurs
-     */
-    @Test
-    public void testWriteGpxJoz() throws IOException {
+     */
+    @Test
+    public void testWriteGpxJoz() {
         testWrite(Collections.<Layer>singletonList(createGpxLayer()), true);
     }
@@ -189 +188 @@
     /**
      * Tests to write a .joz file containing GPX and marker data.
-     * @throws IOException if any I/O error occurs
-     */
-    @Test
-    public void testWriteGpxAndMarkerJoz() throws IOException {
+     */
+    @Test
+    public void testWriteGpxAndMarkerJoz() {
         GpxLayer gpx = createGpxLayer();
         testWrite(Arrays.asList(gpx, createMarkerLayer(gpx)), true);
@@ -199 +197 @@
     /**
      * Tests to write a .joz file containing an imagery layer.
-     * @throws IOException if any I/O error occurs
-     */
-    @Test
-    public void testWriteImageryLayer() throws IOException {
+     */
+    @Test
+    public void testWriteImageryLayer() {
         final Layer layer = createImageryLayer();
         testWrite(Collections.singletonList(layer), true);