Index: trunk/test/unit/org/openstreetmap/TestUtils.java
===================================================================
--- trunk/test/unit/org/openstreetmap/TestUtils.java	(revision 7066)
+++ 	(revision )
@@ -1,67 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Map;
-
-import org.junit.Test;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.tools.TextTagParser;
-
-public class TestUtils {
-
-    /**
-     * Returns the path to test data root directory.
-     */
-    public static String getTestDataRoot() {
-        String testDataRoot = System.getProperty("josm.test.data");
-        if (testDataRoot == null || testDataRoot.isEmpty()) {
-            testDataRoot = "test/data";
-            System.out.println("System property josm.test.data is not set, using '" + testDataRoot + "'");
-        }
-        return testDataRoot.endsWith("/") ? testDataRoot : testDataRoot + "/";
-    }
-
-    public static OsmPrimitive createPrimitive(String assertion) {
-        if (Main.pref == null) {
-            Main.initApplicationPreferences();
-        }
-        final String[] x = assertion.split("\\s+", 2);
-        final OsmPrimitive p = "n".equals(x[0]) || "node".equals(x[0])
-                ? new Node()
-                : "w".equals(x[0]) || "way".equals(x[0])
-                ? new Way()
-                : "r".equals(x[0]) || "relation".equals(x[0])
-                ? new Relation()
-                : null;
-        if (p == null) {
-            throw new IllegalArgumentException("Expecting n/node/w/way/r/relation, but got " + x[0]);
-        }
-        for (final Map.Entry<String, String> i : TextTagParser.readTagsFromText(x[1]).entrySet()) {
-            p.put(i.getKey(), i.getValue());
-        }
-        return p;
-    }
-
-    @Test
-    public void testCreatePrimitive() throws Exception {
-        final OsmPrimitive p = createPrimitive("way name=Foo railway=rail");
-        assertTrue(p instanceof Way);
-        assertThat(p.keySet().size(), is(2));
-        assertThat(p.get("name"), is("Foo"));
-        assertThat(p.get("railway"), is("rail"));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testCreatePrimitiveFail() throws Exception {
-        TestUtils.createPrimitive("noway name=Foo");
-    }
-
-}
Index: trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 7068)
+++ trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 7068)
@@ -0,0 +1,68 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm;
+
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.text.MessageFormat;
+import java.util.logging.Logger;
+
+import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.tools.I18n;
+
+public class JOSMFixture {
+    static private final Logger logger = Logger.getLogger(JOSMFixture.class.getName());
+
+    static public JOSMFixture createUnitTestFixture() {
+        return new JOSMFixture("test/config/unit-josm.home");
+    }
+
+    static public JOSMFixture createFunctionalTestFixture() {
+        return new JOSMFixture("test/config/functional-josm.home");
+    }
+
+    static public JOSMFixture createPerformanceTestFixture() {
+        return new JOSMFixture("test/config/performance-josm.home");
+    }
+
+    private final String josmHome;
+
+    public JOSMFixture(String josmHome) {
+        this.josmHome = josmHome;
+    }
+
+    public void init() {
+
+        // check josm.home
+        //
+        if (josmHome == null) {
+            fail(MessageFormat.format("property ''{0}'' not set in test environment", "josm.home"));
+        } else {
+            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));
+            }
+        }
+        System.setProperty("josm.home", josmHome);
+        Main.initApplicationPreferences();
+        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);
+
+        // init projection
+        Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
+
+        // make sure we don't upload to or test against production
+        //
+        String url = OsmApi.getOsmApi().getBaseUrl().toLowerCase().trim();
+        if (url.startsWith("http://www.openstreetmap.org") || url.startsWith("http://api.openstreetmap.org")
+            || url.startsWith("https://www.openstreetmap.org") || url.startsWith("https://api.openstreetmap.org")) {
+            fail(MessageFormat.format("configured server url ''{0}'' seems to be a productive url, aborting.", url));
+        }
+    }
+}
Index: trunk/test/unit/org/openstreetmap/josm/TestUtils.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/TestUtils.java	(revision 7068)
+++ trunk/test/unit/org/openstreetmap/josm/TestUtils.java	(revision 7068)
@@ -0,0 +1,67 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Map;
+
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.tools.TextTagParser;
+
+public class TestUtils {
+
+    /**
+     * Returns the path to test data root directory.
+     */
+    public static String getTestDataRoot() {
+        String testDataRoot = System.getProperty("josm.test.data");
+        if (testDataRoot == null || testDataRoot.isEmpty()) {
+            testDataRoot = "test/data";
+            System.out.println("System property josm.test.data is not set, using '" + testDataRoot + "'");
+        }
+        return testDataRoot.endsWith("/") ? testDataRoot : testDataRoot + "/";
+    }
+
+    public static OsmPrimitive createPrimitive(String assertion) {
+        if (Main.pref == null) {
+            Main.initApplicationPreferences();
+        }
+        final String[] x = assertion.split("\\s+", 2);
+        final OsmPrimitive p = "n".equals(x[0]) || "node".equals(x[0])
+                ? new Node()
+                : "w".equals(x[0]) || "way".equals(x[0])
+                ? new Way()
+                : "r".equals(x[0]) || "relation".equals(x[0])
+                ? new Relation()
+                : null;
+        if (p == null) {
+            throw new IllegalArgumentException("Expecting n/node/w/way/r/relation, but got " + x[0]);
+        }
+        for (final Map.Entry<String, String> i : TextTagParser.readTagsFromText(x[1]).entrySet()) {
+            p.put(i.getKey(), i.getValue());
+        }
+        return p;
+    }
+
+    @Test
+    public void testCreatePrimitive() throws Exception {
+        final OsmPrimitive p = createPrimitive("way name=Foo railway=rail");
+        assertTrue(p instanceof Way);
+        assertThat(p.keySet().size(), is(2));
+        assertThat(p.get("name"), is("Foo"));
+        assertThat(p.get("railway"), is("rail"));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testCreatePrimitiveFail() throws Exception {
+        TestUtils.createPrimitive("noway name=Foo");
+    }
+
+}
Index: trunk/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.groovy	(revision 7066)
+++ trunk/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.groovy	(revision 7068)
@@ -1,6 +1,6 @@
 package org.openstreetmap.josm.actions
 
-import org.openstreetmap.TestUtils
 import org.openstreetmap.josm.Main
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.actions.search.SearchCompiler
 import org.openstreetmap.josm.data.osm.Relation
Index: trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java	(revision 7066)
+++ trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java	(revision 7068)
@@ -6,11 +6,7 @@
 import org.junit.Test;
 
-/**
- * @author Vincent
- *
- */
 public class LatLonTest {
 
-    protected static final double[] sampleValues = new double[]{
+    public static final double[] SAMPLE_VALUES = new double[]{
             -180.0, -179.9, -179.6, -179.5, -179.4, -179.1, -179.0, -100.0, -99.9, -10.0, -9.9, -1.0, -0.1,
             180.0,  179.9,  179.6,  179.5,  179.4,  179.1,  179.0,  100.0,  99.9,  10.0,  9.9,  1.0,  0.1,
@@ -20,5 +16,5 @@
             100.12, 100.123, 100.1234, 100.12345, 100.123456, 100.1234567
            };
-    
+
     /**
      * Test of {@link LatLon#roundToOsmPrecisionStrict}
@@ -26,12 +22,12 @@
     @Test
     public void testRoundToOsmPrecisionStrict() {
-        
-        for (double value : sampleValues) {
+
+        for (double value : SAMPLE_VALUES) {
             assertEquals(LatLon.roundToOsmPrecisionStrict(value), value, 0);
         }
-        
+
         assertEquals(LatLon.roundToOsmPrecisionStrict(0.0), 0.0, 0);
         assertEquals(LatLon.roundToOsmPrecisionStrict(-0.0), 0.0, 0);
-        
+
         assertEquals(LatLon.roundToOsmPrecisionStrict(0.12345678),  0.1234568, 0);
         assertEquals(LatLon.roundToOsmPrecisionStrict(0.123456789), 0.1234568, 0);
@@ -76,5 +72,5 @@
         assertEquals(LatLon.roundToOsmPrecisionStrict(99.9999999),  99.9999999, 0);
     }
-    
+
     /**
      * Test of {@link LatLon#toIntervalLon}
@@ -107,7 +103,7 @@
     @Test
     public void testEquals() {
-        for (int i = 1; i < sampleValues.length; i++) {
-            LatLon a = new LatLon(sampleValues[i-1], sampleValues[i]);
-            LatLon b = new LatLon(sampleValues[i-1], sampleValues[i]);
+        for (int i = 1; i < SAMPLE_VALUES.length; i++) {
+            LatLon a = new LatLon(SAMPLE_VALUES[i-1], SAMPLE_VALUES[i]);
+            LatLon b = new LatLon(SAMPLE_VALUES[i-1], SAMPLE_VALUES[i]);
             assertEquals(a, b);
         }
@@ -119,7 +115,7 @@
     @Test
     public void testHashCode() {
-        for (int i = 1; i < sampleValues.length; i++) {
-            LatLon a = new LatLon(sampleValues[i-1], sampleValues[i]);
-            LatLon b = new LatLon(sampleValues[i-1], sampleValues[i]);
+        for (int i = 1; i < SAMPLE_VALUES.length; i++) {
+            LatLon a = new LatLon(SAMPLE_VALUES[i-1], SAMPLE_VALUES[i]);
+            LatLon b = new LatLon(SAMPLE_VALUES[i-1], SAMPLE_VALUES[i]);
             assertEquals(a.hashCode(), b.hashCode());
         }
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.groovy	(revision 7066)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.groovy	(revision 7068)
@@ -1,5 +1,5 @@
 package org.openstreetmap.josm.data.validation.tests
 
-import org.openstreetmap.TestUtils
+import org.openstreetmap.josm.TestUtils;
 
 class LanesTest extends GroovyTestCase {
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java	(revision 7066)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java	(revision 7068)
@@ -13,8 +13,8 @@
 import java.util.Map;
 
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openstreetmap.TestUtils;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.data.osm.Node;
@@ -31,6 +31,6 @@
      * Setup test.
      */
-    @Before
-    public void setUp() throws Exception {
+    @BeforeClass
+    public static void setUp() {
         Main.initApplicationPreferences();
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.groovy	(revision 7066)
+++ trunk/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.groovy	(revision 7068)
@@ -2,86 +2,86 @@
 package org.openstreetmap.josm.gui;
 
-import org.junit.BeforeClass;
-import org.junit.Test 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.UserInfo;
-import org.openstreetmap.josm.fixtures.JOSMFixture;
-
-import static org.junit.Assert.*;
+import static org.junit.Assert.*
+
+import org.junit.BeforeClass
+import org.junit.Test
+import org.openstreetmap.josm.JOSMFixture
+import org.openstreetmap.josm.Main
+import org.openstreetmap.josm.data.osm.UserInfo
 
 class JosmUserIdentityManagerTest {
-	
+
 	final shouldFail = new GroovyTestCase().&shouldFail
-	
+
 	private static JOSMFixture josmFixture
-	
+
 	@BeforeClass
 	public static void initTestCase() {
 	    josmFixture = JOSMFixture.createFunctionalTestFixture()
 	}
-	
+
 	@Test
 	public void test_SingletonAccess() {
-		
-		JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()		
+
+		JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
 
 		// created ?
 		assert im != null
-		
-		// registered as listener ? 
+
+		// registered as listener ?
 		assert Main.pref.@listeners.contains(im)
-		
+
 		JosmUserIdentityManager im2 = JosmUserIdentityManager.getInstance()
 
 		// only one instance
-		assert im == im2		
-	}
-	
+		assert im == im2
+	}
+
 	@Test
 	public void test_setAnonymouse() {
 		JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
-		
+
 		im.setPartiallyIdentified "test"
 		im.setAnonymous()
-				
+
 		assert im.isAnonymous()
 		assert ! im.isPartiallyIdentified()
 		assert ! im.isFullyIdentified()
-		
+
 		assert im.getUserId() == 0
 		assert im.getUserName() == null
 		assert im.getUserInfo() == null
 	}
-	
+
 	@Test
 	public void test_setPartiallyIdentified() {
 		JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
-		
+
 		im.setPartiallyIdentified "test"
-		
+
 		shouldFail(IllegalArgumentException) {
 		    im.setPartiallyIdentified null
 		}
-		
+
 		shouldFail(IllegalArgumentException) {
 			im.setPartiallyIdentified ""
 		}
-		
+
 		shouldFail(IllegalArgumentException) {
 			im.setPartiallyIdentified "  \t  "
 		}
-		
+
 		im.setPartiallyIdentified "test"
-		
+
 		assert ! im.isAnonymous()
 		assert im.isPartiallyIdentified()
 		assert ! im.isFullyIdentified()
-		
+
 		assert im.getUserId() == 0
 		assert im.getUserName() == "test"
 		assert im.getUserInfo() == null
 	}
-	
-	
+
+
 	@Test
 	public void test_setFullyIdentified() {
@@ -89,7 +89,7 @@
 
 		UserInfo userInfo = new UserInfo(id: 1, description: "a description")
-		
+
 		im.setFullyIdentified "test", userInfo
-		
+
 		shouldFail(IllegalArgumentException) {
 			im.setFullyIdentified null, userInfo
@@ -104,63 +104,63 @@
 			im.setFullyIdentified "test", null
 		}
-		
+
 		im.setFullyIdentified "test", userInfo
-		
+
 		assert ! im.isAnonymous()
 		assert ! im.isPartiallyIdentified()
 		assert im.isFullyIdentified()
-		
+
 		assert im.getUserId() == 1
 		assert im.getUserName() == "test"
 		assert im.getUserInfo() == userInfo
 	}
-	
+
 	/**
 	 * Preferences include neither an url nor a user name => we have
-	 * an anonymous user 
-	 */
-	@Test 
+	 * an anonymous user
+	 */
+	@Test
 	public void initFromPreferences_1() {
 		JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
-		
-		// reset it 
-		im.@userName = null
-		im.@userInfo = null
-		
+
+		// reset it
+		im.@userName = null
+		im.@userInfo = null
+
 		Main.pref.put "osm-server.url", null
 		Main.pref.put "osm-server.username", null
-		
-		im.initFromPreferences()
-		
-		assert im.isAnonymous()
-	}
-	
+
+		im.initFromPreferences()
+
+		assert im.isAnonymous()
+	}
+
 	/**
 	 * Preferences include neither an url nor a user name => we have
-	 * an annoymous user 
-	 */
-	@Test 
+	 * an annoymous user
+	 */
+	@Test
 	public void initFromPreferences_2() {
 		JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
-		
-		// reset it 
-		im.@userName = null
-		im.@userInfo = null
-		
+
+		// reset it
+		im.@userName = null
+		im.@userInfo = null
+
 		// for this test we disable the listener
 		Main.pref.removePreferenceChangeListener im
-		
-		Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
-		Main.pref.put "osm-server.username", null
-		
-		im.initFromPreferences()
-		
-		assert im.isAnonymous()
-	}
-	
-	/**
-	 * Preferences include an user name => we have a partially identified user 
-	 */
-	@Test 
+
+		Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
+		Main.pref.put "osm-server.username", null
+
+		im.initFromPreferences()
+
+		assert im.isAnonymous()
+	}
+
+	/**
+	 * Preferences include an user name => we have a partially identified user
+	 */
+	@Test
 	public void initFromPreferences_3() {
 		JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
@@ -169,22 +169,22 @@
 		Main.pref.removePreferenceChangeListener im
 
-		// reset it 
-		im.@userName = null
-		im.@userInfo = null
-		
+		// reset it
+		im.@userName = null
+		im.@userInfo = null
+
 		Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
 		Main.pref.put "osm-server.username", "test"
-		
-		im.initFromPreferences()
-		
-		assert im.isPartiallyIdentified()
-	}
-	
+
+		im.initFromPreferences()
+
+		assert im.isPartiallyIdentified()
+	}
+
 	/**
 	 * Preferences include an user name which is different from the current
 	 * user name and we are currently fully identifed => josm user becomes
-	 * partially identified  
-	 */
-	@Test 
+	 * partially identified
+	 */
+	@Test
 	public void initFromPreferences_4() {
 		JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
@@ -194,13 +194,13 @@
 
 		im.setFullyIdentified "test1", new UserInfo(id: 1)
-		
+
 		Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
 		Main.pref.put "osm-server.username", "test2"
-		
-		im.initFromPreferences()
-		
-		assert im.isPartiallyIdentified()
-	}
-	
+
+		im.initFromPreferences()
+
+		assert im.isPartiallyIdentified()
+	}
+
 	/**
 	 * Preferences include an user name which is the same as the current
@@ -208,5 +208,5 @@
 	 * fully identified
 	 */
-	@Test 
+	@Test
 	public void initFromPreferences_5() {
 		JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
@@ -214,104 +214,104 @@
         // for this test we disable the listener
 		Main.pref.removePreferenceChangeListener im
-    	
+
 		im.setFullyIdentified "test1", new UserInfo(id: 1)
-		
+
 		Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
 		Main.pref.put "osm-server.username", "test1"
-		
-		im.initFromPreferences()
-		
+
+		im.initFromPreferences()
+
 		assert im.isFullyIdentified()
 	}
-	
-	@Test 
+
+	@Test
 	public void apiUrlChanged() {
 		JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
-		
-		// make sure im is a preference change listener 
+
+		// make sure im is a preference change listener
 		Main.pref.addPreferenceChangeListener im
-		
-		// reset it 
-		im.@userName = null
-		im.@userInfo = null
-				
-		Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
-		assert im.isAnonymous()
-		
+
+		// reset it
+		im.@userName = null
+		im.@userInfo = null
+
+		Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
+		assert im.isAnonymous()
+
          Main.pref.put "osm-server.url", null
          assert im.isAnonymous()
-		
-		// reset it 
+
+		// reset it
 		im.@userName = "test"
 		im.@userInfo = null
-		
-		Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
-		assert im.isPartiallyIdentified()
-		assert im.getUserName() == "test"
-		
+
+		Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
+		assert im.isPartiallyIdentified()
+		assert im.getUserName() == "test"
+
 		Main.pref.put "osm-server.url", null
 		assert im.isAnonymous()
-		
-		// reset it 
+
+		// reset it
 		im.@userName = "test"
 		im.@userInfo = new UserInfo(id:1)
-		
-		Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
-		assert im.isPartiallyIdentified()
-		assert im.getUserName() == "test"
-		
-		// reset it 
+
+		Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
+		assert im.isPartiallyIdentified()
+		assert im.getUserName() == "test"
+
+		// reset it
 		im.@userName = "test"
 		im.@userInfo = new UserInfo(id:1)
-		
-		
+
+
 		Main.pref.put "osm-server.url", null
-		assert im.isAnonymous()				
-	}
-	
-	@Test 
+		assert im.isAnonymous()
+	}
+
+	@Test
 	public void userNameChanged() {
 		JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
-		
-		// make sure im is a preference change listener 
+
+		// make sure im is a preference change listener
 		Main.pref.addPreferenceChangeListener im
-		
-		// reset it 
-		im.@userName = null
-		im.@userInfo = null
-		
+
+		// reset it
+		im.@userName = null
+		im.@userInfo = null
+
 		Main.pref.put "osm-server.username", "test"
 		assert im.isPartiallyIdentified()
 		assert im.getUserName() == "test"
-		
-		Main.pref.put "osm-server.username", null
-		assert im.isAnonymous()
-		
-		// reset it 
+
+		Main.pref.put "osm-server.username", null
+		assert im.isAnonymous()
+
+		// reset it
 		im.@userName = "test1"
 		im.@userInfo = null
-		
+
 		Main.pref.put "osm-server.username", "test2"
 		assert im.isPartiallyIdentified()
 		assert im.getUserName() == "test2"
-		
-		Main.pref.put "osm-server.username", null
-		assert im.isAnonymous()
-		
-		// reset it 
+
+		Main.pref.put "osm-server.username", null
+		assert im.isAnonymous()
+
+		// reset it
 		im.@userName = "test1"
 		im.@userInfo = new UserInfo(id:1)
-		
+
 		Main.pref.put "osm-server.username", "test2"
 		assert im.isPartiallyIdentified()
 		assert im.getUserName() == "test2"
-		
-		// reset it 
+
+		// reset it
 		im.@userName = "test1"
 		im.@userInfo = new UserInfo(id:1)
-		
-		
-		Main.pref.put "osm-server.username", null
-		assert im.isAnonymous()             
+
+
+		Main.pref.put "osm-server.username", null
+		assert im.isAnonymous()
 	}
 }
Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategyTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategyTest.groovy	(revision 7066)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategyTest.groovy	(revision 7068)
@@ -3,5 +3,5 @@
 
 import org.junit.*
