Changeset 7033 in josm for trunk/test/unit/org/openstreetmap/josm/gui

Timestamp:

2014-05-01T02:34:43+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8465 - global use of try-with-resources, according to

• ​http://docs.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html
• ​https://blogs.oracle.com/darcy/entry/project_coin_null_try_with

Location:

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort

Files:

• RelationSorterTest.java (modified) (2 diffs)
• WayConnectionTypeCalculatorTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java

@@ -3 +3 @@
 
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 
@@ -24 +25 @@
 
     @BeforeClass
-    public static void loadData() throws FileNotFoundException, IllegalDataException {
+    public static void loadData() throws IllegalDataException, IOException {
         Main.initApplicationPreferences();
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
-        testDataset = OsmReader.parseDataSet(new FileInputStream("data_nodist/relation_sort.osm"), NullProgressMonitor.INSTANCE);
+        try (InputStream fis = new FileInputStream("data_nodist/relation_sort.osm")) {
+            testDataset = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE);
+        }
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java

@@ -3 +3 @@
 
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Arrays;
 import java.util.List;
@@ -25 +26 @@
 
     @BeforeClass
-    public static void loadData() throws FileNotFoundException, IllegalDataException {
+    public static void loadData() throws IllegalDataException, IOException {
         Main.initApplicationPreferences();
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
-        testDataset = OsmReader.parseDataSet(new FileInputStream("data_nodist/relation_sort.osm"), NullProgressMonitor.INSTANCE);
+        try (InputStream fis = new FileInputStream("data_nodist/relation_sort.osm")) {
+            testDataset = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE);
+        }
     }