From f55336ba559da2d3bfb5c48b53ebb8c94f2900a1 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Mon, 29 Sep 2008 02:23:00 +0000 Subject: [PATCH] Renamed SecurityTestUtil to SecurityTestUtils. --- .../{SecurityTestUtil.java => SecurityTestUtils.java} | 2 +- .../channel/ChannelAdapterSecurityIntegrationTests.java | 4 ++-- .../security/channel/ChannelSecurityInterceptorTests.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) rename org.springframework.integration.security/src/test/java/org/springframework/integration/security/{SecurityTestUtil.java => SecurityTestUtils.java} (98%) diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/SecurityTestUtil.java b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/SecurityTestUtils.java similarity index 98% rename from org.springframework.integration.security/src/test/java/org/springframework/integration/security/SecurityTestUtil.java rename to org.springframework.integration.security/src/test/java/org/springframework/integration/security/SecurityTestUtils.java index 58bbfa6d17..bc1197b77b 100644 --- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/SecurityTestUtil.java +++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/SecurityTestUtils.java @@ -25,7 +25,7 @@ import org.springframework.security.providers.UsernamePasswordAuthenticationToke /** * @author Jonas Partner */ -public class SecurityTestUtil { +public class SecurityTestUtils { public static SecurityContext createContext(String username, String password, String... roles) { SecurityContextImpl ctxImpl = new SecurityContextImpl(); diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests.java b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests.java index 9db5bf5f6f..d6fd135485 100644 --- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests.java +++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests.java @@ -25,7 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.message.StringMessage; -import org.springframework.integration.security.SecurityTestUtil; +import org.springframework.integration.security.SecurityTestUtils; import org.springframework.security.AccessDeniedException; import org.springframework.security.AuthenticationException; import org.springframework.security.context.SecurityContext; @@ -104,7 +104,7 @@ public class ChannelAdapterSecurityIntegrationTests extends AbstractJUnit4Spring private void login(String username, String password, String... roles) { - SecurityContext context = SecurityTestUtil.createContext(username, password, roles); + SecurityContext context = SecurityTestUtils.createContext(username, password, roles); SecurityContextHolder.setContext(context); } diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java index 41b3f10e97..f96355abd8 100644 --- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java +++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java @@ -26,7 +26,7 @@ import org.springframework.aop.framework.ProxyFactory; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.message.StringMessage; -import org.springframework.integration.security.SecurityTestUtil; +import org.springframework.integration.security.SecurityTestUtils; import org.springframework.security.AccessDeniedException; import org.springframework.security.AuthenticationException; import org.springframework.security.MockAuthenticationManager; @@ -54,7 +54,7 @@ public class ChannelSecurityInterceptorTests { @Test(expected = AccessDeniedException.class) public void securedSendWithoutRole() throws Exception { MessageChannel channel = getSecuredChannel("ROLE_ADMIN"); - SecurityContext context = SecurityTestUtil.createContext("test", "pwd", "ROLE_USER"); + SecurityContext context = SecurityTestUtils.createContext("test", "pwd", "ROLE_USER"); SecurityContextHolder.setContext(context); channel.send(new StringMessage("test")); } @@ -62,7 +62,7 @@ public class ChannelSecurityInterceptorTests { @Test public void securedSendWithRole() throws Exception { MessageChannel channel = getSecuredChannel("ROLE_ADMIN"); - SecurityContext context = SecurityTestUtil.createContext("test", "pwd", "ROLE_ADMIN"); + SecurityContext context = SecurityTestUtils.createContext("test", "pwd", "ROLE_ADMIN"); SecurityContextHolder.setContext(context); channel.send(new StringMessage("test")); }