-import org.openstreetmap.josm.fixtures.JOSMFixture;
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.DeriveLabelFromNameTagsCompositionStrategy 
 import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.StaticLabelCompositionStrategy;
Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy	(revision 7066)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy	(revision 7068)
@@ -4,5 +4,5 @@
 
 import org.junit.*
-import org.openstreetmap.josm.fixtures.JOSMFixture
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.DeriveLabelFromNameTagsCompositionStrategy
 import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.TagLookupCompositionStrategy
Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.groovy	(revision 7066)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.groovy	(revision 7068)
@@ -7,4 +7,5 @@
 
 import org.junit.*
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.coor.LatLon
 import org.openstreetmap.josm.data.osm.DataSet
@@ -13,5 +14,4 @@
 import org.openstreetmap.josm.data.osm.RelationMember
 import org.openstreetmap.josm.data.osm.Way
-import org.openstreetmap.josm.fixtures.JOSMFixture
 import org.openstreetmap.josm.gui.mappaint.Environment
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.ChildOrParentSelector
Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy	(revision 7066)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy	(revision 7068)
@@ -5,4 +5,5 @@
 
 import org.junit.*
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.coor.LatLon
 import org.openstreetmap.josm.data.osm.DataSet
@@ -10,5 +11,4 @@
 import org.openstreetmap.josm.data.osm.Relation
 import org.openstreetmap.josm.data.osm.RelationMember
