Changeset 12743 in josm for trunk/test

Timestamp:

2017-09-05T21:13:21+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - deprecate gui.JosmUserIdentityManager - replaced by data.UserIdentityManager

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• data/UserIdentityManagerTest.java (moved) (moved from trunk/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.java ) (14 diffs)
• data/osm/ChangesetCacheTest.java (modified) (2 diffs)
• gui/io/DownloadOpenChangesetsTaskTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/UserIdentityManagerTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui;
+package org.openstreetmap.josm.data;
 
 import static org.junit.Assert.assertEquals;
@@ -17 +17 @@
 
 /**
- * Unit tests of {@link JosmUserIdentityManager} class.
+ * Unit tests of {@link UserIdentityManager} class.
  */
-public class JosmUserIdentityManagerTest {
+public class UserIdentityManagerTest {
 
     /**
@@ -46 +46 @@
     public void testSingletonAccess() {
 
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+        UserIdentityManager im = UserIdentityManager.getInstance();
 
         // created ?
         assertNotNull(im);
 
-        JosmUserIdentityManager im2 = JosmUserIdentityManager.getInstance();
+        UserIdentityManager im2 = UserIdentityManager.getInstance();
 
         // only one instance
@@ -58 +58 @@
 
     /**
-     * Unit test of {@link JosmUserIdentityManager#setAnonymous}.
+     * Unit test of {@link UserIdentityManager#setAnonymous}.
      */
     @Test
     public void testSetAnonymous() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+        UserIdentityManager im = UserIdentityManager.getInstance();
 
         im.setPartiallyIdentified("test");
@@ -78 +78 @@
 
     /**
-     * Unit test of {@link JosmUserIdentityManager#setPartiallyIdentified} - nominal case.
+     * Unit test of {@link UserIdentityManager#setPartiallyIdentified} - nominal case.
      */
     @Test
     public void testSetPartiallyIdentified() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+        UserIdentityManager im = UserIdentityManager.getInstance();
         im.setPartiallyIdentified("test");
 
@@ -98 +98 @@
 
     /**
-     * Unit test of {@link JosmUserIdentityManager#setPartiallyIdentified} - null case.
+     * Unit test of {@link UserIdentityManager#setPartiallyIdentified} - null case.
      */
     @Test(expected = IllegalArgumentException.class)
     public void testSetPartiallyIdentifiedNull() {
-        JosmUserIdentityManager.getInstance().setPartiallyIdentified(null);
-    }
-
-    /**
-     * Unit test of {@link JosmUserIdentityManager#setPartiallyIdentified} - empty case.
+        UserIdentityManager.getInstance().setPartiallyIdentified(null);
+    }
+
+    /**
+     * Unit test of {@link UserIdentityManager#setPartiallyIdentified} - empty case.
      */
     @Test(expected = IllegalArgumentException.class)
     public void testSetPartiallyIdentifiedEmpty() {
-        JosmUserIdentityManager.getInstance().setPartiallyIdentified("");
-    }
-
-    /**
-     * Unit test of {@link JosmUserIdentityManager#setPartiallyIdentified} - blank case.
+        UserIdentityManager.getInstance().setPartiallyIdentified("");
+    }
+
+    /**
+     * Unit test of {@link UserIdentityManager#setPartiallyIdentified} - blank case.
      */
     @Test(expected = IllegalArgumentException.class)
     public void testSetPartiallyIdentifiedBlank() {
-        JosmUserIdentityManager.getInstance().setPartiallyIdentified("  \t  ");
-    }
-
-    /**
-     * Unit test of {@link JosmUserIdentityManager#setFullyIdentified} - nominal case.
+        UserIdentityManager.getInstance().setPartiallyIdentified("  \t  ");
+    }
+
+    /**
+     * Unit test of {@link UserIdentityManager#setFullyIdentified} - nominal case.
      */
     @Test
     public void testSetFullyIdentified() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+        UserIdentityManager im = UserIdentityManager.getInstance();
 
         UserInfo userInfo = newUserInfo();
@@ -145 +145 @@
 
     /**
-     * Unit test of {@link JosmUserIdentityManager#setFullyIdentified} - null name case.
+     * Unit test of {@link UserIdentityManager#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.
+        UserIdentityManager.getInstance().setFullyIdentified(null, newUserInfo());
+    }
+
+    /**
+     * Unit test of {@link UserIdentityManager#setFullyIdentified} - empty name case.
      */
     @Test(expected = IllegalArgumentException.class)
     public void testSetFullyIdentifiedEmptyName() {
-        JosmUserIdentityManager.getInstance().setFullyIdentified("", newUserInfo());
-    }
-
-    /**
-     * Unit test of {@link JosmUserIdentityManager#setFullyIdentified} - blank name case.
+        UserIdentityManager.getInstance().setFullyIdentified("", newUserInfo());
+    }
+
+    /**
+     * Unit test of {@link UserIdentityManager#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.
+        UserIdentityManager.getInstance().setFullyIdentified(" \t ", newUserInfo());
+    }
+
+    /**
+     * Unit test of {@link UserIdentityManager#setFullyIdentified} - null info case.
      */
     @Test(expected = IllegalArgumentException.class)
     public void testSetFullyIdentifiedNullInfo() {
-        JosmUserIdentityManager.getInstance().setFullyIdentified("test", null);
+        UserIdentityManager.getInstance().setFullyIdentified("test", null);
     }
 
@@ -181 +181 @@
     @Test
     public void testInitFromPreferences1() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+        UserIdentityManager im = UserIdentityManager.getInstance();
 
         // reset it
@@ -206 +206 @@
     @Test
     public void testInitFromPreferences2() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+        UserIdentityManager im = UserIdentityManager.getInstance();
 
         // reset it
@@ -231 +231 @@
     @Test
     public void testInitFromPreferences3() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+        UserIdentityManager im = UserIdentityManager.getInstance();
 
         // for this test we disable the listener
@@ -258 +258 @@
     @Test
     public void testInitFromPreferences4() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+        UserIdentityManager im = UserIdentityManager.getInstance();
 
         // for this test we disable the listener
@@ -284 +284 @@
     @Test
     public void testInitFromPreferences5() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+        UserIdentityManager im = UserIdentityManager.getInstance();
 
         // for this test we disable the listener
@@ -305 +305 @@
     @Test
     public void testApiUrlChanged() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+        UserIdentityManager im = UserIdentityManager.getInstance();
 
         // reset it
@@ -341 +341 @@
 
     @Test
-    //@Ignore
     public void testUserNameChanged() {
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+        UserIdentityManager im = UserIdentityManager.getInstance();
 
         // reset it

trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java

@@ -15 +15 @@
 import org.junit.Test;
 import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.data.UserIdentityManager;
 
 /**
@@ -259 +259 @@
         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());
     }

trunk/test/unit/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTaskTest.java

@@ -10 +10 @@
 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 +35 @@
         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());