Changeset 6289 in josm for trunk/test/functional

Timestamp:

2013-10-03T03:41:25+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/Findbugs - fix various problems

Location:

trunk/test/functional/org/openstreetmap/josm

Files:

• gui/history/HistoryBrowserTest.java (modified) (1 diff)
• io/MultiFetchServerObjectReaderTest.java (modified) (1 diff)
• io/OsmServerBackreferenceReaderTest.java (modified) (1 diff)

trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java

@@ -39 +39 @@
         try {
             InputStream is = HistoryBrowserTest.class.getResourceAsStream("/test-functional-env.properties");
-            testProperties.load(is);
-            is.close();
+            try {
+                testProperties.load(is);
+            } finally {
+                is.close();
+            }
         } catch(Exception e){
             logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));

trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

@@ -140 +140 @@
         try {
             InputStream is = MultiFetchServerObjectReaderTest.class.getResourceAsStream("/test-functional-env.properties");
-            testProperties.load(is);
-            is.close();
+            try {
+                testProperties.load(is);
+            } finally {
+                is.close();
+            }
         } catch(Exception e){
             logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));

trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

@@ -147 +147 @@
         try {
             InputStream is = MultiFetchServerObjectReaderTest.class.getResourceAsStream("/test-functional-env.properties");
-            testProperties.load(is);
-            is.close();
+            try {
+                testProperties.load(is);
+            } finally {
+                is.close();
+            }
         } catch(Exception e){
             logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));