INT-799: Remove Core Deps from s-i-test
JIRA: https://jira.spring.io/browse/INT-799 Some test classes (e.g. `TestUtils`) were duplicated in core to avoid cyclic dependency. Now that core messaging has been moved to spring-messaging, it is possible to remove the dependencies on `spring-integration-core` from `spring-integration-test`. A few minor test cases have been moved to `spring-integration-core`. The simple polishing to the `build.gradle` and `ServiceActivatorOnMockitoMockTests`
This commit is contained in:
Gary Russell
committed by
Artem Bilan
Artem Bilan
parent
5850022bfe
commit
d16cd9748c
@@ -26,7 +26,7 @@ import org.springframework.util.ObjectUtils;
|
||||
* wrapped by the {@link EqualsResultMatcher.Evaluator}
|
||||
*
|
||||
* The goal is to defer the computation until the matcher needs to be actually evaluated.
|
||||
* Mainly useful in conjunction with retrying matcherss such as {@link EventuallyMatcher}
|
||||
* Mainly useful in conjunction with retrying matchers such as {@link EventuallyMatcher}
|
||||
*
|
||||
* @author Marius Bogoevici
|
||||
* @since 4.2
|
||||
|
||||
@@ -25,7 +25,6 @@ import org.hamcrest.Factory;
|
||||
import org.hamcrest.Matcher;
|
||||
import org.junit.Assert;
|
||||
|
||||
import org.springframework.integration.IntegrationMessageHeaderAccessor;
|
||||
import org.springframework.messaging.Message;
|
||||
import org.springframework.messaging.MessageHeaders;
|
||||
|
||||
@@ -125,7 +124,7 @@ public class HeaderMatcher extends TypeSafeMatcher<Message<?>> {
|
||||
|
||||
@Factory
|
||||
public static <T> Matcher<Message<?>> hasCorrelationId(T value) {
|
||||
return new HeaderMatcher(MapContentMatchers.hasEntry(IntegrationMessageHeaderAccessor.CORRELATION_ID, value));
|
||||
return new HeaderMatcher(MapContentMatchers.hasEntry("correlationId", value));
|
||||
}
|
||||
|
||||
@Factory
|
||||
@@ -135,7 +134,7 @@ public class HeaderMatcher extends TypeSafeMatcher<Message<?>> {
|
||||
|
||||
@Factory
|
||||
public static Matcher<Message<?>> hasSequenceNumber(Matcher<Integer> matcher) {
|
||||
return new HeaderMatcher(MapContentMatchers.hasEntry(IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER, matcher));
|
||||
return new HeaderMatcher(MapContentMatchers.hasEntry("sequenceNumber", matcher));
|
||||
}
|
||||
|
||||
@Factory
|
||||
@@ -145,7 +144,7 @@ public class HeaderMatcher extends TypeSafeMatcher<Message<?>> {
|
||||
|
||||
@Factory
|
||||
public static Matcher<Message<?>> hasSequenceSize(Matcher<Integer> value) {
|
||||
return new HeaderMatcher(MapContentMatchers.hasEntry(IntegrationMessageHeaderAccessor.SEQUENCE_SIZE, value));
|
||||
return new HeaderMatcher(MapContentMatchers.hasEntry("sequenceSize", value));
|
||||
}
|
||||
|
||||
@Factory
|
||||
@@ -155,7 +154,7 @@ public class HeaderMatcher extends TypeSafeMatcher<Message<?>> {
|
||||
|
||||
@Factory
|
||||
public static Matcher<Message<?>> hasExpirationDate(Matcher<Long> matcher) {
|
||||
return new HeaderMatcher(MapContentMatchers.hasEntry(IntegrationMessageHeaderAccessor.EXPIRATION_DATE, matcher));
|
||||
return new HeaderMatcher(MapContentMatchers.hasEntry("expirationDate", matcher));
|
||||
}
|
||||
|
||||
@Factory
|
||||
|
||||
@@ -16,14 +16,17 @@
|
||||
|
||||
package org.springframework.integration.test.util;
|
||||
|
||||
import static org.hamcrest.CoreMatchers.is;
|
||||
import static org.junit.Assert.assertThat;
|
||||
|
||||
import java.io.File;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.List;
|
||||
import java.util.Properties;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
|
||||
import org.hamcrest.Matcher;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
import org.springframework.beans.DirectFieldAccessor;
|
||||
import org.springframework.beans.FatalBeanException;
|
||||
@@ -33,21 +36,17 @@ import org.springframework.beans.factory.BeanNameAware;
|
||||
import org.springframework.beans.factory.InitializingBean;
|
||||
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
|
||||
import org.springframework.context.support.GenericApplicationContext;
|
||||
import org.springframework.integration.MessageRejectedException;
|
||||
import org.springframework.integration.channel.MessagePublishingErrorHandler;
|
||||
import org.springframework.integration.context.IntegrationContextUtils;
|
||||
import org.springframework.integration.endpoint.AbstractEndpoint;
|
||||
import org.springframework.integration.history.MessageHistory;
|
||||
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
|
||||
import org.springframework.integration.support.context.NamedComponent;
|
||||
import org.springframework.messaging.Message;
|
||||
import org.springframework.messaging.MessageChannel;
|
||||
import org.springframework.messaging.MessageDeliveryException;
|
||||
import org.springframework.messaging.MessageHandler;
|
||||
import org.springframework.messaging.MessageHandlingException;
|
||||
import org.springframework.messaging.MessagingException;
|
||||
import org.springframework.messaging.support.ErrorMessage;
|
||||
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
|
||||
import org.springframework.util.Assert;
|
||||
import org.springframework.util.ClassUtils;
|
||||
import org.springframework.util.ErrorHandler;
|
||||
import org.springframework.util.ReflectionUtils;
|
||||
import org.springframework.util.ReflectionUtils.MethodCallback;
|
||||
import org.springframework.util.ReflectionUtils.MethodFilter;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
/**
|
||||
@@ -55,6 +54,7 @@ import org.springframework.util.StringUtils;
|
||||
* @author Iwein Fuld
|
||||
* @author Oleg Zhurakousky
|
||||
* @author Artem Bilan
|
||||
* @author Gary Russell
|
||||
*/
|
||||
public abstract class TestUtils {
|
||||
|
||||
@@ -87,10 +87,10 @@ public abstract class TestUtils {
|
||||
|
||||
public static TestApplicationContext createTestApplicationContext() {
|
||||
TestApplicationContext context = new TestApplicationContext();
|
||||
ErrorHandler errorHandler = new MessagePublishingErrorHandler(new BeanFactoryChannelResolver(context));
|
||||
ErrorHandler errorHandler = new MessagePublishingErrorHandler(context);
|
||||
ThreadPoolTaskScheduler scheduler = createTaskScheduler(10);
|
||||
scheduler.setErrorHandler(errorHandler);
|
||||
registerBean(IntegrationContextUtils.TASK_SCHEDULER_BEAN_NAME, scheduler, context);
|
||||
registerBean("taskScheduler", scheduler, context);
|
||||
return context;
|
||||
}
|
||||
|
||||
@@ -135,32 +135,59 @@ public abstract class TestUtils {
|
||||
super();
|
||||
}
|
||||
|
||||
public void registerChannel(String channelName, MessageChannel channel) {
|
||||
if (channel instanceof NamedComponent && ((NamedComponent) channel).getComponentName() != null) {
|
||||
public void registerChannel(String channelName, final MessageChannel channel) {
|
||||
String componentName = getComponentNameIfNamed(channel);
|
||||
if (componentName != null) {
|
||||
if (channelName == null) {
|
||||
channelName = ((NamedComponent) channel).getComponentName();
|
||||
channelName = componentName;
|
||||
}
|
||||
else {
|
||||
Assert.isTrue(((NamedComponent) channel).getComponentName().equals(channelName),
|
||||
Assert.isTrue(componentName.equals(channelName),
|
||||
"channel name has already been set with a conflicting value");
|
||||
}
|
||||
}
|
||||
registerBean(channelName, channel, this);
|
||||
TestUtils.registerBean(channelName, channel, this);
|
||||
}
|
||||
|
||||
public void registerEndpoint(String endpointName, AbstractEndpoint endpoint) {
|
||||
registerBean(endpointName, endpoint, this);
|
||||
}
|
||||
}
|
||||
private String getComponentNameIfNamed(final MessageChannel channel) {
|
||||
Set<Class<?>> interfaces = ClassUtils.getAllInterfacesAsSet(channel);
|
||||
final AtomicReference<String> componentName = new AtomicReference<String>();
|
||||
for (Class<?> intface : interfaces) {
|
||||
if ("org.springframework.integration.support.context.NamedComponent".equals(intface.getName())) {
|
||||
ReflectionUtils.doWithMethods(channel.getClass(), new MethodCallback() {
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
||||
public static MessageHandler handlerExpecting(final Matcher<Message> messageMatcher) {
|
||||
return new MessageHandler() {
|
||||
@Override
|
||||
public void handleMessage(Message<?> message) throws MessageRejectedException, MessageHandlingException, MessageDeliveryException {
|
||||
assertThat(message, is(messageMatcher));
|
||||
@Override
|
||||
public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException {
|
||||
try {
|
||||
componentName.set((String) method.invoke(channel, new Object[0]));
|
||||
}
|
||||
catch (InvocationTargetException e) {
|
||||
throw new IllegalArgumentException(e);
|
||||
}
|
||||
}
|
||||
|
||||
}, new MethodFilter() {
|
||||
|
||||
@Override
|
||||
public boolean matches(Method method) {
|
||||
return method.getName().equals("getComponentName");
|
||||
}
|
||||
|
||||
});
|
||||
break;
|
||||
}
|
||||
}
|
||||
};
|
||||
return componentName.get();
|
||||
}
|
||||
|
||||
public void registerEndpoint(String endpointName, Object endpoint) {
|
||||
TestUtils.registerBean(endpointName, endpoint, this);
|
||||
}
|
||||
|
||||
public void registerBean(String beanName, Object bean) {
|
||||
TestUtils.registerBean(beanName, bean, this);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -169,7 +196,7 @@ public abstract class TestUtils {
|
||||
* @param startingIndex the index to start scanning
|
||||
* @return the properties provided by the named component or null if none available
|
||||
*/
|
||||
public static Properties locateComponentInHistory(MessageHistory history, String componentName, int startingIndex){
|
||||
public static Properties locateComponentInHistory(List<Properties> history, String componentName, int startingIndex) {
|
||||
Assert.notNull(history, "'history' must not be null");
|
||||
Assert.isTrue(StringUtils.hasText(componentName), "'componentName' must be provided");
|
||||
Assert.isTrue(startingIndex < history.size(), "'startingIndex' can not be greater then size of history");
|
||||
@@ -192,4 +219,60 @@ public abstract class TestUtils {
|
||||
public static String applySystemFileSeparator(String s) {
|
||||
return s.replaceAll("/", java.util.regex.Matcher.quoteReplacement(File.separator));
|
||||
}
|
||||
|
||||
private static class MessagePublishingErrorHandler implements ErrorHandler {
|
||||
|
||||
private final Log logger = LogFactory.getLog(this.getClass());
|
||||
|
||||
private final TestApplicationContext context;
|
||||
|
||||
private MessagePublishingErrorHandler(TestApplicationContext ctx) {
|
||||
this.context = ctx;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleError(Throwable t) {
|
||||
MessageChannel errorChannel = this.resolveErrorChannel(t);
|
||||
boolean sent = false;
|
||||
if (errorChannel != null) {
|
||||
try {
|
||||
sent = errorChannel.send(new ErrorMessage(t), 10000);
|
||||
}
|
||||
catch (Throwable errorDeliveryError) {//NOSONAR
|
||||
// message will be logged only
|
||||
if (logger.isWarnEnabled()) {
|
||||
logger.warn("Error message was not delivered.", errorDeliveryError);
|
||||
}
|
||||
if (errorDeliveryError instanceof Error) {
|
||||
throw ((Error) errorDeliveryError);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!sent && logger.isErrorEnabled()) {
|
||||
Message<?> failedMessage = (t instanceof MessagingException) ?
|
||||
((MessagingException) t).getFailedMessage() : null;
|
||||
if (failedMessage != null) {
|
||||
logger.error("failure occurred in messaging task with message: " + failedMessage, t);
|
||||
}
|
||||
else {
|
||||
logger.error("failure occurred in messaging task", t);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private MessageChannel resolveErrorChannel(Throwable t) {
|
||||
Message<?> failedMessage = (t instanceof MessagingException) ?
|
||||
((MessagingException) t).getFailedMessage() : null;
|
||||
Object errorChannelHeader = failedMessage.getHeaders().getErrorChannel();
|
||||
if (errorChannelHeader instanceof MessageChannel) {
|
||||
return (MessageChannel) errorChannelHeader;
|
||||
}
|
||||
Assert.isInstanceOf(String.class, errorChannelHeader,
|
||||
"Unsupported error channel header type. Expected MessageChannel or String, but actual type is [" +
|
||||
errorChannelHeader.getClass() + "]");
|
||||
return this.context.getBean((String) errorChannelHeader, MessageChannel.class);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,201 +0,0 @@
|
||||
/*
|
||||
* Copyright 2002-2013 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.integration.test.matcher;
|
||||
|
||||
import static org.hamcrest.CoreMatchers.instanceOf;
|
||||
import static org.hamcrest.CoreMatchers.any;
|
||||
import static org.hamcrest.CoreMatchers.is;
|
||||
import static org.hamcrest.CoreMatchers.not;
|
||||
import static org.hamcrest.CoreMatchers.notNullValue;
|
||||
import static org.hamcrest.CoreMatchers.nullValue;
|
||||
|
||||
import static org.junit.Assert.assertThat;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.springframework.integration.test.matcher.HeaderMatcher.hasAllHeaders;
|
||||
import static org.springframework.integration.test.matcher.HeaderMatcher.hasCorrelationId;
|
||||
import static org.springframework.integration.test.matcher.HeaderMatcher.hasExpirationDate;
|
||||
import static org.springframework.integration.test.matcher.HeaderMatcher.hasHeader;
|
||||
import static org.springframework.integration.test.matcher.HeaderMatcher.hasHeaderKey;
|
||||
import static org.springframework.integration.test.matcher.HeaderMatcher.hasMessageId;
|
||||
import static org.springframework.integration.test.matcher.HeaderMatcher.hasSequenceNumber;
|
||||
import static org.springframework.integration.test.matcher.HeaderMatcher.hasSequenceSize;
|
||||
import static org.springframework.integration.test.matcher.HeaderMatcher.hasTimestamp;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.hamcrest.Matcher;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.springframework.messaging.Message;
|
||||
import org.springframework.integration.support.MessageBuilder;
|
||||
|
||||
/**
|
||||
* @author Alex Peters
|
||||
* @author Iwein Fuld
|
||||
* @author Gunnar Hillert
|
||||
*
|
||||
*/
|
||||
public class HeaderMatcherTests {
|
||||
|
||||
static final String UNKNOWN_KEY = "unknownKey";
|
||||
|
||||
static final String ANY_HEADER_VALUE = "bar";
|
||||
|
||||
static final String ANY_HEADER_KEY = "test.foo";
|
||||
|
||||
static final String ANY_PAYLOAD = "bla";
|
||||
|
||||
static final String OTHER_HEADER_KEY = "test.number";
|
||||
|
||||
static final Integer OTHER_HEADER_VALUE = Integer.valueOf(123);
|
||||
|
||||
Message<?> message;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
message = MessageBuilder.withPayload(ANY_PAYLOAD).setHeader(ANY_HEADER_KEY, ANY_HEADER_VALUE).setHeader(
|
||||
OTHER_HEADER_KEY, OTHER_HEADER_VALUE).build();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void hasEntry_withValidKeyValue_matches() throws Exception {
|
||||
assertThat(message, hasHeader(ANY_HEADER_KEY, ANY_HEADER_VALUE));
|
||||
assertThat(message, hasHeader(OTHER_HEADER_KEY, OTHER_HEADER_VALUE));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void hasEntry_withUnknownKey_notMatching() throws Exception {
|
||||
assertThat(message, not(hasHeader("test.unknown", ANY_HEADER_VALUE)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void hasEntry_withValidKeyAndMatcherValue_matches() throws Exception {
|
||||
assertThat(message, hasHeader(ANY_HEADER_KEY, is(instanceOf(String.class))));
|
||||
assertThat(message, hasHeader(ANY_HEADER_KEY, notNullValue()));
|
||||
assertThat(message, hasHeader(ANY_HEADER_KEY, is(ANY_HEADER_VALUE)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void hasEntry_withValidKeyAndMatcherValue_notMatching() throws Exception {
|
||||
assertThat(message, not(hasHeader(ANY_HEADER_KEY, is(instanceOf(Integer.class)))));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void hasKey_withValidKey_matches() throws Exception {
|
||||
assertThat(message, hasHeaderKey(ANY_HEADER_KEY));
|
||||
assertThat(message, hasHeaderKey(OTHER_HEADER_KEY));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void hasKey_withInvalidKey_notMatching() throws Exception {
|
||||
assertThat(message, not(hasHeaderKey(UNKNOWN_KEY)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void hasAllEntries_withMessageHeader_matches() throws Exception {
|
||||
Map<String, Object> expectedInHeaderMap = message.getHeaders();
|
||||
assertThat(message, hasAllHeaders(expectedInHeaderMap));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void hasAllEntries_withValidKeyValueOrMatcherValue_matches() throws Exception {
|
||||
Map<String, Object> expectedInHeaderMap = new HashMap<String, Object>();
|
||||
expectedInHeaderMap.put(ANY_HEADER_KEY, ANY_HEADER_VALUE);
|
||||
expectedInHeaderMap.put(OTHER_HEADER_KEY, is(OTHER_HEADER_VALUE));
|
||||
assertThat(message, hasAllHeaders(expectedInHeaderMap));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void hasAllEntries_withInvalidValidKeyValueOrMatcherValue_notMatching() throws Exception {
|
||||
Map<String, Object> expectedInHeaderMap = new HashMap<String, Object>();
|
||||
expectedInHeaderMap.put(ANY_HEADER_KEY, ANY_HEADER_VALUE); // valid
|
||||
expectedInHeaderMap.put(UNKNOWN_KEY, not(nullValue())); // fails
|
||||
assertThat(message, not(hasAllHeaders(expectedInHeaderMap)));
|
||||
expectedInHeaderMap.remove(UNKNOWN_KEY);
|
||||
expectedInHeaderMap.put(OTHER_HEADER_KEY, ANY_HEADER_VALUE); // fails
|
||||
}
|
||||
|
||||
@Test
|
||||
public void readableException_singleHeader() throws Exception {
|
||||
try {
|
||||
assertThat(message, hasHeader("corn", "bread"));
|
||||
}
|
||||
catch (AssertionError ae) {
|
||||
assertTrue(ae.getMessage().contains("Expected: a Message with Headers containing "));
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void readableException_allHeaders() throws Exception {
|
||||
try {
|
||||
Map<String, String> entries = new HashMap<String, String>();
|
||||
entries.put("corn", "bread");
|
||||
entries.put("chocolate", "pudding");
|
||||
assertThat(message, hasAllHeaders(entries));
|
||||
}
|
||||
catch (AssertionError ae) {
|
||||
assertTrue(ae.getMessage().contains("Expected: a Message with Headers containing "));
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void hasMessageId_sameId() throws Exception {
|
||||
assertThat(message, hasMessageId(message.getHeaders().getId()));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void hasCorrelationId_() throws Exception {
|
||||
UUID correlationId = message.getHeaders().getId();
|
||||
message = MessageBuilder.withPayload("blabla").setCorrelationId(correlationId).build();
|
||||
assertThat(message, hasCorrelationId(correlationId));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void hasSequenceNumber_() throws Exception {
|
||||
int sequenceNumber = 123;
|
||||
message = MessageBuilder.fromMessage(message).setSequenceNumber(sequenceNumber).build();
|
||||
assertThat(message, hasSequenceNumber(sequenceNumber));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void hasSequenceSize_() throws Exception {
|
||||
int sequenceSize = 123;
|
||||
message = MessageBuilder.fromMessage(message).setSequenceSize(sequenceSize).build();
|
||||
assertThat(message, hasSequenceSize(sequenceSize));
|
||||
assertThat(message, hasSequenceSize(is(sequenceSize)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void hasTimestamp_() throws Exception {
|
||||
assertThat(message, hasTimestamp(new Date(message.getHeaders().getTimestamp())));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void hasExpirationDate_() throws Exception {
|
||||
Matcher<Long> anyMatcher = any(Long.class);
|
||||
|
||||
assertThat(message, not(hasExpirationDate(anyMatcher)));
|
||||
Date expirationDate = new Date(System.currentTimeMillis() + 10000);
|
||||
message = MessageBuilder.fromMessage(message).setExpirationDate(expirationDate).build();
|
||||
assertThat(message, hasExpirationDate(expirationDate));
|
||||
assertThat(message, hasExpirationDate(not(is((System.currentTimeMillis())))));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2013 the original author or authors.
|
||||
* Copyright 2002-2015 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -15,21 +15,8 @@
|
||||
*/
|
||||
package org.springframework.integration.test.matcher;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.exceptions.verification.junit.ArgumentsAreDifferent;
|
||||
import org.mockito.runners.MockitoJUnitRunner;
|
||||
import org.springframework.messaging.Message;
|
||||
import org.springframework.messaging.MessageChannel;
|
||||
import org.springframework.messaging.MessageHandler;
|
||||
import org.springframework.integration.support.MessageBuilder;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import static org.hamcrest.CoreMatchers.is;
|
||||
import static org.hamcrest.CoreMatchers.instanceOf;
|
||||
import static org.hamcrest.CoreMatchers.is;
|
||||
import static org.hamcrest.CoreMatchers.nullValue;
|
||||
import static org.junit.Assert.assertThat;
|
||||
import static org.mockito.Mockito.verify;
|
||||
@@ -37,6 +24,20 @@ import static org.mockito.Mockito.when;
|
||||
import static org.springframework.integration.test.matcher.MockitoMessageMatchers.messageWithHeaderEntry;
|
||||
import static org.springframework.integration.test.matcher.MockitoMessageMatchers.messageWithPayload;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.exceptions.verification.junit.ArgumentsAreDifferent;
|
||||
import org.mockito.runners.MockitoJUnitRunner;
|
||||
|
||||
import org.springframework.messaging.Message;
|
||||
import org.springframework.messaging.MessageChannel;
|
||||
import org.springframework.messaging.MessageHandler;
|
||||
import org.springframework.messaging.support.MessageBuilder;
|
||||
|
||||
/**
|
||||
* @author Alex Peters
|
||||
* @author Iwein Fuld
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2013 the original author or authors.
|
||||
* Copyright 2002-2015 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -15,8 +15,8 @@
|
||||
*/
|
||||
package org.springframework.integration.test.matcher;
|
||||
|
||||
import static org.hamcrest.CoreMatchers.is;
|
||||
import static org.hamcrest.CoreMatchers.instanceOf;
|
||||
import static org.hamcrest.CoreMatchers.is;
|
||||
import static org.hamcrest.CoreMatchers.not;
|
||||
import static org.hamcrest.CoreMatchers.notNullValue;
|
||||
import static org.junit.Assert.assertThat;
|
||||
@@ -26,8 +26,9 @@ import static org.springframework.integration.test.matcher.PayloadMatcher.hasPay
|
||||
import java.math.BigDecimal;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
import org.springframework.messaging.Message;
|
||||
import org.springframework.integration.support.MessageBuilder;
|
||||
import org.springframework.messaging.support.MessageBuilder;
|
||||
|
||||
/**
|
||||
* @author Alex Peters
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||
xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns:context="http://www.springframework.org/schema/context"
|
||||
xmlns:util="http://www.springframework.org/schema/util"
|
||||
xmlns:int="http://www.springframework.org/schema/integration"
|
||||
xsi:schemaLocation="
|
||||
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
|
||||
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
|
||||
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
|
||||
http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
|
||||
|
||||
<int:channel id="in" />
|
||||
|
||||
<int:chain input-channel="in" output-channel="out">
|
||||
<int:filter expression="payload == 'singleAnnotatedMethodOnClass'" throw-exception-on-rejection="true"/>
|
||||
<int:service-activator ref="singleAnnotatedMethodOnClass" />
|
||||
</int:chain>
|
||||
|
||||
<bean id="singleAnnotatedMethodOnClass" class="org.mockito.Mockito"
|
||||
factory-method="mock">
|
||||
<constructor-arg
|
||||
value="org.springframework.integration.test.mockito.ServiceActivatorOnMockitoMockTests.SingleAnnotatedMethodOnClass" />
|
||||
</bean>
|
||||
|
||||
<int:chain input-channel="in" output-channel="out">
|
||||
<int:filter expression="payload == 'SingleMethodOnClass'" throw-exception-on-rejection="true"/>
|
||||
<int:service-activator ref="singleMethodOnClass" />
|
||||
</int:chain>
|
||||
|
||||
<bean id="singleMethodOnClass" class="org.mockito.Mockito"
|
||||
factory-method="mock">
|
||||
<constructor-arg
|
||||
value="org.springframework.integration.test.mockito.ServiceActivatorOnMockitoMockTests.SingleMethodOnClass" />
|
||||
</bean>
|
||||
|
||||
<int:chain input-channel="in" output-channel="out">
|
||||
<int:filter expression="payload == 'SingleMethodAcceptingHeaderOnClass'" throw-exception-on-rejection="true"/>
|
||||
<int:service-activator ref="singleMethodAcceptingHeaderOnClass" />
|
||||
</int:chain>
|
||||
|
||||
<bean id="singleMethodAcceptingHeaderOnClass" class="org.mockito.Mockito"
|
||||
factory-method="mock">
|
||||
<constructor-arg
|
||||
value="org.springframework.integration.test.mockito.ServiceActivatorOnMockitoMockTests.SingleMethodAcceptingHeaderOnClass" />
|
||||
</bean>
|
||||
|
||||
<int:channel id="out">
|
||||
<int:queue capacity="10" />
|
||||
</int:channel>
|
||||
|
||||
</beans>
|
||||
@@ -1,102 +0,0 @@
|
||||
/*
|
||||
* Copyright 2002-2014 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.integration.test.mockito;
|
||||
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Qualifier;
|
||||
import org.springframework.integration.annotation.ServiceActivator;
|
||||
import org.springframework.integration.support.MessageBuilder;
|
||||
import org.springframework.messaging.MessageChannel;
|
||||
import org.springframework.messaging.PollableChannel;
|
||||
import org.springframework.test.context.ContextConfiguration;
|
||||
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
|
||||
|
||||
/**
|
||||
* @author Iwein Fuld
|
||||
* @author Gunnar Hillert
|
||||
*/
|
||||
@ContextConfiguration
|
||||
@RunWith(SpringJUnit4ClassRunner.class)
|
||||
public class ServiceActivatorOnMockitoMockTests {
|
||||
|
||||
@Autowired
|
||||
@Qualifier("in")
|
||||
MessageChannel in;
|
||||
|
||||
@Autowired
|
||||
@Qualifier("out")
|
||||
PollableChannel out;
|
||||
|
||||
public static class SingleAnnotatedMethodOnClass {
|
||||
|
||||
@ServiceActivator
|
||||
public String move(String s) {
|
||||
return s;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Autowired
|
||||
SingleAnnotatedMethodOnClass singleAnnotatedMethodOnClass;
|
||||
|
||||
@Test
|
||||
public void shouldInvokeMockedSingleAnnotatedMethodOnClass() {
|
||||
in.send(MessageBuilder.withPayload("singleAnnotatedMethodOnClass").build());
|
||||
verify(singleAnnotatedMethodOnClass).move("singleAnnotatedMethodOnClass");
|
||||
}
|
||||
|
||||
public static class SingleMethodOnClass {
|
||||
public String move(String s) {
|
||||
return s;
|
||||
}
|
||||
}
|
||||
|
||||
@Autowired
|
||||
SingleMethodOnClass singleMethodOnClass;
|
||||
|
||||
@Test
|
||||
public void shouldInvokeMockedSingleMethodOnClass() {
|
||||
in.send(MessageBuilder.withPayload("SingleMethodOnClass").build());
|
||||
verify(singleMethodOnClass).move("SingleMethodOnClass");
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
public static class SingleMethodAcceptingHeaderOnClass {
|
||||
|
||||
public String move(@org.springframework.integration.annotation.Header("s") String s) {
|
||||
return s;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Autowired
|
||||
SingleMethodAcceptingHeaderOnClass singleMethodAcceptingHeaderOnClass;
|
||||
|
||||
@Test
|
||||
public void shouldInvokeMockedSingleMethodAcceptingHeaderOnClass() {
|
||||
in.send(MessageBuilder.withPayload("SingleMethodAcceptingHeaderOnClass")
|
||||
.setHeader("s", "SingleMethodAcceptingHeaderOnClass")
|
||||
.build());
|
||||
verify(singleMethodAcceptingHeaderOnClass).move("SingleMethodAcceptingHeaderOnClass");
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns:int="http://www.springframework.org/schema/integration"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
|
||||
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
|
||||
|
||||
<int:transformer input-channel="inputChannel" output-channel="outputChannel" expression="payload.toUpperCase()"/>
|
||||
|
||||
<int:channel id="outputChannel"/>
|
||||
|
||||
<int:transformer input-channel="inputChannel2" output-channel="outputChannel2" expression="payload.toUpperCase()"/>
|
||||
|
||||
<int:channel id="outputChannel2">
|
||||
<int:queue/>
|
||||
</int:channel>
|
||||
|
||||
</beans>
|
||||
@@ -1,77 +0,0 @@
|
||||
/*
|
||||
* Copyright 2002-2011 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.integration.test.support;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertThat;
|
||||
import static org.springframework.integration.test.matcher.HeaderMatcher.hasHeader;
|
||||
import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.integration.support.MessageBuilder;
|
||||
import org.springframework.messaging.Message;
|
||||
import org.springframework.test.context.ContextConfiguration;
|
||||
|
||||
@ContextConfiguration
|
||||
public class MessageScenariosTests extends AbstractRequestResponseScenarioTests {
|
||||
|
||||
@Override
|
||||
protected List<RequestResponseScenario> defineRequestResponseScenarios() {
|
||||
List<RequestResponseScenario> scenarios= new ArrayList<RequestResponseScenario>();
|
||||
RequestResponseScenario scenario1 = new RequestResponseScenario(
|
||||
"inputChannel","outputChannel")
|
||||
.setPayload("hello")
|
||||
.setResponseValidator(new PayloadValidator<String>() {
|
||||
@Override
|
||||
protected void validateResponse(String response) {
|
||||
assertEquals("HELLO",response);
|
||||
}
|
||||
});
|
||||
|
||||
scenarios.add(scenario1);
|
||||
|
||||
RequestResponseScenario scenario2 = new RequestResponseScenario(
|
||||
"inputChannel","outputChannel")
|
||||
.setMessage(MessageBuilder.withPayload("hello").setHeader("foo", "bar").build())
|
||||
.setResponseValidator(new MessageValidator() {
|
||||
@Override
|
||||
protected void validateMessage(Message<?> message) {
|
||||
assertThat(message,hasPayload("HELLO"));
|
||||
assertThat(message,hasHeader("foo","bar"));
|
||||
}
|
||||
});
|
||||
|
||||
scenarios.add(scenario2);
|
||||
|
||||
RequestResponseScenario scenario3 = new RequestResponseScenario(
|
||||
"inputChannel2","outputChannel2")
|
||||
.setMessage(MessageBuilder.withPayload("hello").setHeader("foo", "bar").build())
|
||||
.setResponseValidator(new MessageValidator() {
|
||||
@Override
|
||||
protected void validateMessage(Message<?> message) {
|
||||
assertThat(message,hasPayload("HELLO"));
|
||||
assertThat(message,hasHeader("foo","bar"));
|
||||
}
|
||||
});
|
||||
|
||||
scenarios.add(scenario3);
|
||||
|
||||
return scenarios;
|
||||
}
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
/*
|
||||
* Copyright 2002-2011 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.integration.test.support;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
import org.springframework.test.context.ContextConfiguration;
|
||||
|
||||
@ContextConfiguration("MessageScenariosTests-context.xml")
|
||||
public class SingleScenarioTests extends SingleRequestResponseScenarioTests {
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.springframework.integration.test.support.SingleRequestResponseScenarioTest#defineRequestResponseScenario()
|
||||
*/
|
||||
@Override
|
||||
protected RequestResponseScenario defineRequestResponseScenario() {
|
||||
RequestResponseScenario scenario = new RequestResponseScenario(
|
||||
"inputChannel","outputChannel")
|
||||
.setPayload("hello")
|
||||
.setResponseValidator(new PayloadValidator<String>() {
|
||||
@Override
|
||||
protected void validateResponse(String response) {
|
||||
assertEquals("HELLO",response);
|
||||
}
|
||||
});
|
||||
return scenario;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user