diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests-context.xml b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests-context.xml
index b2c572bec7..9ec4225c64 100644
--- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests-context.xml
+++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests-context.xml
@@ -47,6 +47,13 @@
+
+
+
+
diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests.java
index 22707976f2..36319f3fe1 100644
--- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests.java
+++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests.java
@@ -45,77 +45,92 @@ import static junit.framework.Assert.assertTrue;
/**
* @author Oleg Zhurakousky
* @author Jonas Partner
- *
*/
@ContextConfiguration
@RunWith(SpringJUnit4ClassRunner.class)
public class XsltTransformerTests {
- private String docAsString = "test";
- @Autowired
- private ApplicationContext applicationContext;
- @Autowired
- @Qualifier("output")
- private QueueChannel output;
- @Test
- public void testParamHeadersWithStartWildCharacter(){
- MessageChannel input = applicationContext.getBean("paramHeadersWithStartWildCharacterChannel", MessageChannel.class);
- Message> message = MessageBuilder.withPayload(this.docAsString).
- setHeader("testParam", "testParamValue").
- setHeader("testParam2", "FOO").
- build();
- input.send(message);
- Message> resultMessage = output.receive();
- MessageHistory history = MessageHistory.read(resultMessage);
- assertNotNull(history);
- Properties componentHistoryRecord = TestUtils.locateComponentInHistory(history, "paramHeadersWithStartWildCharacter", 0);
- assertNotNull(componentHistoryRecord);
- assertEquals("xml:xslt-transformer", componentHistoryRecord.get("type"));
- assertEquals("Wrong payload type",String.class, resultMessage.getPayload().getClass());
- assertTrue(((String) resultMessage.getPayload()).contains("testParamValue"));
- assertFalse(((String) resultMessage.getPayload()).contains("FOO"));
- }
- @Test
- public void testParamHeadersWithEndWildCharacter(){
- MessageChannel input = applicationContext.getBean("paramHeadersWithEndWildCharacterChannel", MessageChannel.class);
- Message> message = MessageBuilder.withPayload(this.docAsString).
- setHeader("testParam", "testParamValue").
- setHeader("testParam2", "FOO").
- build();
- input.send(message);
- Message> resultMessage = output.receive();
- assertEquals("Wrong payload type",String.class, resultMessage.getPayload().getClass());
- assertTrue(((String) resultMessage.getPayload()).contains("testParamValue"));
- assertTrue(((String) resultMessage.getPayload()).contains("FOO"));
- }
- @Test
- public void testParamHeadersWithIndividualParameters(){
- MessageChannel input = applicationContext.getBean("paramHeadersWithIndividualParametersChannel", MessageChannel.class);
- Message> message = MessageBuilder.withPayload(this.docAsString).
- setHeader("testParam", "testParamValue").
- setHeader("testParam2", "FOO").
- build();
- input.send(message);
- Message> resultMessage = output.receive();
- assertEquals("Wrong payload type",String.class, resultMessage.getPayload().getClass());
- assertTrue(((String) resultMessage.getPayload()).contains("testParamValue"));
- assertTrue(((String) resultMessage.getPayload()).contains("FOO"));
- assertTrue(((String) resultMessage.getPayload()).contains("hello"));
- }
-
- @Test
- public void testParamHeadersCombo(){
- MessageChannel input = applicationContext.getBean("paramHeadersComboChannel", MessageChannel.class);
- Message> message = MessageBuilder.withPayload(this.docAsString).
- setHeader("testParam", "testParamValue").
- setHeader("testParam2", "FOO").
- build();
- input.send(message);
- Message> resultMessage = output.receive();
- assertEquals("Wrong payload type",String.class, resultMessage.getPayload().getClass());
- assertTrue(((String) resultMessage.getPayload()).contains("testParamValue"));
- assertTrue(((String) resultMessage.getPayload()).contains("FOO"));
- assertTrue(((String) resultMessage.getPayload()).contains("hello"));
- }
+ private String docAsString = "test";
+ @Autowired
+ private ApplicationContext applicationContext;
+ @Autowired
+ @Qualifier("output")
+ private QueueChannel output;
+
+ @Test
+ public void testParamHeadersWithStartWildCharacter() {
+ MessageChannel input = applicationContext.getBean("paramHeadersWithStartWildCharacterChannel", MessageChannel.class);
+ Message> message = MessageBuilder.withPayload(this.docAsString).
+ setHeader("testParam", "testParamValue").
+ setHeader("testParam2", "FOO").
+ build();
+ input.send(message);
+ Message> resultMessage = output.receive();
+ MessageHistory history = MessageHistory.read(resultMessage);
+ assertNotNull(history);
+ Properties componentHistoryRecord = TestUtils.locateComponentInHistory(history, "paramHeadersWithStartWildCharacter", 0);
+ assertNotNull(componentHistoryRecord);
+ assertEquals("xml:xslt-transformer", componentHistoryRecord.get("type"));
+ assertEquals("Wrong payload type", String.class, resultMessage.getPayload().getClass());
+ assertTrue(((String) resultMessage.getPayload()).contains("testParamValue"));
+ assertFalse(((String) resultMessage.getPayload()).contains("FOO"));
+ }
+
+ @Test
+ public void testParamHeadersWithEndWildCharacter() {
+ MessageChannel input = applicationContext.getBean("paramHeadersWithEndWildCharacterChannel", MessageChannel.class);
+ Message> message = MessageBuilder.withPayload(this.docAsString).
+ setHeader("testParam", "testParamValue").
+ setHeader("testParam2", "FOO").
+ build();
+ input.send(message);
+ Message> resultMessage = output.receive();
+ assertEquals("Wrong payload type", String.class, resultMessage.getPayload().getClass());
+ assertTrue(((String) resultMessage.getPayload()).contains("testParamValue"));
+ assertTrue(((String) resultMessage.getPayload()).contains("FOO"));
+ }
+
+ @Test
+ public void testParamHeadersWithIndividualParameters() {
+ MessageChannel input = applicationContext.getBean("paramHeadersWithIndividualParametersChannel", MessageChannel.class);
+ Message> message = MessageBuilder.withPayload(this.docAsString).
+ setHeader("testParam", "testParamValue").
+ setHeader("testParam2", "FOO").
+ build();
+ input.send(message);
+ Message> resultMessage = output.receive();
+ assertEquals("Wrong payload type", String.class, resultMessage.getPayload().getClass());
+ assertTrue(((String) resultMessage.getPayload()).contains("testParamValue"));
+ assertTrue(((String) resultMessage.getPayload()).contains("FOO"));
+ assertTrue(((String) resultMessage.getPayload()).contains("hello"));
+ }
+
+ @Test
+ public void testParamHeadersCombo() {
+ MessageChannel input = applicationContext.getBean("paramHeadersComboChannel", MessageChannel.class);
+ Message> message = MessageBuilder.withPayload(this.docAsString).
+ setHeader("testParam", "testParamValue").
+ setHeader("testParam2", "FOO").
+ build();
+ input.send(message);
+ Message> resultMessage = output.receive();
+ assertEquals("Wrong payload type", String.class, resultMessage.getPayload().getClass());
+ assertTrue(((String) resultMessage.getPayload()).contains("testParamValue"));
+ assertTrue(((String) resultMessage.getPayload()).contains("FOO"));
+ assertTrue(((String) resultMessage.getPayload()).contains("hello"));
+ }
+
+
+ @Test
+ public void outputAsString() {
+ MessageChannel input = applicationContext.getBean("outputAsStringChannel", MessageChannel.class);
+ Message> message = MessageBuilder.withPayload(this.docAsString).
+ build();
+ input.send(message);
+ Message> resultMessage = output.receive();
+ assertEquals("Wrong payload type", String.class, resultMessage.getPayload().getClass());
+ String stringPayload = (String)resultMessage.getPayload();
+ assertEquals("Wrong content of payload", "hello world text",stringPayload.trim());
+ }
}
diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/transform-tostring.xsl b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/transform-tostring.xsl
new file mode 100644
index 0000000000..a0b276d1ff
--- /dev/null
+++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/transform-tostring.xsl
@@ -0,0 +1,6 @@
+
+
+
+ hello world text
+
+
\ No newline at end of file