From 2fd04607f50efb44de2d396bf361abbe02c12e47 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <paul-christian.volkmer@mni.thm.de>
Date: Wed, 21 May 2014 13:36:04 +0200
Subject: [PATCH] Minor code cleanup
---
.../thm/arsnova/services/SessionService.java | 1 -
.../LecturerQuestionControllerTest.java | 19 +++++++---
.../controller/SessionControllerTest.java | 38 +++++++++++--------
.../arsnova/services/QuestionServiceTest.java | 3 +-
.../arsnova/services/SessionServiceTest.java | 30 +++++++++------
5 files changed, 55 insertions(+), 36 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java
index 816ea4607..ea272023a 100644
--- a/src/main/java/de/thm/arsnova/services/SessionService.java
+++ b/src/main/java/de/thm/arsnova/services/SessionService.java
@@ -235,7 +235,6 @@ public class SessionService implements ISessionService {
@Override
@PreAuthorize("isAuthenticated() and hasPermission(#session, 'owner')")
- //@PreAuthorize("isAuthenticated() and hasPermission(#sessionkey, 'session', 'owner')")
public Session updateSession(String sessionkey, Session session) {
return databaseDao.updateSession(session);
}
diff --git a/src/test/java/de/thm/arsnova/controller/LecturerQuestionControllerTest.java b/src/test/java/de/thm/arsnova/controller/LecturerQuestionControllerTest.java
index 5450c311f..cd68100c7 100644
--- a/src/test/java/de/thm/arsnova/controller/LecturerQuestionControllerTest.java
+++ b/src/test/java/de/thm/arsnova/controller/LecturerQuestionControllerTest.java
@@ -6,6 +6,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import java.util.ArrayList;
import java.util.List;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -44,13 +45,7 @@ public class LecturerQuestionControllerTest {
@Autowired
private WebApplicationContext webApplicationContext;
- @Before
- public void setup() {
- mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build();
- }
-
private void setAuthenticated(boolean isAuthenticated, String username) {
- SecurityContextHolder.clearContext();
if (isAuthenticated) {
List<GrantedAuthority> ga = new ArrayList<GrantedAuthority>();
UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(username, "secret", ga);
@@ -61,6 +56,18 @@ public class LecturerQuestionControllerTest {
}
}
+ @Before
+ public final void startup() {
+ mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build();
+ SecurityContextHolder.clearContext();
+ }
+
+ @After
+ public final void cleanup() {
+ SecurityContextHolder.clearContext();
+ userService.setUserAuthenticated(false);
+ }
+
@Test
public void testShouldNotGetLecturerQuestionsIfUnauthorized() throws Exception {
setAuthenticated(false, "nobody");
diff --git a/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java b/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java
index 3512a8999..61668ec38 100644
--- a/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java
+++ b/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java
@@ -7,6 +7,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import java.util.ArrayList;
import java.util.List;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -46,25 +47,32 @@ public class SessionControllerTest {
@Autowired
private WebApplicationContext webApplicationContext;
- @Before
- public void setup() {
- mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build();
- }
-
- private void setAuthenticated(boolean isAuthenticated) {
+ private void setAuthenticated(boolean isAuthenticated, String username) {
if (isAuthenticated) {
List<GrantedAuthority> ga = new ArrayList<GrantedAuthority>();
- UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("ptsr00", "secret", ga);
+ UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(username, "secret", ga);
SecurityContextHolder.getContext().setAuthentication(token);
+ userService.setUserAuthenticated(isAuthenticated, username);
} else {
- SecurityContextHolder.clearContext();
+ userService.setUserAuthenticated(isAuthenticated);
}
- userService.setUserAuthenticated(isAuthenticated);
+ }
+
+ @Before
+ public final void startup() {
+ mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build();
+ SecurityContextHolder.clearContext();
+ }
+
+ @After
+ public final void cleanup() {
+ SecurityContextHolder.clearContext();
+ userService.setUserAuthenticated(false);
}
@Test
public void testShouldNotGetUnknownSession() throws Exception {
- setAuthenticated(true);
+ setAuthenticated(true, "ptsr00");
mockMvc.perform(get("/session/00000000"))
.andExpect(status().isNotFound());
@@ -72,7 +80,7 @@ public class SessionControllerTest {
@Test
public void testShouldNotGetUnknownSessionIfUnauthorized() throws Exception {
- setAuthenticated(false);
+ setAuthenticated(false, "ptsr00");
mockMvc.perform(get("/session/00000000"))
.andExpect(status().isUnauthorized());
@@ -80,7 +88,7 @@ public class SessionControllerTest {
@Test
public void testShouldCreateSessionIfUnauthorized() throws Exception {
- setAuthenticated(false);
+ setAuthenticated(false, "ptsr00");
mockMvc.perform(post("/session/").contentType(MediaType.APPLICATION_JSON).content("{\"keyword\":12345678}"))
.andExpect(status().isUnauthorized());
@@ -88,7 +96,7 @@ public class SessionControllerTest {
@Test
public void testShouldNotReturnMySessionsIfUnauthorized() throws Exception {
- setAuthenticated(false);
+ setAuthenticated(false, "ptsr00");
mockMvc.perform(get("/session/").param("ownedonly", "true"))
.andExpect(status().isUnauthorized());
@@ -96,7 +104,7 @@ public class SessionControllerTest {
@Test
public void testShouldNotReturnMyVisitedSessionsIfUnauthorized() throws Exception {
- setAuthenticated(false);
+ setAuthenticated(false, "ptsr00");
mockMvc.perform(get("/session/").param("visitedonly", "true"))
.andExpect(status().isUnauthorized());
@@ -104,7 +112,7 @@ public class SessionControllerTest {
@Test
public void testShouldShowUnimplementedIfNoFlagIsSet() throws Exception {
- setAuthenticated(false);
+ setAuthenticated(false, "ptsr00");
mockMvc.perform(get("/session/"))
.andExpect(status().isNotImplemented());
diff --git a/src/test/java/de/thm/arsnova/services/QuestionServiceTest.java b/src/test/java/de/thm/arsnova/services/QuestionServiceTest.java
index 4fb11fe63..40b972877 100644
--- a/src/test/java/de/thm/arsnova/services/QuestionServiceTest.java
+++ b/src/test/java/de/thm/arsnova/services/QuestionServiceTest.java
@@ -79,8 +79,7 @@ public class QuestionServiceTest {
@After
public final void cleanup() {
- //databaseDao.cleanupTestData();
- //setAuthenticated(false, "ptsr00");
+ SecurityContextHolder.clearContext();
}
@Test(expected = AuthenticationCredentialsNotFoundException.class)
diff --git a/src/test/java/de/thm/arsnova/services/SessionServiceTest.java b/src/test/java/de/thm/arsnova/services/SessionServiceTest.java
index c8ee1deca..986a54f01 100644
--- a/src/test/java/de/thm/arsnova/services/SessionServiceTest.java
+++ b/src/test/java/de/thm/arsnova/services/SessionServiceTest.java
@@ -31,6 +31,7 @@ import java.util.Arrays;
import java.util.List;
import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.aop.framework.Advised;
@@ -69,19 +70,7 @@ public class SessionServiceTest {
@Autowired
private StubDatabaseDao databaseDao;
- @After
- public final void cleanup() {
- databaseDao.cleanupTestData();
- userService.setUserAuthenticated(false);
- }
-
- @Test
- public void testShouldGenerateSessionKeyword() {
- assertTrue(sessionService.generateKeyword().matches("^[0-9]{8}$"));
- }
-
private void setAuthenticated(boolean isAuthenticated, String username) {
- SecurityContextHolder.clearContext();
if (isAuthenticated) {
List<GrantedAuthority> ga = new ArrayList<GrantedAuthority>();
UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(username, "secret", ga);
@@ -92,6 +81,23 @@ public class SessionServiceTest {
}
}
+ @Before
+ public final void startup() {
+ SecurityContextHolder.clearContext();
+ }
+
+ @After
+ public final void cleanup() {
+ databaseDao.cleanupTestData();
+ SecurityContextHolder.clearContext();
+ userService.setUserAuthenticated(false);
+ }
+
+ @Test
+ public void testShouldGenerateSessionKeyword() {
+ assertTrue(sessionService.generateKeyword().matches("^[0-9]{8}$"));
+ }
+
@Test(expected = NotFoundException.class)
public void testShouldFindNonExistantSession() {
setAuthenticated(true, "ptsr00");
--
GitLab