From b33ed416e1f4866da0ed13ef207d0c9f3ac13b51 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Tue, 25 Feb 2020 12:47:25 -0700 Subject: [PATCH] Polish Tests Tests should use an absolute path to address mock endpoints --- .../integration/BasicAuthenticationTests.java | 11 +++++---- .../ConcurrentSessionManagementTests.java | 23 ++++++++++--------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/itest/web/src/integration-test/java/org/springframework/security/integration/BasicAuthenticationTests.java b/itest/web/src/integration-test/java/org/springframework/security/integration/BasicAuthenticationTests.java index 5beba7b3e8..ddec15c81c 100644 --- a/itest/web/src/integration-test/java/org/springframework/security/integration/BasicAuthenticationTests.java +++ b/itest/web/src/integration-test/java/org/springframework/security/integration/BasicAuthenticationTests.java @@ -15,20 +15,21 @@ */ package org.springframework.security.integration; +import org.junit.Test; + +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; + import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import org.junit.Test; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; - public class BasicAuthenticationTests extends AbstractWebServerIntegrationTests { @Test public void httpBasicWhenAuthenticationRequiredAndNotAuthenticatedThen401() throws Exception { MockMvc mockMvc = createMockMvc("classpath:/spring/http-security-basic.xml", "classpath:/spring/in-memory-provider.xml", "classpath:/spring/testapp-servlet.xml"); - mockMvc.perform(get("secure/index")) + mockMvc.perform(get("/secure/index")) .andExpect(status().isUnauthorized()); } diff --git a/itest/web/src/integration-test/java/org/springframework/security/integration/ConcurrentSessionManagementTests.java b/itest/web/src/integration-test/java/org/springframework/security/integration/ConcurrentSessionManagementTests.java index 335f957ef3..bf6bb9153c 100644 --- a/itest/web/src/integration-test/java/org/springframework/security/integration/ConcurrentSessionManagementTests.java +++ b/itest/web/src/integration-test/java/org/springframework/security/integration/ConcurrentSessionManagementTests.java @@ -15,6 +15,17 @@ */ package org.springframework.security.integration; +import java.util.Collections; +import java.util.List; + +import org.junit.Test; + +import org.springframework.mock.web.MockHttpSession; +import org.springframework.security.core.context.SecurityContext; +import org.springframework.security.core.session.SessionDestroyedEvent; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; + import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.containsString; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; @@ -25,16 +36,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import java.util.Collections; -import java.util.List; - -import org.junit.Test; -import org.springframework.mock.web.MockHttpSession; -import org.springframework.security.core.context.SecurityContext; -import org.springframework.security.core.session.SessionDestroyedEvent; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; - /** * @author Luke Taylor */ @@ -47,7 +48,7 @@ public class ConcurrentSessionManagementTests extends AbstractWebServerIntegrati MockMvc mockMvc = createMockMvc("classpath:/spring/http-security-concurrency.xml", "classpath:/spring/in-memory-provider.xml", "classpath:/spring/testapp-servlet.xml"); - mockMvc.perform(get("secure/index").session(session1)) + mockMvc.perform(get("/secure/index").session(session1)) .andExpect(status().is3xxRedirection()); MockHttpServletRequestBuilder login1 = login()