Changeset 8857 in josm for trunk/test/unit/org/openstreetmap/josm/io/remotecontrol

Timestamp:

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

Author:

Don-vip

Message:

improve/cleanup unit tests

Location:

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler

Files:

• ImportHandlerTest.java (modified) (1 diff)
• RequestHandlerTest.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java

@@ -7 +7 @@
 import org.junit.Test;
 
+/**
+ * Unit tests of {@link ImportHandler} class.
+ */
 public class ImportHandlerTest {
 

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.io.remotecontrol.handler;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Collections;
@@ -12 +11 @@
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
 
+/**
+ * Unit tests of {@link RequestHandler} class.
+ */
 public class RequestHandlerTest {
 
@@ -48 +50 @@
         expected.put("query", "a");
         expected.put("b", "=c");
-        assertThat(getRequestParameter("http://example.com/?query=a&b==c"),
-                is(expected));
+        assertEquals(expected, getRequestParameter("http://example.com/?query=a&b==c"));
     }
 
     @Test
     public void testRequestParameter12() {
-        assertThat(getRequestParameter("http://example.com/?query=a%26b==c"),
-                is(Collections.singletonMap("query", "a&b==c")));
+        assertEquals(Collections.singletonMap("query", "a&b==c"),
+                getRequestParameter("http://example.com/?query=a%26b==c"));
     }
 
     @Test
     public void testRequestParameter3() {
-        assertThat(getRequestParameter("http://example.com/blue+light%20blue?blue%2Blight+blue").keySet(),
-                is((Collections.singleton("blue+light blue"))));
+        assertEquals(Collections.singleton("blue+light blue"),
+                getRequestParameter("http://example.com/blue+light%20blue?blue%2Blight+blue").keySet());
     }
 
@@ -70 +71 @@
     @Test
     public void testRequestParameter4() {
-        assertThat(getRequestParameter(
+        assertEquals(Collections.singletonMap("/?:@-._~!$'()* ,;", "/?:@-._~!$'()* ,;=="), getRequestParameter(
                 // CHECKSTYLE.OFF: LineLength
-                "http://example.com/:@-._~!$&'()*+,=;:@-._~!$&'()*+,=:@-._~!$&'()*+,==?/?:@-._~!$'()*+,;=/?:@-._~!$'()*+,;==#/?:@-._~!$&'()*+,;="),
+                "http://example.com/:@-._~!$&'()*+,=;:@-._~!$&'()*+,=:@-._~!$&'()*+,==?/?:@-._~!$'()*+,;=/?:@-._~!$'()*+,;==#/?:@-._~!$&'()*+,;="));
                 // CHECKSTYLE.ON: LineLength
-                is(Collections.singletonMap("/?:@-._~!$'()* ,;", "/?:@-._~!$'()* ,;==")));
     }
 
@@ -82 +82 @@
         expected.put("space", " ");
         expected.put("tab", "\t");
-        assertThat(getRequestParameter("http://example.com/?space=%20&tab=%09"),
-                is(expected));
+        assertEquals(expected, getRequestParameter("http://example.com/?space=%20&tab=%09"));
     }
 }