Index: trunk/test/unit/org/openstreetmap/josm/data/UserIdentityManagerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/UserIdentityManagerTest.java	(revision 12743)
+++ trunk/test/unit/org/openstreetmap/josm/data/UserIdentityManagerTest.java	(revision 12743)
@@ -0,0 +1,386 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.User;
+import org.openstreetmap.josm.data.osm.UserInfo;
+
+/**
+ * Unit tests of {@link UserIdentityManager} class.
+ */
+public class UserIdentityManagerTest {
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void initTestCase() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
+
+    private static UserInfo newUserInfo() {
+        return newUserInfo(1, "a description");
+    }
+
+    private static UserInfo newUserInfo(int id, String description) {
+        UserInfo userInfo = new UserInfo();
+        userInfo.setId(id);
+        userInfo.setDescription(description);
+        return userInfo;
+    }
+
+    /**
+     * Test singleton access.
+     */
+    @Test
+    public void testSingletonAccess() {
+
+        UserIdentityManager im = UserIdentityManager.getInstance();
+
+        // created ?
+        assertNotNull(im);
+
+        UserIdentityManager im2 = UserIdentityManager.getInstance();
+
+        // only one instance
+        assertSame(im, im2);
+    }
+
+    /**
+     * Unit test of {@link UserIdentityManager#setAnonymous}.
+     */
+    @Test
+    public void testSetAnonymous() {
+        UserIdentityManager im = UserIdentityManager.getInstance();
+
+        im.setPartiallyIdentified("test");
+        im.setAnonymous();
+
+        assertTrue(im.isAnonymous());
+        assertFalse(im.isPartiallyIdentified());
+        assertFalse(im.isFullyIdentified());
+
+        assertEquals(0, im.getUserId());
+        assertNull(im.getUserName());
+        assertNull(im.getUserInfo());
+        assertSame(User.getAnonymous(), im.asUser());
+    }
+
+    /**
+     * Unit test of {@link UserIdentityManager#setPartiallyIdentified} - nominal case.
+     */
+    @Test
+    public void testSetPartiallyIdentified() {
+        UserIdentityManager im = UserIdentityManager.getInstance();
+        im.setPartiallyIdentified("test");
+
+        assertFalse(im.isAnonymous());
+        assertTrue(im.isPartiallyIdentified());
+        assertFalse(im.isFullyIdentified());
+
+        assertEquals(0, im.getUserId());
+        assertEquals("test", im.getUserName());
+        assertNull(im.getUserInfo());
+        User usr = im.asUser();
+        assertEquals(0, usr.getId());
+        assertEquals("test", usr.getName());
+    }
+
+    /**
+     * Unit test of {@link UserIdentityManager#setPartiallyIdentified} - null case.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testSetPartiallyIdentifiedNull() {
+        UserIdentityManager.getInstance().setPartiallyIdentified(null);
+    }
+
+    /**
+     * Unit test of {@link UserIdentityManager#setPartiallyIdentified} - empty case.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testSetPartiallyIdentifiedEmpty() {
+        UserIdentityManager.getInstance().setPartiallyIdentified("");
+    }
+
+    /**
+     * Unit test of {@link UserIdentityManager#setPartiallyIdentified} - blank case.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testSetPartiallyIdentifiedBlank() {
+        UserIdentityManager.getInstance().setPartiallyIdentified("  \t  ");
+    }
+
+    /**
+     * Unit test of {@link UserIdentityManager#setFullyIdentified} - nominal case.
+     */
+    @Test
+    public void testSetFullyIdentified() {
+        UserIdentityManager im = UserIdentityManager.getInstance();
+
+        UserInfo userInfo = newUserInfo();
+
+        im.setFullyIdentified("test", userInfo);
+
+        assertFalse(im.isAnonymous());
+        assertFalse(im.isPartiallyIdentified());
+        assertTrue(im.isFullyIdentified());
+
+        assertEquals(1, im.getUserId());
+        assertEquals("test", im.getUserName());
+        assertEquals(userInfo, im.getUserInfo());
+        User usr = im.asUser();
+        assertEquals(1, usr.getId());
+        assertEquals("test", usr.getName());
+    }
+
+    /**
+     * Unit test of {@link UserIdentityManager#setFullyIdentified} - null name case.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testSetFullyIdentifiedNullName() {
+        UserIdentityManager.getInstance().setFullyIdentified(null, newUserInfo());
+    }
+
+    /**
+     * Unit test of {@link UserIdentityManager#setFullyIdentified} - empty name case.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testSetFullyIdentifiedEmptyName() {
+        UserIdentityManager.getInstance().setFullyIdentified("", newUserInfo());
+    }
+
+    /**
+     * Unit test of {@link UserIdentityManager#setFullyIdentified} - blank name case.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testSetFullyIdentifiedBlankName() {
+        UserIdentityManager.getInstance().setFullyIdentified(" \t ", newUserInfo());
+    }
+
+    /**
+     * Unit test of {@link UserIdentityManager#setFullyIdentified} - null info case.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testSetFullyIdentifiedNullInfo() {
+        UserIdentityManager.getInstance().setFullyIdentified("test", null);
+    }
+
+    /**
+     * Preferences include neither an url nor a user name => we have an anonymous user
+     */
+    @Test
+    public void testInitFromPreferences1() {
+        UserIdentityManager im = UserIdentityManager.getInstance();
+
+        // reset it
+        im.setAnonymous();
+
+        // for this test we disable the listener
+        Main.pref.removePreferenceChangeListener(im);
+
+        try {
+            Main.pref.put("osm-server.url", null);
+            Main.pref.put("osm-server.username", null);
+
+            im.initFromPreferences();
+
+            assertTrue(im.isAnonymous());
+        } finally {
+            Main.pref.addPreferenceChangeListener(im);
+        }
+    }
+
+    /**
+     * Preferences include neither an url nor a user name => we have an anonymous user
+     */
+    @Test
+    public void testInitFromPreferences2() {
+        UserIdentityManager im = UserIdentityManager.getInstance();
+
+        // reset it
+        im.setAnonymous();
+
+        // for this test we disable the listener
+        Main.pref.removePreferenceChangeListener(im);
+
+        try {
+            Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
+            Main.pref.put("osm-server.username", null);
+
+            im.initFromPreferences();
+
+            assertTrue(im.isAnonymous());
+        } finally {
+            Main.pref.addPreferenceChangeListener(im);
+        }
+    }
+
+    /**
+     * Preferences include an user name => we have a partially identified user
+     */
+    @Test
+    public void testInitFromPreferences3() {
+        UserIdentityManager im = UserIdentityManager.getInstance();
+
+        // for this test we disable the listener
+        Main.pref.removePreferenceChangeListener(im);
+
+        try {
+            // reset it
+            im.setAnonymous();
+
+            Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
+            Main.pref.put("osm-server.username", "test");
+
+            im.initFromPreferences();
+
+            assertTrue(im.isPartiallyIdentified());
+        } finally {
+            Main.pref.addPreferenceChangeListener(im);
+        }
+    }
+
+    /**
+     * 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
+    public void testInitFromPreferences4() {
+        UserIdentityManager im = UserIdentityManager.getInstance();
+
+        // for this test we disable the listener
+        Main.pref.removePreferenceChangeListener(im);
+
+        try {
+            im.setFullyIdentified("test1", newUserInfo());
+
+            Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
+            Main.pref.put("osm-server.username", "test2");
+
+            im.initFromPreferences();
+
+            assertTrue(im.isPartiallyIdentified());
+        } finally {
+            Main.pref.addPreferenceChangeListener(im);
+        }
+    }
+
+    /**
+     * Preferences include an user name which is the same as the current
+     * user name and we are currently fully identifed => josm user remains
+     * fully identified
+     */
+    @Test
+    public void testInitFromPreferences5() {
+        UserIdentityManager im = UserIdentityManager.getInstance();
+
+        // for this test we disable the listener
+        Main.pref.removePreferenceChangeListener(im);
+
+        try {
+            im.setFullyIdentified("test1", new UserInfo());
+
+            Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
+            Main.pref.put("osm-server.username", "test1");
+
+            im.initFromPreferences();
+
+            assertTrue(im.isFullyIdentified());
+        } finally {
+            Main.pref.addPreferenceChangeListener(im);
+        }
+    }
+
+    @Test
+    public void testApiUrlChanged() {
+        UserIdentityManager im = UserIdentityManager.getInstance();
+
+        // reset it
+        im.setAnonymous();
+
+        Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
+        assertTrue(im.isAnonymous());
+
+        Main.pref.put("osm-server.url", null);
+        assertTrue(im.isAnonymous());
+
+        // reset it
+        im.setPartiallyIdentified("test");
+
+        Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
+        assertTrue(im.isPartiallyIdentified());
+        assertEquals("test", im.getUserName());
+
+        Main.pref.put("osm-server.url", null);
+        assertTrue(im.isAnonymous());
+
+        // reset it
+        im.setFullyIdentified("test", newUserInfo());
+
+        Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
+        assertTrue(im.isPartiallyIdentified());
+        assertEquals("test", im.getUserName());
+
+        // reset it
+        im.setFullyIdentified("test", newUserInfo());
+
+        Main.pref.put("osm-server.url", null);
+        assertTrue(im.isAnonymous());
+    }
+
+    @Test
+    public void testUserNameChanged() {
+        UserIdentityManager im = UserIdentityManager.getInstance();
+
+        // reset it
+        im.setAnonymous();
+
+        Main.pref.put("osm-server.username", "test");
+        assertTrue(im.isPartiallyIdentified());
+        assertEquals("test", im.getUserName());
+
+        Main.pref.put("osm-server.username", null);
+        assertTrue(im.isAnonymous());
+        assertEquals(User.getAnonymous(), im.asUser());
+
+        // reset it
+        im.setPartiallyIdentified("test1");
+
+        Main.pref.put("osm-server.username", "test2");
+        assertTrue(im.isPartiallyIdentified());
+        assertEquals("test2", im.getUserName());
+        User usr = im.asUser();
+        assertEquals(0, usr.getId());
+        assertEquals("test2", usr.getName());
+
+        Main.pref.put("osm-server.username", null);
+        assertTrue(im.isAnonymous());
+
+        // reset it
+        im.setFullyIdentified("test1", newUserInfo());
+
+        Main.pref.put("osm-server.username", "test2");
+        assertTrue(im.isPartiallyIdentified());
+        assertEquals("test2", im.getUserName());
+        usr = im.asUser();
+        assertEquals(0, usr.getId());
+        assertEquals("test2", usr.getName());
+
+        // reset it
+        im.setFullyIdentified("test1", newUserInfo());
+
+        Main.pref.put("osm-server.username", null);
+        assertTrue(im.isAnonymous());
+    }
+}
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java	(revision 12740)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java	(revision 12743)
@@ -15,5 +15,5 @@
 import org.junit.Test;
 import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.data.UserIdentityManager;
 
 /**
@@ -259,8 +259,8 @@
         assertEquals(3, cache.getChangesets().size());
 
-        JosmUserIdentityManager.getInstance().setAnonymous();
+        UserIdentityManager.getInstance().setAnonymous();
         assertEquals(2, cache.getOpenChangesetsForCurrentUser().size());
 
-        JosmUserIdentityManager.getInstance().setPartiallyIdentified("foo");
+        UserIdentityManager.getInstance().setPartiallyIdentified("foo");
         assertEquals(1, cache.getOpenChangesetsForCurrentUser().size());
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.java	(revision 12740)
+++ 	(revision )
@@ -1,387 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.User;
-import org.openstreetmap.josm.data.osm.UserInfo;
-
-/**
- * Unit tests of {@link JosmUserIdentityManager} class.
- */
-public class JosmUserIdentityManagerTest {
-
-    /**
-     * Setup test.
-     */
-    @BeforeClass
-    public static void initTestCase() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
-
-    private static UserInfo newUserInfo() {
-        return newUserInfo(1, "a description");
-    }
-
-    private static UserInfo newUserInfo(int id, String description) {
-        UserInfo userInfo = new UserInfo();
-        userInfo.setId(id);
-        userInfo.setDescription(description);
-        return userInfo;
-    }
-
-    /**
-     * Test singleton access.
-     */
-    @Test
-    public void testSingletonAccess() {
-
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
-
-        // created ?
-        assertNotNull(im);
-
-        JosmUserIdentityManager im2 = JosmUserIdentityManager.getInstance();
-
-        // only one instance
-        assertSame(im, im2);
-    }
-
-    /**
-     * Unit test of {@link JosmUserIdentityManager#setAnonymous}.
-     */
-    @Test
-    public void testSetAnonymous() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
-
-        im.setPartiallyIdentified("test");
-        im.setAnonymous();
-
-        assertTrue(im.isAnonymous());
-        assertFalse(im.isPartiallyIdentified());
-        assertFalse(im.isFullyIdentified());
-
-        assertEquals(0, im.getUserId());
-        assertNull(im.getUserName());
-        assertNull(im.getUserInfo());
-        assertSame(User.getAnonymous(), im.asUser());
-    }
-
-    /**
-     * Unit test of {@link JosmUserIdentityManager#setPartiallyIdentified} - nominal case.
-     */
-    @Test
-    public void testSetPartiallyIdentified() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
-        im.setPartiallyIdentified("test");
-
-        assertFalse(im.isAnonymous());
-        assertTrue(im.isPartiallyIdentified());
-        assertFalse(im.isFullyIdentified());
-
-        assertEquals(0, im.getUserId());
-        assertEquals("test", im.getUserName());
-        assertNull(im.getUserInfo());
-        User usr = im.asUser();
-        assertEquals(0, usr.getId());
-        assertEquals("test", usr.getName());
-    }
-
-    /**
-     * Unit test of {@link JosmUserIdentityManager#setPartiallyIdentified} - null case.
-     */
-    @Test(expected = IllegalArgumentException.class)
-    public void testSetPartiallyIdentifiedNull() {
-        JosmUserIdentityManager.getInstance().setPartiallyIdentified(null);
-    }
-
-    /**
-     * Unit test of {@link JosmUserIdentityManager#setPartiallyIdentified} - empty case.
-     */
-    @Test(expected = IllegalArgumentException.class)
-    public void testSetPartiallyIdentifiedEmpty() {
-        JosmUserIdentityManager.getInstance().setPartiallyIdentified("");
-    }
-
-    /**
-     * Unit test of {@link JosmUserIdentityManager#setPartiallyIdentified} - blank case.
-     */
-    @Test(expected = IllegalArgumentException.class)
-    public void testSetPartiallyIdentifiedBlank() {
-        JosmUserIdentityManager.getInstance().setPartiallyIdentified("  \t  ");
-    }
-
-    /**
-     * Unit test of {@link JosmUserIdentityManager#setFullyIdentified} - nominal case.
-     */
-    @Test
-    public void testSetFullyIdentified() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
-
-        UserInfo userInfo = newUserInfo();
-
-        im.setFullyIdentified("test", userInfo);
-
-        assertFalse(im.isAnonymous());
-        assertFalse(im.isPartiallyIdentified());
-        assertTrue(im.isFullyIdentified());
-
-        assertEquals(1, im.getUserId());
-        assertEquals("test", im.getUserName());
-        assertEquals(userInfo, im.getUserInfo());
-        User usr = im.asUser();
-        assertEquals(1, usr.getId());
-        assertEquals("test", usr.getName());
-    }
-
-    /**
-     * Unit test of {@link JosmUserIdentityManager#setFullyIdentified} - null name case.
-     */
-    @Test(expected = IllegalArgumentException.class)
-    public void testSetFullyIdentifiedNullName() {
-        JosmUserIdentityManager.getInstance().setFullyIdentified(null, newUserInfo());
-    }
-
-    /**
-     * Unit test of {@link JosmUserIdentityManager#setFullyIdentified} - empty name case.
-     */
-    @Test(expected = IllegalArgumentException.class)
-    public void testSetFullyIdentifiedEmptyName() {
-        JosmUserIdentityManager.getInstance().setFullyIdentified("", newUserInfo());
-    }
-
-    /**
-     * Unit test of {@link JosmUserIdentityManager#setFullyIdentified} - blank name case.
-     */
-    @Test(expected = IllegalArgumentException.class)
-    public void testSetFullyIdentifiedBlankName() {
-        JosmUserIdentityManager.getInstance().setFullyIdentified(" \t ", newUserInfo());
-    }
-
-    /**
-     * Unit test of {@link JosmUserIdentityManager#setFullyIdentified} - null info case.
-     */
-    @Test(expected = IllegalArgumentException.class)
-    public void testSetFullyIdentifiedNullInfo() {
-        JosmUserIdentityManager.getInstance().setFullyIdentified("test", null);
-    }
-
-    /**
-     * Preferences include neither an url nor a user name => we have an anonymous user
-     */
-    @Test
-    public void testInitFromPreferences1() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
-
-        // reset it
-        im.setAnonymous();
-
-        // for this test we disable the listener
-        Main.pref.removePreferenceChangeListener(im);
-
-        try {
-            Main.pref.put("osm-server.url", null);
-            Main.pref.put("osm-server.username", null);
-
-            im.initFromPreferences();
-
-            assertTrue(im.isAnonymous());
-        } finally {
-            Main.pref.addPreferenceChangeListener(im);
-        }
-    }
-
-    /**
-     * Preferences include neither an url nor a user name => we have an anonymous user
-     */
-    @Test
-    public void testInitFromPreferences2() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
-
-        // reset it
-        im.setAnonymous();
-
-        // for this test we disable the listener
-        Main.pref.removePreferenceChangeListener(im);
-
-        try {
-            Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
-            Main.pref.put("osm-server.username", null);
-
-            im.initFromPreferences();
-
-            assertTrue(im.isAnonymous());
-        } finally {
-            Main.pref.addPreferenceChangeListener(im);
-        }
-    }
-
-    /**
-     * Preferences include an user name => we have a partially identified user
-     */
-    @Test
-    public void testInitFromPreferences3() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
-
-        // for this test we disable the listener
-        Main.pref.removePreferenceChangeListener(im);
-
-        try {
-            // reset it
-            im.setAnonymous();
-
-            Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
-            Main.pref.put("osm-server.username", "test");
-
-            im.initFromPreferences();
-
-            assertTrue(im.isPartiallyIdentified());
-        } finally {
-            Main.pref.addPreferenceChangeListener(im);
-        }
-    }
-
-    /**
-     * 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
-    public void testInitFromPreferences4() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
-
-        // for this test we disable the listener
-        Main.pref.removePreferenceChangeListener(im);
-
-        try {
-            im.setFullyIdentified("test1", newUserInfo());
-
-            Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
-            Main.pref.put("osm-server.username", "test2");
-
-            im.initFromPreferences();
-
-            assertTrue(im.isPartiallyIdentified());
-        } finally {
-            Main.pref.addPreferenceChangeListener(im);
-        }
-    }
-
-    /**
-     * Preferences include an user name which is the same as the current
-     * user name and we are currently fully identifed => josm user remains
-     * fully identified
-     */
-    @Test
-    public void testInitFromPreferences5() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
-
-        // for this test we disable the listener
-        Main.pref.removePreferenceChangeListener(im);
-
-        try {
-            im.setFullyIdentified("test1", new UserInfo());
-
-            Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
-            Main.pref.put("osm-server.username", "test1");
-
-            im.initFromPreferences();
-
-            assertTrue(im.isFullyIdentified());
-        } finally {
-            Main.pref.addPreferenceChangeListener(im);
-        }
-    }
-
-    @Test
-    public void testApiUrlChanged() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
-
-        // reset it
-        im.setAnonymous();
-
-        Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
-        assertTrue(im.isAnonymous());
-
-        Main.pref.put("osm-server.url", null);
-        assertTrue(im.isAnonymous());
-
-        // reset it
-        im.setPartiallyIdentified("test");
-
-        Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
-        assertTrue(im.isPartiallyIdentified());
-        assertEquals("test", im.getUserName());
-
-        Main.pref.put("osm-server.url", null);
-        assertTrue(im.isAnonymous());
-
-        // reset it
-        im.setFullyIdentified("test", newUserInfo());
-
-        Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
-        assertTrue(im.isPartiallyIdentified());
-        assertEquals("test", im.getUserName());
-
-        // reset it
-        im.setFullyIdentified("test", newUserInfo());
-
-        Main.pref.put("osm-server.url", null);
-        assertTrue(im.isAnonymous());
-    }
-
-    @Test
-    //@Ignore
-    public void testUserNameChanged() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
-
-        // reset it
-        im.setAnonymous();
-
-        Main.pref.put("osm-server.username", "test");
-        assertTrue(im.isPartiallyIdentified());
-        assertEquals("test", im.getUserName());
-
-        Main.pref.put("osm-server.username", null);
-        assertTrue(im.isAnonymous());
-        assertEquals(User.getAnonymous(), im.asUser());
-
-        // reset it
-        im.setPartiallyIdentified("test1");
-
-        Main.pref.put("osm-server.username", "test2");
-        assertTrue(im.isPartiallyIdentified());
-        assertEquals("test2", im.getUserName());
-        User usr = im.asUser();
-        assertEquals(0, usr.getId());
-        assertEquals("test2", usr.getName());
-
-        Main.pref.put("osm-server.username", null);
-        assertTrue(im.isAnonymous());
-
-        // reset it
-        im.setFullyIdentified("test1", newUserInfo());
-
-        Main.pref.put("osm-server.username", "test2");
-        assertTrue(im.isPartiallyIdentified());
-        assertEquals("test2", im.getUserName());
-        usr = im.asUser();
-        assertEquals(0, usr.getId());
-        assertEquals("test2", usr.getName());
-
-        // reset it
-        im.setFullyIdentified("test1", newUserInfo());
-
-        Main.pref.put("osm-server.username", null);
-        assertTrue(im.isAnonymous());
-    }
-}
Index: trunk/test/unit/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTaskTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTaskTest.java	(revision 12740)
+++ trunk/test/unit/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTaskTest.java	(revision 12743)
@@ -10,5 +10,5 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.data.UserIdentityManager;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -35,11 +35,11 @@
         assertNull(task.getChangesets());
 
-        assertTrue(JosmUserIdentityManager.getInstance().isAnonymous());
+        assertTrue(UserIdentityManager.getInstance().isAnonymous());
         task.run();
         assertNull(task.getChangesets());
 
         task = new DownloadOpenChangesetsTask(new JPanel());
-        JosmUserIdentityManager.getInstance().setPartiallyIdentified(System.getProperty("osm.username", "josm_test"));
-        assertTrue(JosmUserIdentityManager.getInstance().isPartiallyIdentified());
+        UserIdentityManager.getInstance().setPartiallyIdentified(System.getProperty("osm.username", "josm_test"));
+        assertTrue(UserIdentityManager.getInstance().isPartiallyIdentified());
         task.run();
         assertNotNull(task.getChangesets());
