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

Timestamp:

2014-05-01T02:34:43+02:00 (12 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/data/osm

Files:

• FilterTest.java (modified) (2 diffs)
• QuadBucketsTest.java (modified) (3 diffs)

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

@@ -5 +5 @@
 
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Collection;
@@ -63 +64 @@
 
     @Test
-    public void filter_test() throws ParseError, IllegalDataException, FileNotFoundException {
+    public void filter_test() throws ParseError, IllegalDataException, IOException {
         for (int i : new int [] {1,2,3, 11,12,13,14, 15}) {
-            DataSet ds = OsmReader.parseDataSet(new FileInputStream("data_nodist/filterTests.osm"), NullProgressMonitor.INSTANCE);
+            DataSet ds;
+            try (InputStream is = new FileInputStream("data_nodist/filterTests.osm")) {
+                ds = OsmReader.parseDataSet(is, NullProgressMonitor.INSTANCE);
+            }
 
             List<Filter> filters = new LinkedList<>();

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

@@ -3 +3 @@
 
 import java.io.FileInputStream;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -66 +67 @@
     public void testRemove() throws Exception {
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
-        DataSet ds = OsmReader.parseDataSet(new FileInputStream("data_nodist/restriction.osm"), NullProgressMonitor.INSTANCE);
-        removeAllTest(ds);
+        try (InputStream fis = new FileInputStream("data_nodist/restriction.osm")) {
+            DataSet ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE);
+            removeAllTest(ds);
+        }
     }
 
@@ -73 +76 @@
     public void testMove() throws Exception {
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
-        DataSet ds = OsmReader.parseDataSet(new FileInputStream("data_nodist/restriction.osm"), NullProgressMonitor.INSTANCE);
-
-        for (Node n: ds.getNodes()) {
-            n.setCoor(new LatLon(10, 10));
+        try (InputStream fis = new FileInputStream("data_nodist/restriction.osm")) {
+            DataSet ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE);
+    
+            for (Node n: ds.getNodes()) {
+                n.setCoor(new LatLon(10, 10));
+            }
+    
+            removeAllTest(ds);
         }
-
-        removeAllTest(ds);
     }
 }