Skip to content

Commit b33ed41

Browse files
committed
Polish Tests
Tests should use an absolute path to address mock endpoints
1 parent 2fb3d3d commit b33ed41

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

itest/web/src/integration-test/java/org/springframework/security/integration/BasicAuthenticationTests.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,21 @@
1515
*/
1616
package org.springframework.security.integration;
1717

18-
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic;
19-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
20-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
21-
2218
import org.junit.Test;
19+
2320
import org.springframework.test.web.servlet.MockMvc;
2421
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
2522

23+
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic;
24+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
25+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
26+
2627
public class BasicAuthenticationTests extends AbstractWebServerIntegrationTests {
2728

2829
@Test
2930
public void httpBasicWhenAuthenticationRequiredAndNotAuthenticatedThen401() throws Exception {
3031
MockMvc mockMvc = createMockMvc("classpath:/spring/http-security-basic.xml", "classpath:/spring/in-memory-provider.xml", "classpath:/spring/testapp-servlet.xml");
31-
mockMvc.perform(get("secure/index"))
32+
mockMvc.perform(get("/secure/index"))
3233
.andExpect(status().isUnauthorized());
3334
}
3435

itest/web/src/integration-test/java/org/springframework/security/integration/ConcurrentSessionManagementTests.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,27 @@
1515
*/
1616
package org.springframework.security.integration;
1717

18-
import static org.assertj.core.api.Assertions.assertThat;
19-
import static org.hamcrest.CoreMatchers.containsString;
20-
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
21-
import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.authenticated;
22-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
23-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
24-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
25-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
26-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
27-
2818
import java.util.Collections;
2919
import java.util.List;
3020

3121
import org.junit.Test;
22+
3223
import org.springframework.mock.web.MockHttpSession;
3324
import org.springframework.security.core.context.SecurityContext;
3425
import org.springframework.security.core.session.SessionDestroyedEvent;
3526
import org.springframework.test.web.servlet.MockMvc;
3627
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
3728

29+
import static org.assertj.core.api.Assertions.assertThat;
30+
import static org.hamcrest.CoreMatchers.containsString;
31+
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
32+
import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.authenticated;
33+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
34+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
35+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
36+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
37+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
38+
3839
/**
3940
* @author Luke Taylor
4041
*/
@@ -47,7 +48,7 @@ public void maxConcurrentLoginsValueIsRespected() throws Exception {
4748

4849
MockMvc mockMvc = createMockMvc("classpath:/spring/http-security-concurrency.xml", "classpath:/spring/in-memory-provider.xml", "classpath:/spring/testapp-servlet.xml");
4950

50-
mockMvc.perform(get("secure/index").session(session1))
51+
mockMvc.perform(get("/secure/index").session(session1))
5152
.andExpect(status().is3xxRedirection());
5253

5354
MockHttpServletRequestBuilder login1 = login()

0 commit comments

Comments
 (0)