From b44989f214947873665ef23071bd6f949b6bf75b Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <paul-christian.volkmer@mni.thm.de>
Date: Tue, 19 Feb 2013 14:12:51 +0100
Subject: [PATCH] Fixed test execution
Clean up service tests and clean up logged in users. Added logged in users
if needed.
---
src/test/java/de/thm/arsnova/services/FeedbackServiceTest.java | 1 +
src/test/java/de/thm/arsnova/services/QuestionServiceTest.java | 1 +
src/test/java/de/thm/arsnova/services/SessionServiceTest.java | 1 +
.../java/de/thm/arsnova/services/StatisticsServiceTest.java | 3 +++
4 files changed, 6 insertions(+)
diff --git a/src/test/java/de/thm/arsnova/services/FeedbackServiceTest.java b/src/test/java/de/thm/arsnova/services/FeedbackServiceTest.java
index 4f8fc000..2ea24a36 100644
--- a/src/test/java/de/thm/arsnova/services/FeedbackServiceTest.java
+++ b/src/test/java/de/thm/arsnova/services/FeedbackServiceTest.java
@@ -52,6 +52,7 @@ public class FeedbackServiceTest {
@After
public final void cleanup() {
databaseDao.cleanupTestData();
+ userService.setUserAuthenticated(false);
}
@Test(expected = NotFoundException.class)
diff --git a/src/test/java/de/thm/arsnova/services/QuestionServiceTest.java b/src/test/java/de/thm/arsnova/services/QuestionServiceTest.java
index eea416e5..96e81937 100644
--- a/src/test/java/de/thm/arsnova/services/QuestionServiceTest.java
+++ b/src/test/java/de/thm/arsnova/services/QuestionServiceTest.java
@@ -52,6 +52,7 @@ public class QuestionServiceTest {
@After
public final void cleanup() {
databaseDao.cleanupTestData();
+ userService.setUserAuthenticated(false);
}
@Test(expected = UnauthorizedException.class)
diff --git a/src/test/java/de/thm/arsnova/services/SessionServiceTest.java b/src/test/java/de/thm/arsnova/services/SessionServiceTest.java
index ef51a2c5..f7c4a52f 100644
--- a/src/test/java/de/thm/arsnova/services/SessionServiceTest.java
+++ b/src/test/java/de/thm/arsnova/services/SessionServiceTest.java
@@ -53,6 +53,7 @@ public class SessionServiceTest {
@After
public final void cleanup() {
databaseDao.cleanupTestData();
+ userService.setUserAuthenticated(false);
}
@Test
diff --git a/src/test/java/de/thm/arsnova/services/StatisticsServiceTest.java b/src/test/java/de/thm/arsnova/services/StatisticsServiceTest.java
index 1d76572e..a0e846e6 100644
--- a/src/test/java/de/thm/arsnova/services/StatisticsServiceTest.java
+++ b/src/test/java/de/thm/arsnova/services/StatisticsServiceTest.java
@@ -55,10 +55,13 @@ public class StatisticsServiceTest {
public final void testShouldReturnCurrentActiveUsers() {
Session session = new Session();
session.setKeyword("1278127812");
+
+ userService.setUserAuthenticated(true);
databaseDao.registerAsOnlineUser(userService.getCurrentUser(), session);
int actual = statisticsService.countActiveUsers();
assertEquals(1, actual);
+ userService.setUserAuthenticated(false);
}
@Test
--
GitLab