Changeset 2748 in josm for trunk/test

Timestamp:

2010-01-06T20:35:56+01:00 (15 years ago)

Author:

Gubaer

Message:

new: JOSM now supports OAuth

See also online help for server preferences and new OAuth Authorisation Wizard

Location:

trunk/test

Files:

• config/test-functional-env.properties (modified) (2 diffs)
• functional/org/openstreetmap/josm/fixtures/JOSMFixture.java (modified) (3 diffs)

trunk/test/config/test-functional-env.properties

@@ -9 +9 @@
 # This is the home directory for JOSM plugins: ${josm.home}\plugins\*.jar
 #
-josm.home=C:\\data\\projekte\\osm\\tag-editor-plugin
+josm.home=C:\\data\\projekte\\osm\\josm-dev
 
 
@@ -16 +16 @@
 #   temporary results 
 #
-test.functional.tempdir=C:\\data\\projekte\\eclipse-3.4.1-ws\\JOSM-1769\\test\\data\\temp
+test.functional.tempdir=C:\\data\\projekte\\osm\\josm-dev\\temp
 

trunk/test/functional/org/openstreetmap/josm/fixtures/JOSMFixture.java

@@ -14 +14 @@
 import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.tools.I18n;
 
 public class JOSMFixture {
@@ -42 +43 @@
         } catch(Exception e){
             logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", testPropertiesResourceName));
-            fail(MessageFormat.format("failed to load property file ''{0}''", testPropertiesResourceName));
+            fail(MessageFormat.format("failed to load property file ''{0}''. \nMake sure the path ''$project_root/test/config'' is on the classpath.", testPropertiesResourceName));
         }
 
@@ -53 +54 @@
             File f = new File(josmHome);
             if (! f.exists() || ! f.canRead()) {
-                fail(MessageFormat.format("property ''{0}'' points to ''{1}'' which is either not existing or not readable", "josm.home", josmHome));
+                fail(MessageFormat.format("property ''{0}'' points to ''{1}'' which is either not existing or not readable.\nEdit ''{2}'' and update the value ''josm.home''. ", "josm.home", josmHome,testPropertiesResourceName ));
             }
         }
         System.setProperty("josm.home", josmHome);
+        I18n.init();
+        // initialize the plaform hook, and
+        Main.determinePlatformHook();
+        // call the really early hook before we anything else
+        Main.platform.preStartupHook();
+
         Main.pref.init(false);