Changeset 8857 in josm for trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java

Timestamp:

2015-10-11T17:28:19+02:00 (9 years ago)

Author:

Don-vip

Message:

improve/cleanup unit tests

File:

• trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui;
 
-import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
 
 import java.io.FileInputStream;
@@ -30 +29 @@
 /**
  * Unit tests of {@link DefaultNameFormatter} class.
- *
  */
 public class DefaultNameFormatterTest {
@@ -89 +87 @@
     @Test
     public void testRelationName() {
-        assertThat(getFormattedRelationName("X=Y"), is("relation (0, 0 members)"));
-        assertThat(getFormattedRelationName("name=Foo"), is("relation (\"Foo\", 0 members)"));
-        assertThat(getFormattedRelationName("type=route route=tram ref=123"), is("route (\"123\", 0 members)"));
-        assertThat(getFormattedRelationName("type=multipolygon building=yes"), is("multipolygon (\"building\", 0 members)"));
-        assertThat(getFormattedRelationName("type=multipolygon building=yes ref=123"), is("multipolygon (\"123\", 0 members)"));
-        assertThat(getFormattedRelationName("type=multipolygon building=yes addr:housenumber=123"),
-                is("multipolygon (\"building\", 0 members)"));
-        assertThat(getFormattedRelationName("type=multipolygon building=residential addr:housenumber=123"),
-                is("multipolygon (\"residential\", 0 members)"));
+        assertEquals("relation (0, 0 members)",
+                getFormattedRelationName("X=Y"));
+        assertEquals("relation (\"Foo\", 0 members)",
+                getFormattedRelationName("name=Foo"));
+        assertEquals("route (\"123\", 0 members)",
+                getFormattedRelationName("type=route route=tram ref=123"));
+        assertEquals("multipolygon (\"building\", 0 members)",
+                getFormattedRelationName("type=multipolygon building=yes"));
+        assertEquals("multipolygon (\"123\", 0 members)",
+                getFormattedRelationName("type=multipolygon building=yes ref=123"));
+        assertEquals("multipolygon (\"building\", 0 members)",
+                getFormattedRelationName("type=multipolygon building=yes addr:housenumber=123"));
+        assertEquals("multipolygon (\"residential\", 0 members)",
+                getFormattedRelationName("type=multipolygon building=residential addr:housenumber=123"));
     }
 
@@ -105 +108 @@
     @Test
     public void testWayName() {
-        assertThat(getFormattedWayName("building=yes"), is("building (0 nodes)"));
-        assertThat(getFormattedWayName("building=yes addr:housenumber=123"), is("House number 123 (0 nodes)"));
-        assertThat(getFormattedWayName("building=yes addr:housenumber=123 addr:street=FooStreet"),
-                is("House number 123 at FooStreet (0 nodes)"));
-        assertThat(getFormattedWayName("building=yes addr:housenumber=123 addr:housename=FooName"), is("House FooName (0 nodes)"));
+        assertEquals("building (0 nodes)", getFormattedWayName("building=yes"));
+        assertEquals("House number 123 (0 nodes)", getFormattedWayName("building=yes addr:housenumber=123"));
+        assertEquals("House number 123 at FooStreet (0 nodes)", getFormattedWayName("building=yes addr:housenumber=123 addr:street=FooStreet"));
+        assertEquals("House FooName (0 nodes)", getFormattedWayName("building=yes addr:housenumber=123 addr:housename=FooName"));
     }