Changeset 7025 in josm for trunk/test

Timestamp:

2014-04-29T03:24:57+02:00 (10 years ago)

Author:

Don-vip

Message:

Sonar - fix various issues

Location:

trunk/test/functional/org/openstreetmap/josm

Files:

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

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

@@ -6 +6 @@
 import java.awt.BorderLayout;
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.text.MessageFormat;
@@ -44 +45 @@
                 is.close();
             }
-        } catch(Exception e){
+        } catch(IOException e){
             logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));
             fail(MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));

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

@@ -111 +111 @@
     }
 
-    static public DataSet testDataSet;
-    static public Properties testProperties;
+    private static DataSet testDataSet;
+    private static Properties testProperties;
 
     /**
@@ -120 +120 @@
      * @throws OsmTransferException
      */
-    static public void createDataSetOnServer(DataSet ds) throws OsmTransferException {
+    public static void createDataSetOnServer(DataSet ds) throws OsmTransferException {
         logger.info("creating data set on the server ...");
         ArrayList<OsmPrimitive> primitives = new ArrayList<>();
@@ -147 +147 @@
                 is.close();
             }
-        } catch(Exception e){
+        } catch(IOException e){
             logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));
             fail(MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));

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

@@ -154 +154 @@
                 is.close();
             }
-        } catch(Exception e){
+        } catch(IOException e){
             logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));
             fail(MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));