# # ChangeLog for trunk/test/lib in josm # # Generated by Trac 1.6 # 2024-12-12T17:52:14+01:00 Thu, 24 Aug 2017 23:53:49 GMT Don-vip [12640] * trunk/.classpath (modified) * trunk/netbeans/nbproject/project.properties (modified) * trunk/test/lib/equalsverifier-2.3.2.jar (deleted) * trunk/test/lib/equalsverifier-2.3.3.jar (added) see #11924 - update to equalsverifier 2.3.3 - improved java 9 support Sun, 06 Aug 2017 14:28:10 GMT Don-vip [12573] * trunk/.classpath (modified) * trunk/netbeans/nbproject/project.properties (modified) * trunk/test/lib/equalsverifier-2.3.1.jar (deleted) * trunk/test/lib/equalsverifier-2.3.2.jar (added) see #11924 - update to equalsverifier 2.3.2 (includes ASM 6.0_BETA) Wed, 02 Aug 2017 18:41:01 GMT Don-vip [12557] * trunk/.classpath (modified) * trunk/netbeans/nbproject/project.properties (modified) * trunk/src/org/openstreetmap/josm/io/NameFinder.java (modified) * trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (modified) * trunk/test/data/__files (added) * trunk/test/data/__files/README (added) * trunk/test/data/__files/imagery (added) * trunk/test/data/__files/imagery/maps.xml (added) * trunk/test/data/__files/imagery/wms-capabilities.xml (added) * trunk/test/data/__files/nominatim (added) * trunk/test/data/__files/nominatim/London.xml (added) * trunk/test/data/__files/nominatim/foo-bar-baz-does-not-exist.xml (added) * trunk/test/data/__files/presets (added) * trunk/test/data/__files/presets/Presets_BicycleJunction-preset.xml (added) * trunk/test/data/__files/samples (added) * trunk/test/data/__files/samples/data.gpx (added) * trunk/test/data/__files/samples/data.osm (added) * trunk/test/data/__files/samples/data.osn (added) * trunk/test/lib/wiremock-standalone-2.7.1.jar (added) * trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTestIT.java (deleted) * trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTaskTest.java (added) * trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTaskTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTaskTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (modified) see #15102 - first batch of HTTP unit tests mocking, using WireMock 2.7.1 Mon, 03 Jul 2017 19:28:34 GMT Don-vip [12451] * trunk/.classpath (modified) * trunk/eclipse/JOSM (Java 8).launch (modified) * trunk/netbeans/nbproject/project.properties (modified) * trunk/test/lib/equalsverifier-2.3.1.jar (added) * trunk/test/lib/equalsverifier-2.3.jar (deleted) update to equalsverifier 2.3.1 Thu, 25 May 2017 00:54:57 GMT Don-vip [12251] * trunk/.classpath (modified) * trunk/eclipse/JOSM (Java 8).launch (modified) * trunk/netbeans/nbproject/project.properties (modified) * trunk/test/lib/equalsverifier-2.2.2.jar (deleted) * trunk/test/lib/equalsverifier-2.3.jar (added) update to equalsverifier 2.3 Sat, 20 May 2017 23:45:26 GMT Don-vip [12222] * trunk/.classpath (modified) * trunk/build.xml (modified) * trunk/eclipse/JOSM (Java 8).launch (modified) * trunk/netbeans/nbproject/project.properties (modified) * trunk/test/lib/equalsverifier-2.2.1.jar (deleted) * trunk/test/lib/equalsverifier-2.2.2.jar (added) see #11924 - update to a patched version of equalsverifier that ... Sat, 15 Apr 2017 18:20:00 GMT Don-vip [11921] * trunk/.classpath (modified) * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (modified) * trunk/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java (modified) * trunk/src/org/openstreetmap/josm/data/oauth/SignpostAdapters.java (modified) * trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java (modified) * trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (modified) * trunk/src/org/openstreetmap/josm/gui/datatransfer/ClipboardUtils.java (modified) * trunk/src/org/openstreetmap/josm/tools/StreamUtils.java (modified) * trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java (modified) * trunk/test/lib/commons-testing (added) * trunk/test/lib/commons-testing/commons-testing-2.1.0.jar (added) * trunk/test/unit/JOSMTest.java (added) * trunk/test/unit/org/openstreetmap/josm/MainTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/actions/OrthogonalizeActionTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/actions/SelectByInternalPointActionTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/CustomConfiguratorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCacheManagerTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelperTest.java (added) * trunk/test/unit/org/openstreetmap/josm/data/oauth/SignpostAdaptersTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/validation/OsmValidatorTest.java (added) * trunk/test/unit/org/openstreetmap/josm/data/validation/util/EntitiesTest.java (added) * trunk/test/unit/org/openstreetmap/josm/data/validation/util/ValUtilTest.java (added) * trunk/test/unit/org/openstreetmap/josm/gui/ConditionalOptionPaneUtilTest.java (added) * trunk/test/unit/org/openstreetmap/josm/gui/ExceptionDialogUtilTest.java (added) * trunk/test/unit/org/openstreetmap/josm/gui/datatransfer/ClipboardUtilsTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ChangesetDialogTest.java (added) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactoryTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactoryTest.java (added) * trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReaderTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetsTest.java (added) * trunk/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/tools/CheckParameterUtilTest.java (added) * trunk/test/unit/org/openstreetmap/josm/tools/FontsManagerTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/tools/RightAndLefthandTrafficTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/tools/StreamUtilsTest.java (added) * trunk/test/unit/org/openstreetmap/josm/tools/TerritoriesTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java (modified) improve unit test coverage of utilities classes thanks to ... Sun, 29 Jan 2017 23:21:09 GMT Don-vip [11511] * trunk/netbeans/nbproject/project.properties (modified) * trunk/test/lib/equalsverifier-2.2.1.jar (added) * trunk/test/lib/equalsverifier-2.2.jar (deleted) * trunk/test/lib/reflections/guava-19.0.jar (deleted) upgrade to equalsverifier 2.2.1 Sun, 22 Jan 2017 18:50:32 GMT Don-vip [11487] * trunk/.classpath (modified) * trunk/README (modified) * trunk/build.xml (modified) * trunk/test/lib/equalsverifier-2.1.8.jar (deleted) * trunk/test/lib/equalsverifier-2.2.jar (added) * trunk/test/lib/reflections/guava-21.0.jar (added) * trunk/test/lib/reflections/javassist-3.20.0-GA.jar (deleted) * trunk/test/lib/reflections/javassist-3.21.0-GA.jar (added) * trunk/test/lib/system-rules-1.16.0.jar (deleted) * trunk/test/lib/system-rules-1.16.1.jar (added) * trunk/test/lib/unitils-core/unitils-core-3.4.3.jar (deleted) * trunk/test/lib/unitils-core/unitils-core-3.4.6.jar (added) * trunk/tools/error_prone_ant-2.0.14.jar (deleted) * trunk/tools/error_prone_ant-2.0.15.jar (added) * trunk/tools/groovy-all-2.4.7.jar (deleted) * trunk/tools/groovy-all-2.4.8.jar (added) * trunk/tools/proguard.jar (modified) tools/lib update (equalsverifier 2.2, guava 21, javassist 3.21, ... Tue, 13 Dec 2016 22:04:00 GMT Don-vip [11391] * trunk/.classpath (modified) * trunk/netbeans/nbproject/project.properties (modified) * trunk/test/lib/equalsverifier-2.1.6.jar (deleted) * trunk/test/lib/equalsverifier-2.1.8.jar (added) update to equalsverifier 2.1.8 Sun, 30 Oct 2016 22:00:42 GMT Don-vip [11200] * trunk/.classpath (modified) * trunk/build.xml (modified) * trunk/test/lib/equalsverifier-2.1.5.jar (deleted) * trunk/test/lib/equalsverifier-2.1.6.jar (added) * trunk/tools/checkstyle/checkstyle-7.1.2-all.jar (deleted) * trunk/tools/checkstyle/checkstyle-7.2-all.jar (added) tools update (checkstyle 7.2, equalsverifier 2.1.6) Sat, 08 Oct 2016 01:22:40 GMT Don-vip [11101] * trunk/.classpath (modified) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (modified) * trunk/test/lib/system-rules-1.16.0.jar (added) * trunk/test/unit/org/openstreetmap/josm/actions/DeleteLayerActionTest.java (added) * trunk/test/unit/org/openstreetmap/josm/actions/ExitActionTest.java (added) add more unit tests Sat, 10 Sep 2016 02:17:08 GMT Don-vip [10984] * trunk/.classpath (modified) * trunk/test/lib/unitils-core/commons-collections-3.2.2.jar (added) * trunk/test/lib/unitils-core/commons-collections-3.2.jar (deleted) * trunk/test/lib/unitils-core/commons-lang-2.3.jar (deleted) * trunk/test/lib/unitils-core/commons-lang-2.6.jar (added) * trunk/test/lib/unitils-core/commons-logging-1.1.3.jar (added) * trunk/test/lib/unitils-core/commons-logging-1.1.jar (deleted) * trunk/test/lib/unitils-core/unitils-core-3.4.2.jar (deleted) * trunk/test/lib/unitils-core/unitils-core-3.4.3.jar (added) update unitils-core and some of its dependencies Sat, 06 Aug 2016 22:17:48 GMT Don-vip [10753] * trunk/.classpath (modified) * trunk/netbeans/nbproject/project.properties (modified) * trunk/test/lib/equalsverifier-2.1.3.jar (deleted) * trunk/test/lib/equalsverifier-2.1.5.jar (added) update to equalsverifier 2.1.5 Sun, 17 Jul 2016 18:09:28 GMT Don-vip [10555] * trunk/.classpath (modified) * trunk/test/lib/equalsverifier-2.1.1.jar (deleted) * trunk/test/lib/equalsverifier-2.1.3.jar (added) update to equalsverifier 2.1.3 Wed, 15 Jun 2016 14:24:26 GMT Don-vip [10385] * trunk/.classpath (modified) * trunk/test/lib/equalsverifier-2.1.1.jar (added) * trunk/test/lib/equalsverifier-2.1.jar (deleted) update to EqualsVerifier 2.1.1 Mon, 23 May 2016 10:22:01 GMT Don-vip [10266] * trunk/.classpath (modified) * trunk/test/lib/equalsverifier-2.0.2.jar (deleted) * trunk/test/lib/equalsverifier-2.1.jar (added) update to equalsverifier 2.1 Sun, 03 Apr 2016 15:52:07 GMT Don-vip [10107] * trunk/.classpath (modified) * trunk/test/lib/equalsverifier-2.0.1.jar (deleted) * trunk/test/lib/equalsverifier-2.0.2.jar (added) update to EqualsVerifier 2.0.2 Sat, 19 Mar 2016 19:33:44 GMT bastiK [10020] * trunk/test/lib/reflections (added) * trunk/test/lib/reflections/guava-19.0.jar (added) * trunk/test/lib/reflections/javassist-3.20.0-GA.jar (added) * trunk/test/lib/reflections/reflections-0.9.10.jar (added) * trunk/test/unit/org/openstreetmap/josm/gui/TableCellRendererTest.java (added) see #6301 - add test that checks ... Sun, 13 Mar 2016 20:56:11 GMT Don-vip [9984] * trunk/.classpath (modified) * trunk/test/lib/equalsverifier-2.0.1.jar (added) * trunk/test/lib/equalsverifier-2.0.jar (deleted) update to equalsverifier 2.0.1 Sun, 06 Mar 2016 22:01:19 GMT Don-vip [9943] * trunk/.classpath (modified) * trunk/test/lib/equalsverifier-1.7.6.jar (deleted) * trunk/test/lib/equalsverifier-2.0.jar (added) * trunk/test/unit/org/openstreetmap/josm/command/AddCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/AddPrimitivesCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/ChangeCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/ChangeNodesCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyKeyCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/CommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/DeleteCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/MoveCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/PurgeCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/RemoveNodesCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/RotateCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/ScaleCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/SelectCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/SequenceCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/TransformNodesCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictResolveCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/conflict/TagConflictResolveCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommandTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java (modified) update to equalsverifier 2.0 Wed, 30 Dec 2015 02:21:52 GMT Don-vip [9220] * trunk/.classpath (modified) * trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java (modified) * trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (modified) * trunk/test/lib/equalsverifier-1.7.6.jar (added) * trunk/test/lib/unitils-core/unitils-core-3.3.jar (deleted) * trunk/test/lib/unitils-core/unitils-core-3.4.2.jar (added) * trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthTokenTest.java (modified) update unitils-core to 3.4.2, increase unit test coverage with ... Sun, 04 Oct 2015 22:20:23 GMT Don-vip [8825] * trunk/README (modified) * trunk/test/lib/junit/junit-4.11.jar (deleted) * trunk/test/lib/junit/junit-4.12.jar (added) update to JUnit 4.12 Sat, 10 Aug 2013 16:20:16 GMT Don-vip [6133] * trunk/.classpath (modified) * trunk/build.xml (modified) * trunk/test (modified) * trunk/test/lib/junit/README.txt (deleted) * trunk/test/lib/junit/cpl-v10.html (deleted) * trunk/test/lib/junit/hamcrest-core-1.3.jar (added) * trunk/test/lib/junit/junit-4.11.jar (added) * trunk/test/lib/junit/junit-4.6.jar (deleted) * trunk/test/lib/unitils-core/junit-4.4.jar (deleted) * trunk/test/lib/unitils-core/unitils-core-3.1.jar (deleted) * trunk/test/lib/unitils-core/unitils-core-3.3.jar (added) * trunk/tools/jacocoant.jar (added) update build.xml / test environment: - cleanup of build.xml - ... Tue, 27 Dec 2011 18:29:13 GMT jttt [4728] * trunk/.classpath (modified) * trunk/build.xml (modified) * trunk/src/org/jdesktop (added) * trunk/src/org/jdesktop/swinghelper (added) * trunk/src/org/jdesktop/swinghelper/debug (added) * trunk/src/org/jdesktop/swinghelper/debug/CheckThreadViolationRepaintManager.java (added) * trunk/test/lib/fest/debug-1.0.jar (moved) Fix #7192: compile error Tue, 27 Dec 2011 15:22:45 GMT jttt [4722] * trunk/build.xml (modified) * trunk/lib/debug-1.0.jar (moved) Fix #7192 compile error Sun, 07 Aug 2011 07:08:29 GMT jttt [4282] * trunk/.classpath (modified) * trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified) * trunk/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java (modified) * trunk/src/org/openstreetmap/josm/data/preferences/BooleanProperty.java (modified) * trunk/src/org/openstreetmap/josm/data/preferences/CachedProperty.java (added) * trunk/src/org/openstreetmap/josm/data/preferences/CollectionProperty.java (modified) * trunk/src/org/openstreetmap/josm/data/preferences/IntegerProperty.java (modified) * trunk/src/org/openstreetmap/josm/data/preferences/StringProperty.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java (modified) * trunk/src/org/openstreetmap/josm/tools/template_engine (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/ParseError.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/SearchExpressionCondition.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/StaticText.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateEngineDataProvider.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateEntry.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateParser.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/Tokenizer.java (added) * trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java (added) * trunk/test/lib/unitils-core (added) * trunk/test/lib/unitils-core/commons-collections-3.2.jar (added) * trunk/test/lib/unitils-core/commons-lang-2.3.jar (added) * trunk/test/lib/unitils-core/commons-logging-1.1.jar (added) * trunk/test/lib/unitils-core/junit-4.4.jar (added) * trunk/test/lib/unitils-core/ognl-2.6.9.jar (added) * trunk/test/lib/unitils-core/unitils-core-3.1.jar (added) * trunk/test/unit/org/openstreetmap/josm/tools (added) * trunk/test/unit/org/openstreetmap/josm/tools/template_engine (added) * trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java (added) Allow to specify custom pattern for marker text labels Fri, 08 Jan 2010 10:26:03 GMT stoecker [2774] * trunk/test/lib/jfcunit.jar (moved) mv unit test lib into correct path Sat, 27 Jun 2009 12:03:30 GMT Gubaer [1707] * trunk/test/functional/org/openstreetmap/josm/gui (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergerTest.java (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/properties (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergerTest.java (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation/RelationMemberMergerTest.java (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/tags (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/tags/TagMergerTest.java (added) * trunk/test/functional/org/openstreetmap/josm/gui/dialogs (added) * trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java (added) * trunk/test/functional/org/openstreetmap/josm/gui/history (added) * trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (added) * trunk/test/lib (added) * trunk/test/lib/fest (added) * trunk/test/lib/fest/LICENSE-2.0.txt (added) * trunk/test/lib/fest/MRJToolkitStubs-1.0.jar (added) * trunk/test/lib/fest/README.txt (added) * trunk/test/lib/fest/debug-1.0.jar (added) * trunk/test/lib/fest/fest-assert-1.0.jar (added) * trunk/test/lib/fest/fest-reflect-1.1.jar (added) * trunk/test/lib/fest/fest-swing-1.1.jar (added) * trunk/test/lib/fest/fest-util-1.0.jar (added) * trunk/test/lib/fest/jcip-annotations-1.0.jar (added) * trunk/test/lib/junit (added) * trunk/test/lib/junit/README.txt (added) * trunk/test/lib/junit/cpl-v10.html (added) * trunk/test/lib/junit/junit-4.6.jar (added) * trunk/test/unit/build.xml (added) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) test cases and test libraries (JUnit 4.6 and FEST)