From 96051ad5884a15c0b6c96ae8370c56431fae1652 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <paul-christian.volkmer@mni.thm.de>
Date: Mon, 29 Oct 2012 11:48:10 +0100
Subject: [PATCH] Added test to check if feedback will be returned as expected

---
 .../arsnova/controller/FeedbackControllerTest.java   | 12 ++++++++++++
 .../arsnova/controller/SessionControllerTest.java    |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/test/java/de/thm/arsnova/controller/FeedbackControllerTest.java b/src/test/java/de/thm/arsnova/controller/FeedbackControllerTest.java
index 8cf20ed56..7b19d5f8c 100644
--- a/src/test/java/de/thm/arsnova/controller/FeedbackControllerTest.java
+++ b/src/test/java/de/thm/arsnova/controller/FeedbackControllerTest.java
@@ -85,4 +85,16 @@ public class FeedbackControllerTest {
 		assertTrue(response.getStatus() == 200);
 		assertEquals("0", response.getContentAsString());
 	}
+	
+	@Test
+	public void testShouldReturnFeedback() throws Exception {
+		userService.setUserAuthenticated(true);
+
+		request.setMethod("GET");
+		request.setRequestURI("/session/87654321/feedback");
+		handlerAdapter.handle(request, response, feedbackController);
+
+		assertTrue(response.getStatus() == 200);
+		assertEquals("{\"values\":[2,3,5,7]}", response.getContentAsString());
+	}
 }
diff --git a/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java b/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java
index ce228e655..8e2c33587 100644
--- a/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java
+++ b/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java
@@ -27,7 +27,8 @@ import de.thm.arsnova.services.StubUserService;
 @ContextConfiguration(locations = {
 		"file:src/main/webapp/WEB-INF/arsnova-servlet.xml",
 		"file:src/main/webapp/WEB-INF/spring/spring-main.xml",
-		"file:src/test/resources/test-config.xml" })
+		"file:src/test/resources/test-config.xml"
+})
 public class SessionControllerTest {
 
 	@Inject
-- 
GitLab