UTS-199 - Modified test case for RouteImplTest and FilterImplTest add…

…ressing PR comment
perwendel · Jan 1, 2016 · 9c66601 · 9c66601
1 parent 65cf5d3
commit 9c66601
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 29 deletions.
diff --git a/src/test/java/spark/FilterImplTest.java b/src/test/java/spark/FilterImplTest.java
@@ -25,28 +25,28 @@ public void testConstructor(){
             public void handle(Request request, Response response) throws Exception {
             }
         };
-        assertEquals("Path is not equal", PATH_TEST, filter.getPath());
+        assertEquals("Should return path specified", PATH_TEST, filter.getPath());
-        assertEquals("Accept type is not equal", ACCEPT_TYPE_TEST, filter.getAcceptType());
+        assertEquals("Should return accept type specified", ACCEPT_TYPE_TEST, filter.getAcceptType());
     }
 
     @Test
-    public void testGets() throws Exception {
+    public void testGets_thenReturnGetPathAndGetAcceptTypeSuccessfully() throws Exception {
         filter = FilterImpl.create(PATH_TEST, ACCEPT_TYPE_TEST, null);
-        assertEquals("Path is not equal", PATH_TEST, filter.getPath());
+        assertEquals("Should return path specified", PATH_TEST, filter.getPath());
-        assertEquals("Accept type is not equal", ACCEPT_TYPE_TEST, filter.getAcceptType());
+        assertEquals("Should return accept type specified", ACCEPT_TYPE_TEST, filter.getAcceptType());
     }
 
     @Test
-    public void testCreate_withOutAssignAcceptTypeInTheParameters(){
+    public void testCreate_whenOutAssignAcceptTypeInTheParameters_thenReturnPathAndAcceptTypeSuccessfully(){
         filter = FilterImpl.create(PATH_TEST, null);
-        assertEquals("Path is not equal", PATH_TEST, filter.getPath());
+        assertEquals("Should return path specified", PATH_TEST, filter.getPath());
-        assertEquals("Accept type is not equal", RouteImpl.DEFAULT_ACCEPT_TYPE, filter.getAcceptType());
+        assertEquals("Should return accept type specified", RouteImpl.DEFAULT_ACCEPT_TYPE, filter.getAcceptType());
     }
 
     @Test
-    public void testCreate_withAcceptTypeNullValueInTheParameters(){
+    public void testCreate_whenAcceptTypeNullValueInTheParameters_thenReturnPathAndAcceptTypeSuccessfully(){
         filter = FilterImpl.create(PATH_TEST, null, null);
-        assertEquals("Path is not equal", PATH_TEST, filter.getPath());
+        assertEquals("Should return path specified", PATH_TEST, filter.getPath());
-        assertEquals("Accept type is not equal", RouteImpl.DEFAULT_ACCEPT_TYPE, filter.getAcceptType());
+        assertEquals("Should return accept type specified", RouteImpl.DEFAULT_ACCEPT_TYPE, filter.getAcceptType());
     }
 }
diff --git a/src/test/java/spark/RouteImplTest.java b/src/test/java/spark/RouteImplTest.java
@@ -29,18 +29,18 @@ public Object handle(Request request, Response response) throws Exception {
                 return null;
             }
         };
-        assertEquals("Path is not equal", PATH_TEST, route.getPath());
+        assertEquals("Should return path specified", PATH_TEST, route.getPath());
     }
 
     @Test
-    public void testGets() throws Exception {
+    public void testGets_thenReturnGetPathAndGetAcceptTypeSuccessfully() throws Exception {
         route = RouteImpl.create(PATH_TEST, ACCEPT_TYPE_TEST, null);
-        assertEquals("Path is not equal", PATH_TEST, route.getPath());
+        assertEquals("Should return path specified", PATH_TEST, route.getPath());
-        assertEquals("Accept type is not equal", ACCEPT_TYPE_TEST, route.getAcceptType());
+        assertEquals("Should return accept type specified", ACCEPT_TYPE_TEST, route.getAcceptType());
     }
 
     @Test
-    public void testHandle() throws Exception {
+    public void testHandle_thenReturnObjectValid() throws Exception {
         Route routeMock = EasyMock.createMock(Route.class);
         RouteImpl route = RouteImpl.create(PATH_TEST, routeMock);
 
@@ -50,35 +50,36 @@ public void testHandle() throws Exception {
         Object value = route.handle(null, null);
         EasyMock.verify(routeMock);
 
-        assertNotNull("Value is null", value);
+        assertNotNull("Should return null because the request and response from handle are null", value);
     }
 
     @Test
-    public void testCreate_withOutAssignAcceptTypeInTheParameters(){
+    public void testCreate_whenOutAssignAcceptTypeInTheParameters_thenReturnPathAndAcceptTypeSuccessfully(){
         route = RouteImpl.create(PATH_TEST, null);
-        assertEquals("Path is not equal", PATH_TEST, route.getPath());
+        assertEquals("Should return path specified", PATH_TEST, route.getPath());
-        assertEquals("Accept type is not equal", RouteImpl.DEFAULT_ACCEPT_TYPE, route.getAcceptType());
+        assertEquals("Should return accept type specified", RouteImpl.DEFAULT_ACCEPT_TYPE, route.getAcceptType());
     }
 
     @Test
-    public void testCreate_withAcceptTypeNullValueInTheParameters(){
+    public void testCreate_whenAcceptTypeNullValueInTheParameters_thenReturnPathAndAcceptTypeSuccessfully(){
         route = RouteImpl.create(PATH_TEST, null, null);
-        assertEquals("Path is not equal", PATH_TEST, route.getPath());
+        assertEquals("Should return path specified", PATH_TEST, route.getPath());
-        assertEquals("Accept type is not equal", RouteImpl.DEFAULT_ACCEPT_TYPE, route.getAcceptType());
+        assertEquals("Should return accept type specified", RouteImpl.DEFAULT_ACCEPT_TYPE, route.getAcceptType());
     }
 
     @Test
-    public void testRender_withElementParameterValid_thenReturnValidObject() throws Exception {
+    public void testRender_whenElementParameterValid_thenReturnValidObject() throws Exception {
+        String finalObjValue = "object_value";
         route = RouteImpl.create(PATH_TEST, null);
-        Object value = route.render("object_value");
+        Object value = route.render(finalObjValue);
-        assertNotNull("Value is null", value);
+        assertNotNull("Should return an Object because we configured it to have one", value);
-        assertEquals("Value is not equal", "object_value", value.toString());
+        assertEquals("Should return a string object specified", finalObjValue, value.toString());
     }
 
     @Test
-    public void testRender_withElementParameterIsNull_thenReturnNull() throws Exception {
+    public void testRender_whenElementParameterIsNull_thenReturnNull() throws Exception {
         route = RouteImpl.create(PATH_TEST, null);
         Object value = route.render(null);
-        assertNull("Value is not null", value);
+        assertNull("Should return null because the element from render is null", value);
     }
 }