Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java	(revision 10210)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java	(revision 10218)
@@ -3,5 +3,4 @@
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
 
 import java.util.List;
@@ -38,5 +37,5 @@
     public void test0() {
         final List<TestError> errors = test("node name:de=Europa");
-        assertSame(1, errors.size());
+        assertEquals(1, errors.size());
         assertEquals("A name is missing, even though name:* exists.", errors.get(0).getMessage());
     }
@@ -48,5 +47,5 @@
     public void test1() {
         final List<TestError> errors = test("node name=Europe name:de=Europa");
-        assertSame(1, errors.size());
+        assertEquals(1, errors.size());
         assertEquals("Missing name:*=Europe. Add tag with correct language key.", errors.get(0).getDescription());
     }
@@ -58,5 +57,5 @@
     public void test2() {
         final List<TestError> errors = test("node name=Europe name:de=Europa name:en=Europe");
-        assertSame(0, errors.size());
+        assertEquals(0, errors.size());
     }
 
@@ -68,12 +67,12 @@
         List<TestError> errors;
         errors = test("node \"name\"=\"Italia - Italien - Italy\"");
-        assertSame(0, errors.size());
+        assertEquals(0, errors.size());
         errors = test("node name=\"Italia - Italien - Italy\" name:it=Italia");
-        assertSame(2, errors.size());
+        assertEquals(2, errors.size());
         errors = test("node name=\"Italia - Italien - Italy\" name:it=Italia name:de=Italien");
-        assertSame(1, errors.size());
+        assertEquals(1, errors.size());
         assertEquals("Missing name:*=Italy. Add tag with correct language key.", errors.get(0).getDescription());
         errors = test("node name=\"Italia - Italien - Italy\" name:it=Italia name:de=Italien name:en=Italy");
-        assertSame(0, errors.size());
+        assertEquals(0, errors.size());
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java	(revision 10210)
+++ trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java	(revision 10218)
@@ -3,5 +3,4 @@
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
 
 import java.io.IOException;
@@ -68,11 +67,11 @@
             System.out.println("p3: "+DefaultNameFormatter.getInstance().format(p3)+" - "+p3);
 
-            assertSame(comparator.compare(p1, p2), -1); // p1 < p2
-            assertSame(comparator.compare(p2, p1),  1); // p2 > p1
+            assertEquals(comparator.compare(p1, p2), -1); // p1 < p2
+            assertEquals(comparator.compare(p2, p1),  1); // p2 > p1
 
-            assertSame(comparator.compare(p1, p3), -1); // p1 < p3
-            assertSame(comparator.compare(p3, p1),  1); // p3 > p1
-            assertSame(comparator.compare(p2, p3),  1); // p2 > p3
-            assertSame(comparator.compare(p3, p2), -1); // p3 < p2
+            assertEquals(comparator.compare(p1, p3), -1); // p1 < p3
+            assertEquals(comparator.compare(p3, p1),  1); // p3 > p1
+            assertEquals(comparator.compare(p2, p3),  1); // p2 > p3
+            assertEquals(comparator.compare(p3, p2), -1); // p3 < p2
 
             Relation[] relations = new ArrayList<>(ds.getRelations()).toArray(new Relation[0]);
Index: trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java	(revision 10210)
+++ trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java	(revision 10218)
@@ -4,5 +4,4 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
@@ -69,5 +68,5 @@
         for (String file : new String[]{"osm.jos", "osm.joz"}) {
             List<Layer> layers = testRead(file);
-            assertSame(layers.size(), 1);
+            assertEquals(layers.size(), 1);
             assertTrue(layers.get(0) instanceof OsmDataLayer);
             OsmDataLayer osm = (OsmDataLayer) layers.get(0);
@@ -85,5 +84,5 @@
         for (String file : new String[]{"gpx.jos", "gpx.joz", "nmea.jos"}) {
             List<Layer> layers = testRead(file);
-            assertSame(layers.size(), 1);
+            assertEquals(layers.size(), 1);
             assertTrue(layers.get(0) instanceof GpxLayer);
             GpxLayer gpx = (GpxLayer) layers.get(0);
@@ -100,5 +99,5 @@
     public void testReadGpxAndMarker() throws IOException, IllegalDataException {
         List<Layer> layers = testRead("gpx_markers.joz");
-        assertSame(layers.size(), 2);
+        assertEquals(layers.size(), 2);
         GpxLayer gpx = null;
         MarkerLayer marker = null;
@@ -124,5 +123,5 @@
     public void testReadImage() throws IOException, IllegalDataException {
         final List<Layer> layers = testRead("bing.jos");
-        assertSame(layers.size(), 1);
+        assertEquals(layers.size(), 1);
         assertTrue(layers.get(0) instanceof ImageryLayer);
         final ImageryLayer image = (ImageryLayer) layers.get(0);
@@ -145,5 +144,5 @@
         }
         final List<Layer> layers = testRead("notes.joz");
-        assertSame(layers.size(), 1);
+        assertEquals(layers.size(), 1);
         assertTrue(layers.get(0) instanceof NoteLayer);
         final NoteLayer layer = (NoteLayer) layers.get(0);