forked from spring-projects/spring-integration
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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`
- Loading branch information
1 parent
5850022
commit d16cd97
Showing
27 changed files
with
343 additions
and
522 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
...e/src/test/java/org/springframework/integration/support/MessageScenariosTests-context.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <?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> |
82 changes: 82 additions & 0 deletions
82
...ion-core/src/test/java/org/springframework/integration/support/MessageScenariosTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| * 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. | ||
| * 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.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.test.support.AbstractRequestResponseScenarioTests; | ||
| import org.springframework.integration.test.support.MessageValidator; | ||
| import org.springframework.integration.test.support.PayloadValidator; | ||
| import org.springframework.integration.test.support.RequestResponseScenario; | ||
| import org.springframework.messaging.Message; | ||
| import org.springframework.messaging.support.MessageBuilder; | ||
| 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; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 0 additions & 81 deletions
81
...core/src/test/java/org/springframework/integration/test/util/LogAdjustingTestSupport.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.