Changeset 11911 in josm for trunk/test/unit/org

Timestamp:

2017-04-15T01:02:22+02:00 (7 years ago)

Author:

Don-vip

Message:

fix unit test conflict

File:

• trunk/test/unit/org/openstreetmap/josm/data/osm/UserTest.java (modified) (1 diff)

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

@@ -29 +29 @@
     @Test
     public void testCreateOsmUser() {
-        User user1 = User.createOsmUser(1, "name1");
-        assertEquals(1, user1.getId());
-        assertEquals("name1", user1.getName());
-        User user2 = User.createOsmUser(1, "name2");
-        assertSame(user1, user2);
-        assertEquals(1, user2.getId());
-        assertEquals("name2", user2.getName());
-        assertEquals(2, user2.getNames().size());
-        assertTrue(user2.getNames().contains("name1"));
-        assertTrue(user2.getNames().contains("name2"));
+        try {
+            User user1 = User.createOsmUser(1, "name1");
+            assertEquals(1, user1.getId());
+            assertEquals("name1", user1.getName());
+            User user2 = User.createOsmUser(1, "name2");
+            assertSame(user1, user2);
+            assertEquals(1, user2.getId());
+            assertEquals("name2", user2.getName());
+            assertEquals(2, user2.getNames().size());
+            assertTrue(user2.getNames().contains("name1"));
+            assertTrue(user2.getNames().contains("name2"));
+        } finally {
+            User.clearUserMap();
+        }
     }
 }