Changeset 1703 in josm

Timestamp:

Jun 27, 2009 11:05:23 AM (4 years ago)

Author:

Gubaer

Message:

added test cases

Location:

trunk/test

Files:

• functional (added)
• functional/org (added)
• functional/org/openstreetmap (added)
• functional/org/openstreetmap/josm (added)
• functional/org/openstreetmap/josm/io (added)
• functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (added)
• functional/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java (added)
• functional/test-functional-env.properties (added)
• unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) (2 diffs)
• unit/org/openstreetmap/josm/gui/conflict/properties (added)
• unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java (added)

trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java

@@ -25 +25 @@
 import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.gui.PleaseWaitDialog;
-import org.openstreetmap.josm.io.MultiFetchServerObjectReaderTest;
 
 public class MergeVisitorTest {
@@ -39 +38 @@
         //
         try {
-            testProperties.load(MultiFetchServerObjectReaderTest.class.getResourceAsStream("/test-unit-env.properties"));
+            testProperties.load(MergeVisitorTest.class.getResourceAsStream("/test-unit-env.properties"));
         } catch(Exception e){
             logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));