-import org.openstreetmap.josm.fixtures.JOSMFixture
 import org.openstreetmap.josm.gui.mappaint.Environment
 import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.Context
Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy	(revision 7066)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy	(revision 7068)
@@ -5,4 +5,5 @@
 
 import org.junit.*
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.coor.LatLon
 import org.openstreetmap.josm.data.osm.DataSet
@@ -10,5 +11,4 @@
 import org.openstreetmap.josm.data.osm.Relation
 import org.openstreetmap.josm.data.osm.RelationMember
-import org.openstreetmap.josm.fixtures.JOSMFixture
 import org.openstreetmap.josm.gui.mappaint.Environment
 import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.Context
Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy	(revision 7066)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy	(revision 7068)
@@ -5,6 +5,6 @@
 import org.junit.Before
 import org.junit.Test
-import org.openstreetmap.TestUtils
 import org.openstreetmap.josm.Main
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon
 import org.openstreetmap.josm.data.osm.DataSet
Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ParsingLinkSelectorTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ParsingLinkSelectorTest.groovy	(revision 7066)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ParsingLinkSelectorTest.groovy	(revision 7068)
@@ -5,5 +5,5 @@
 
 import org.junit.*
-import org.openstreetmap.josm.fixtures.JOSMFixture
+import org.openstreetmap.josm.JOSMFixture;
 
 
Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java	(revision 7066)
+++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java	(revision 7068)
@@ -13,6 +13,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openstreetmap.TestUtils;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;