From 95bc670dd5a67922f460cb61cf9868d3b0cf157d Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 24 Aug 2020 09:48:32 -0500 Subject: [PATCH] Polish itest format Issue gh-8945 --- .../AbstractWebServerIntegrationTests.java | 6 +++- .../integration/BasicAuthenticationTests.java | 10 +++++-- .../ConcurrentSessionManagementTests.java | 29 +++++++++++++++---- 3 files changed, 37 insertions(+), 8 deletions(-) diff --git a/itest/web/src/integration-test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java b/itest/web/src/integration-test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java index 272e663ea1..8f1ef5b8e1 100644 --- a/itest/web/src/integration-test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java +++ b/itest/web/src/integration-test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java @@ -56,7 +56,11 @@ public abstract class AbstractWebServerIntegrationTests { context.refresh(); this.context = context; - return MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build(); + // @formatter:off + return MockMvcBuilders.webAppContextSetup(context) + .apply(springSecurity()) + .build(); + // @formatter:on } } 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 583f91fb72..3b69dd4899 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 @@ -31,14 +31,20 @@ public class BasicAuthenticationTests extends AbstractWebServerIntegrationTests 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")).andExpect(status().isUnauthorized()); + // @formatter:off + mockMvc.perform(get("/secure/index")) + .andExpect(status().isUnauthorized()); + // @formatter:on } @Test public void httpBasicWhenProvidedThen200() throws Exception { MockMvc mockMvc = createMockMvc("classpath:/spring/http-security-basic.xml", "classpath:/spring/in-memory-provider.xml", "classpath:/spring/testapp-servlet.xml"); - MockHttpServletRequestBuilder request = get("/secure/index").with(httpBasic("johnc", "johncspassword")); + // @formatter:off + MockHttpServletRequestBuilder request = get("/secure/index") + .with(httpBasic("johnc", "johncspassword")); + // @formatter:on mockMvc.perform(request).andExpect(status().isOk()); } 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 4f74d2b48f..6d93da3973 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 @@ -50,19 +50,27 @@ 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)).andExpect(status().is3xxRedirection()); + // @formatter:off + mockMvc.perform(get("/secure/index").session(session1)) + .andExpect(status().is3xxRedirection()); + // @formatter:on MockHttpServletRequestBuilder login1 = login().session(session1); mockMvc.perform(login1).andExpect(authenticated().withUsername("jimi")); MockHttpServletRequestBuilder login2 = login().session(session2); - mockMvc.perform(login2).andExpect(redirectedUrl("/login.jsp?login_error=true")); + // @formatter:off + mockMvc.perform(login2) + .andExpect(redirectedUrl("/login.jsp?login_error=true")); + // @formatter:on Exception exception = (Exception) session2.getAttribute("SPRING_SECURITY_LAST_EXCEPTION"); assertThat(exception).isNotNull(); assertThat(exception.getMessage()).contains("Maximum sessions of 1 for this principal exceeded"); // Now logout to kill first session - mockMvc.perform(post("/logout").with(csrf())).andExpect(status().is3xxRedirection()) + // @formatter:off + mockMvc.perform(post("/logout").with(csrf())) + .andExpect(status().is3xxRedirection()) .andDo((result) -> this.context.publishEvent(new SessionDestroyedEvent(session1) { @Override public List getSecurityContexts() { @@ -74,17 +82,28 @@ public class ConcurrentSessionManagementTests extends AbstractWebServerIntegrati return session1.getId(); } })); + // @formatter:on // Try second session again login2 = login().session(session2); - mockMvc.perform(login2).andExpect(authenticated().withUsername("jimi")); + // @formatter:off + mockMvc.perform(login2) + .andExpect(authenticated().withUsername("jimi")); + // @formatter:on + // @formatter:off mockMvc.perform(get("/secure/index").session(session2)) .andExpect(content().string(containsString("A Secure Page"))); + // @formatter:on } private MockHttpServletRequestBuilder login() { - return post("/login").param("username", "jimi").param("password", "jimispassword").with(csrf()); + // @formatter:off + return post("/login") + .param("username", "jimi") + .param("password", "jimispassword") + .with(csrf()); + // @formatter:on } }