Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactored MethodInvokingTarget to MethodInvokingConsumer including changes to OutboundChannelAdapter.

Browse Source
This commit is contained in:
Mark Fisher
2008-09-19 19:55:47 +00:00
parent eb9663dad3
commit 2d66b2b67d
13 changed files with 70 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests-context.xml
View File

@@ -24,10 +24,10 @@
<si-security:access-policy pattern="secured.*" send-access="ROLE_ADMIN"/>
</si-security:secured-channels>
<beans:bean id="testTarget" class="org.springframework.integration.security.endpoint.TestTarget"/>
<beans:bean id="testConsumer" class="org.springframework.integration.security.endpoint.TestConsumer"/>
<channel-adapter id="securedChannelAdapter" target="testTarget"/>
<channel-adapter id="securedChannelAdapter" target="testConsumer"/>
<channel-adapter id="unsecuredChannelAdapter" target="testTarget"/>
<channel-adapter id="unsecuredChannelAdapter" target="testConsumer"/>
</beans:beans>

12
org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests.java
View File

@@ -26,7 +26,7 @@ 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.endpoint.TestTarget;
import org.springframework.integration.security.endpoint.TestConsumer;
import org.springframework.security.AccessDeniedException;
import org.springframework.security.AuthenticationException;
import org.springframework.security.context.SecurityContext;
@@ -50,7 +50,7 @@ public class ChannelAdapterSecurityIntegrationTests extends AbstractJUnit4Spring
MessageChannel unsecuredChannelAdapter;
@Autowired
TestTarget testTarget;
TestConsumer testConsumer;
@After
@@ -64,7 +64,7 @@ public class ChannelAdapterSecurityIntegrationTests extends AbstractJUnit4Spring
public void testSecuredWithPermission() {
login("bob", "bobspassword", "ROLE_ADMIN");
securedChannelAdapter.send(new StringMessage("test"));
assertEquals("Wrong size of message list in target", 1, testTarget.sentMessages.size());
assertEquals("Wrong size of message list in target", 1, testConsumer.sentMessages.size());
}
@Test(expected = AccessDeniedException.class)
@@ -85,7 +85,7 @@ public class ChannelAdapterSecurityIntegrationTests extends AbstractJUnit4Spring
public void testUnsecuredAsAdmin() {
login("bob", "bobspassword", "ROLE_ADMIN");
unsecuredChannelAdapter.send(new StringMessage("test"));
assertEquals("Wrong size of message list in target", 1, testTarget.sentMessages.size());
assertEquals("Wrong size of message list in target", 1, testConsumer.sentMessages.size());
}
@Test
@@ -93,14 +93,14 @@ public class ChannelAdapterSecurityIntegrationTests extends AbstractJUnit4Spring
public void testUnsecuredAsUser() {
login("bob", "bobspassword", "ROLE_USER");
unsecuredChannelAdapter.send(new StringMessage("test"));
assertEquals("Wrong size of message list in target", 1, testTarget.sentMessages.size());
assertEquals("Wrong size of message list in target", 1, testConsumer.sentMessages.size());
}
@Test
@DirtiesContext
public void testUnsecuredWithoutAuthenticating() {
unsecuredChannelAdapter.send(new StringMessage("test"));
assertEquals("Wrong size of message list in target", 1, testTarget.sentMessages.size());
assertEquals("Wrong size of message list in target", 1, testConsumer.sentMessages.size());
}

6
org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/EndpointSecurityIntegrationTests-context.xml
View File

@@ -24,13 +24,13 @@
</interceptors>
</service-activator>
<channel-adapter id="output" target="testTarget"/>
<channel-adapter id="output" target="testConsumer"/>
<beans:bean id="testHandler"
class="org.springframework.integration.security.endpoint.TestHandler"/>
<beans:bean id="testTarget"
class="org.springframework.integration.security.endpoint.TestTarget"/>
<beans:bean id="testConsumer"
class="org.springframework.integration.security.endpoint.TestConsumer"/>
<beans:bean id="accessDecisionManager"
class="org.springframework.security.vote.AffirmativeBased">

4
org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/EndpointSecurityIntegrationTests.java
View File

@@ -49,7 +49,7 @@ public class EndpointSecurityIntegrationTests extends AbstractJUnit4SpringContex
TestHandler testHandler;
@Autowired
TestTarget testTarget;
TestConsumer testConsumer;
@After
@@ -63,7 +63,7 @@ public class EndpointSecurityIntegrationTests extends AbstractJUnit4SpringContex
login("bob", "bobspassword", "ROLE_ADMIN");
input.send(new StringMessage("test"));
assertEquals("Wrong size of message list in handler", 1, testHandler.sentMessages.size());
assertEquals("Wrong size of message list in target", 1, testTarget.sentMessages.size());
assertEquals("Wrong size of message list in consumer", 1, testConsumer.sentMessages.size());
}
@Test(expected = AccessDeniedException.class)

7
org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/TestTarget.java → org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/TestConsumer.java
View File

@@ -20,15 +20,14 @@ import java.util.ArrayList;
import java.util.List;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageTarget;
import org.springframework.integration.message.MessageConsumer;
public class TestTarget implements MessageTarget {
public class TestConsumer implements MessageConsumer {
public List<Message<?>> sentMessages = new ArrayList<Message<?>>();
public boolean send(Message<?> message) {
public void onMessage(Message<?> message) {
sentMessages.add(message);
return true;
}
}