Changeset 2990 in josm for trunk/test

Timestamp:

2010-02-15T09:03:57+01:00 (15 years ago)

Author:

jttt

Message:

Fix some eclipse warnings

Location:

trunk/test

Files:

• functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) (1 diff)
• functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (modified) (2 diffs)
• unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (modified) (1 diff)

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

@@ -204 +204 @@
         createDataSetOnServer(testDataSet);
 
-        PrintWriter pw = null;
         try {
-            pw = new PrintWriter(
+            PrintWriter pw = new PrintWriter(
                     new FileWriter(dataSetCacheOutputFile)
             );
+            logger.info(MessageFormat.format("caching test data set in ''{0}'' ...", dataSetCacheOutputFile.toString()));
+            OsmWriter w = new OsmWriter(pw, false, testDataSet.getVersion());
+            w.header();
+            w.writeDataSources(testDataSet);
+            w.writeContent(testDataSet);
+            w.footer();
+            w.close();
+            pw.close();
         } catch(IOException e) {
             fail(MessageFormat.format("failed to open file ''{0}'' for writing", dataSetCacheOutputFile.toString()));
         }
-        logger.info(MessageFormat.format("caching test data set in ''{0}'' ...", dataSetCacheOutputFile.toString()));
-        OsmWriter w = new OsmWriter(pw, false, testDataSet.getVersion());
-        w.header();
-        w.writeDataSources(testDataSet);
-        w.writeContent(testDataSet);
-        w.footer();
-        w.close();
-        pw.close();
     }
 

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

@@ -211 +211 @@
         createDataSetOnServer(testDataSet);
 
-        PrintWriter pw = null;
         try {
-            pw = new PrintWriter(
+            PrintWriter pw = new PrintWriter(
                     new FileWriter(dataSetCacheOutputFile)
             );
+            logger.info(MessageFormat.format("caching test data set in ''{0}'' ...", dataSetCacheOutputFile.toString()));
+            OsmWriter w = new OsmWriter(pw, false, testDataSet.getVersion());
+            w.header();
+            w.writeDataSources(testDataSet);
+            w.writeContent(testDataSet);
+            w.footer();
+            w.close();
+            pw.close();
         } catch(IOException e) {
             fail(MessageFormat.format("failed to open file ''{0}'' for writing", dataSetCacheOutputFile.toString()));
         }
-        logger.info(MessageFormat.format("caching test data set in ''{0}'' ...", dataSetCacheOutputFile.toString()));
-        OsmWriter w = new OsmWriter(pw, false, testDataSet.getVersion());
-        w.header();
-        w.writeDataSources(testDataSet);
-        w.writeContent(testDataSet);
-        w.footer();
-        w.close();
-        pw.close();
     }
 

trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.*;
+import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
@@ -14 +14 @@
 
     @Test
-    public void HistoryWayTest() {
+    public void wayTest() {
         Date d = new Date();
         HistoryWay way = new HistoryWay(

trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java

@@ -729 +729 @@
                 events.add(evt);
             }
-        };
+        }
         MyListener listener = new MyListener();
         model.addPropertyChangeListener(listener);

trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java

@@ -16 +16 @@
 import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeModel;
 
+@SuppressWarnings("unchecked")
 public class TagMergeModelTest {