Changeset 1707 in josm

Timestamp:

Jun 27, 2009 2:03:30 PM (4 years ago)

Author:

Gubaer

Message:

test cases and test libraries (JUnit 4.6 and FEST)

Location:

trunk/test

Files:

• functional/org/openstreetmap/josm/gui (added)
• functional/org/openstreetmap/josm/gui/conflict (added)
• functional/org/openstreetmap/josm/gui/conflict/nodes (added)
• functional/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergerTest.java (added)
• functional/org/openstreetmap/josm/gui/conflict/properties (added)
• functional/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergerTest.java (added)
• functional/org/openstreetmap/josm/gui/conflict/relation (added)
• functional/org/openstreetmap/josm/gui/conflict/relation/RelationMemberMergerTest.java (added)
• functional/org/openstreetmap/josm/gui/conflict/tags (added)
• functional/org/openstreetmap/josm/gui/conflict/tags/TagMergerTest.java (added)
• functional/org/openstreetmap/josm/gui/dialogs (added)
• functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java (added)
• functional/org/openstreetmap/josm/gui/history (added)
• functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (added)
• lib (added)
• lib/fest (added)
• lib/fest/LICENSE-2.0.txt (added)
• lib/fest/MRJToolkitStubs-1.0.jar (added)
• lib/fest/README.txt (added)
• lib/fest/debug-1.0.jar (added)
• lib/fest/fest-assert-1.0.jar (added)
• lib/fest/fest-reflect-1.1.jar (added)
• lib/fest/fest-swing-1.1.jar (added)
• lib/fest/fest-util-1.0.jar (added)
• lib/fest/jcip-annotations-1.0.jar (added)
• lib/junit (added)
• lib/junit/README.txt (added)
• lib/junit/cpl-v10.html (added)
• lib/junit/junit-4.6.jar (added)
• unit/build.xml (added)
• unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) (1 diff)

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

@@ -40 +40 @@
             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"));
-            fail(MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));
+            logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", "/test-unit-env.properties"));
+            fail(MessageFormat.format("failed to load property file ''{0}''", "/test-unit-env.properties"));
         }