bugfix: RestResponse glattgezogen

Thomas Ziemer
1 parent f18d339f
Showing 3 changed files with 16 additions and 9 deletions
src/main/java/net/ziemers/swxercise/ui/RestResponse.java
src/main/java/net/ziemers/swxercise/ui/UserViewController.java
src/test/java/net/ziemers/swxercise/ui/UserViewControllerTest.java
 package net.ziemers.swxercise.ui;
  
 import net.ziemers.swxercise.ui.enums.ResponseState;
-import net.ziemers.swxercise.ui.enums.ResponseState.SUCCESS;
  
 public class RestResponse {
  
@@ -23,5 +22,15 @@ public class RestResponse {
         return responseState.getResponseText();
     }
  
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        RestResponse that = (RestResponse) o;
+
+        return responseState == that.responseState;
+    }
+
 }
  
@@ -10,9 +10,7 @@ import javax.ws.rs.core.MediaType;
 import net.ziemers.swxercise.lg.model.user.User;
 import net.ziemers.swxercise.lg.user.dto.UserDto;
 import net.ziemers.swxercise.lg.user.service.UserService;
-
-import net.ziemers.swxercise.ui.RestResponse;
-import net.ziemers.swxercise.ui.enums.ResponseState.FAILED;
+import net.ziemers.swxercise.ui.enums.ResponseState;
  
 /**
  * REST-Methoden für die Benutzerverwaltung.
@@ -70,7 +68,7 @@ public class UserViewController {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     public RestResponse createUser(UserDto dto) throws Exception {
-        final Long id = userService.createUser(dto);
+        userService.createUser(dto);
         return new RestResponse();
     }
  
@@ -25,7 +25,7 @@ public class UserViewControllerTest {
  
     private User user;
  
-    private String actualString;
+    private RestResponse actual;
  
     @Test
     public void testJUnitFrameworkReturnsTrue() {
@@ -117,7 +117,7 @@ public class UserViewControllerTest {
         when(userService.loginUser(userDto)).thenReturn(true);
         when(userService.getSessionUser()).thenReturn(user);
  
-        actualString = underTest.loginUser(userDto);
+        actual = underTest.loginUser(userDto);
     }
  
     // then
@@ -127,8 +127,8 @@ public class UserViewControllerTest {
     }
  
     private void assertLoginSuccess() {
-        final String expected = String.format("Ok (%s %s)", user.getFirstname(), user.getLastname());
-        assertEquals(expected, actualString);
+        final RestResponse expected = new RestResponse();
+        assertEquals(expected, actual);
     }
  
 }