From 58772f94f77ed9c084759f4c6c0711a7159845fb Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <paul-christian.volkmer@mni.thm.de>
Date: Thu, 20 Sep 2012 09:43:51 +0200
Subject: [PATCH] Task #3894: Fixed last missing test by checking if response
equals expected
---
.../arsnova/controller/LoginControllerTest.java | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/test/java/de/thm/arsnova/controller/LoginControllerTest.java b/src/test/java/de/thm/arsnova/controller/LoginControllerTest.java
index de31ecfc..03741d10 100644
--- a/src/test/java/de/thm/arsnova/controller/LoginControllerTest.java
+++ b/src/test/java/de/thm/arsnova/controller/LoginControllerTest.java
@@ -20,7 +20,6 @@ package de.thm.arsnova.controller;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import javax.inject.Inject;
@@ -42,7 +41,6 @@ import org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAda
import org.springframework.web.servlet.view.RedirectView;
import de.thm.arsnova.LoginController;
-import de.thm.arsnova.entities.User;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations={
@@ -102,20 +100,15 @@ public class LoginControllerTest {
assertEquals("Guest1234567890", auth.getName());
}
-
- /*
@Test
public void testUser() throws Exception {
request.setMethod("GET");
request.setRequestURI("/whoami");
- final ModelAndView mav = handlerAdapter.handle(request, response, loginController);
-
- assertNotNull(mav);
- assertTrue(mav.getModel().containsKey("user"));
- assertEquals(mav.getModel().get("user").getClass(), User.class);
- assertEquals("Guest1234567890", ((User)mav.getModel().get("user")).getUsername());
- }*/
+ handlerAdapter.handle(request, response, loginController);
+ assertNotNull(response);
+ assertEquals(response.getContentAsString(),"{\"username\":\"Guest1234567890\"}");
+ }
@Test
public void testLogoutWithoutRedirect() throws Exception {
--
GitLab