diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XPathMultiChannelRouterTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XPathMultiChannelRouterTests.java index a9d0231d47..337b5f8774 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XPathMultiChannelRouterTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XPathMultiChannelRouterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2010 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. @@ -24,7 +24,6 @@ import org.w3c.dom.Node; import org.springframework.integration.MessagingException; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.StringMessage; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.xml.xpath.XPathExpression; import org.springframework.xml.xpath.XPathExpressionFactory; @@ -72,7 +71,7 @@ public class XPathMultiChannelRouterTests { public void nonNodePayload() throws Exception { XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/@type"); XPathMultiChannelRouter router = new XPathMultiChannelRouter(expression); - router.getChannelIndicatorList(new StringMessage("test")); + router.getChannelIndicatorList(new GenericMessage("test")); } @Test diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XPathSingleChannelRouterTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XPathSingleChannelRouterTests.java index 552649b9f7..2d7469108f 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XPathSingleChannelRouterTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XPathSingleChannelRouterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2010 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. @@ -19,14 +19,14 @@ package org.springframework.integration.xml.router; import static org.junit.Assert.assertEquals; import org.junit.Test; +import org.w3c.dom.Document; +import org.w3c.dom.Node; + import org.springframework.integration.MessagingException; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.StringMessage; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.xml.xpath.XPathExpression; import org.springframework.xml.xpath.XPathExpressionFactory; -import org.w3c.dom.Document; -import org.w3c.dom.Node; /** * @author Jonas Partner @@ -54,7 +54,7 @@ public class XPathSingleChannelRouterTests { public void testNonNodePayload() throws Exception { XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/@type"); XPathSingleChannelRouter router = new XPathSingleChannelRouter(expression); - router.getChannelIndicatorList(new StringMessage("test")); + router.getChannelIndicatorList(new GenericMessage("test")); } @Test diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/BooleanTestXpathMessageSelectorTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/BooleanTestXpathMessageSelectorTests.java index 43568e6a45..023dd0fe37 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/BooleanTestXpathMessageSelectorTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/BooleanTestXpathMessageSelectorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2010 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. @@ -13,65 +13,63 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.xml.selector; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.StringMessage; -import org.springframework.integration.xml.util.XmlTestUtil; -import org.springframework.xml.xpath.XPathExpression; -import org.springframework.xml.xpath.XPathExpressionFactory; import org.w3c.dom.Document; import org.w3c.dom.Node; +import org.springframework.integration.core.GenericMessage; +import org.springframework.integration.xml.util.XmlTestUtil; +import org.springframework.xml.xpath.XPathExpression; +import org.springframework.xml.xpath.XPathExpressionFactory; + /** - * * @author Jonas Partner - * */ public class BooleanTestXpathMessageSelectorTests { - + @Test - public void testWithSimpleString(){ + public void testWithSimpleString() { BooleanTestXPathMessageSelector selector = new BooleanTestXPathMessageSelector("boolean(/one/two)"); - assertTrue(selector.accept(new StringMessage("")) ) ; - assertFalse(selector.accept(new StringMessage("")) ) ; + assertTrue(selector.accept(new GenericMessage(""))); + assertFalse(selector.accept(new GenericMessage(""))); } - + @Test - public void testWithDocument() throws Exception{ + public void testWithDocument() throws Exception { BooleanTestXPathMessageSelector selector = new BooleanTestXPathMessageSelector("boolean(/one/two)"); - assertTrue(selector.accept(new GenericMessage(XmlTestUtil.getDocumentForString(""))) ) ; - assertFalse(selector.accept(new GenericMessage(XmlTestUtil.getDocumentForString(""))) ) ; + assertTrue(selector.accept(new GenericMessage(XmlTestUtil.getDocumentForString("")))); + assertFalse(selector.accept(new GenericMessage(XmlTestUtil + .getDocumentForString("")))); } - + @Test - public void testWithNamespace(){ - BooleanTestXPathMessageSelector selector = new BooleanTestXPathMessageSelector("boolean(/ns1:one/ns1:two)","ns1", "www.example.org"); - assertTrue(selector.accept(new StringMessage("")) ) ; - assertFalse(selector.accept(new StringMessage("")) ) ; + public void testWithNamespace() { + BooleanTestXPathMessageSelector selector = new BooleanTestXPathMessageSelector("boolean(/ns1:one/ns1:two)", "ns1", "www.example.org"); + assertTrue(selector.accept(new GenericMessage(""))); + assertFalse(selector.accept(new GenericMessage(""))); } - + @Test - public void testStringWithXPathExpressionProvided(){ + public void testStringWithXPathExpressionProvided() { XPathExpression xpathExpression = XPathExpressionFactory.createXPathExpression("boolean(/one/two)"); BooleanTestXPathMessageSelector selector = new BooleanTestXPathMessageSelector(xpathExpression); - assertTrue(selector.accept(new StringMessage("")) ) ; - assertFalse(selector.accept(new StringMessage("")) ) ; + assertTrue(selector.accept(new GenericMessage(""))); + assertFalse(selector.accept(new GenericMessage(""))); } - + @Test - public void testNodeWithXPathExpressionAsString() throws Exception{ + public void testNodeWithXPathExpressionAsString() throws Exception { XPathExpression xpathExpression = XPathExpressionFactory.createXPathExpression("boolean(./three)"); BooleanTestXPathMessageSelector selector = new BooleanTestXPathMessageSelector(xpathExpression); Document testDocument = XmlTestUtil.getDocumentForString(""); - assertTrue(selector.accept(new GenericMessage(testDocument.getElementsByTagName("two").item(0)))); assertFalse(selector.accept(new GenericMessage(testDocument.getElementsByTagName("three").item(0)))); } - } diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelectorTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelectorTests.java index 176e686053..eebcb73bf4 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelectorTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelectorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2010 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. @@ -13,54 +13,50 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.xml.selector; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.springframework.integration.core.StringMessage; + +import org.springframework.integration.core.GenericMessage; /** - * * @author Jonas Partner - * */ public class StringValueTestXPathMessageSelectorTests { @Test public void testMatchWithSimpleString() { - StringValueTestXPathMessageSelector selector = new StringValueTestXPathMessageSelector("/one/two", - "red"); - assertTrue(selector.accept(new StringMessage("red"))); + StringValueTestXPathMessageSelector selector = new StringValueTestXPathMessageSelector("/one/two", "red"); + assertTrue(selector.accept(new GenericMessage("red"))); } @Test public void testNoMatchWithSimpleString() { - StringValueTestXPathMessageSelector selector = new StringValueTestXPathMessageSelector("/one/two", - "red"); - assertFalse(selector.accept(new StringMessage("yellow"))); + StringValueTestXPathMessageSelector selector = new StringValueTestXPathMessageSelector("/one/two", "red"); + assertFalse(selector.accept(new GenericMessage("yellow"))); } - + @Test public void testMatchWithSimpleStringAndNamespace() { - StringValueTestXPathMessageSelector selector = new StringValueTestXPathMessageSelector("/ns1:one/ns1:two","ns1","www.example.org", - "red"); - assertTrue(selector.accept(new StringMessage("red"))); + StringValueTestXPathMessageSelector selector = new StringValueTestXPathMessageSelector("/ns1:one/ns1:two","ns1","www.example.org", "red"); + assertTrue(selector.accept(new GenericMessage("red"))); } - - + @Test public void testCaseSensitiveByDefault() { - StringValueTestXPathMessageSelector selector = new StringValueTestXPathMessageSelector("/ns1:one/ns1:two","ns1","www.example.org", - "red"); - assertFalse(selector.accept(new StringMessage("RED"))); + StringValueTestXPathMessageSelector selector = new StringValueTestXPathMessageSelector("/ns1:one/ns1:two","ns1","www.example.org", "red"); + assertFalse(selector.accept(new GenericMessage("RED"))); } - + @Test public void testNotCaseSensitive() { - StringValueTestXPathMessageSelector selector = new StringValueTestXPathMessageSelector("/ns1:one/ns1:two","ns1","www.example.org", - "red"); + StringValueTestXPathMessageSelector selector = new StringValueTestXPathMessageSelector("/ns1:one/ns1:two","ns1","www.example.org", "red"); selector.setCaseSensitive(false); - assertTrue(selector.accept(new StringMessage("RED"))); + assertTrue(selector.accept(new GenericMessage("RED"))); } + } diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/MarshallingTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/MarshallingTransformerTests.java index 435c95fee5..1945e5fc6c 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/MarshallingTransformerTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/MarshallingTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 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. @@ -29,7 +29,7 @@ import javax.xml.transform.dom.DOMResult; import org.junit.Test; import org.springframework.integration.Message; -import org.springframework.integration.core.StringMessage; +import org.springframework.integration.core.GenericMessage; import org.springframework.integration.xml.result.StringResultFactory; import org.springframework.oxm.Marshaller; import org.springframework.oxm.XmlMappingException; @@ -45,7 +45,7 @@ public class MarshallingTransformerTests { TestMarshaller marshaller = new TestMarshaller(); MarshallingTransformer transformer = new MarshallingTransformer(marshaller); transformer.setResultFactory(new StringResultFactory()); - Message resultMessage = transformer.transform(new StringMessage("world")); + Message resultMessage = transformer.transform(new GenericMessage("world")); Object resultPayload = resultMessage.getPayload(); assertEquals(StringResult.class, resultPayload.getClass()); assertEquals("hello world", resultPayload.toString()); @@ -56,7 +56,7 @@ public class MarshallingTransformerTests { public void testDefaultResultFactory() throws Exception { TestMarshaller marshaller = new TestMarshaller(); MarshallingTransformer transformer = new MarshallingTransformer(marshaller); - Message resultMessage = transformer.transform(new StringMessage("world")); + Message resultMessage = transformer.transform(new GenericMessage("world")); Object resultPayload = resultMessage.getPayload(); assertEquals(DOMResult.class, resultPayload.getClass()); assertEquals("world", marshaller.payloads.get(0)); @@ -67,7 +67,7 @@ public class MarshallingTransformerTests { TestMarshaller marshaller = new TestMarshaller(); MarshallingTransformer transformer = new MarshallingTransformer(marshaller); transformer.setExtractPayload(false); - Message message = new StringMessage("test"); + Message message = new GenericMessage("test"); transformer.transform(message); assertEquals(0, marshaller.payloads.size()); assertEquals(1, marshaller.messages.size()); @@ -81,12 +81,10 @@ public class MarshallingTransformerTests { private final List payloads = new ArrayList(); - @SuppressWarnings("unchecked") - public boolean supports(Class clazz) { + public boolean supports(Class clazz) { return true; } - @SuppressWarnings("unchecked") public void marshal(Object source, Result result) throws XmlMappingException, IOException { if (source instanceof Message) { this.messages.add((Message) source); diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/UnmarshallingTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/UnmarshallingTransformerTests.java index 4618ec9093..2b3772ec55 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/UnmarshallingTransformerTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/UnmarshallingTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 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. @@ -26,8 +26,8 @@ import javax.xml.transform.Source; import org.junit.Test; import org.springframework.integration.Message; +import org.springframework.integration.core.GenericMessage; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.core.StringMessage; import org.springframework.oxm.Unmarshaller; import org.springframework.oxm.XmlMappingException; import org.springframework.xml.transform.StringSource; @@ -52,8 +52,8 @@ public class UnmarshallingTransformerTests { Unmarshaller unmarshaller = new TestUnmarshaller(true); UnmarshallingTransformer transformer = new UnmarshallingTransformer(unmarshaller); Object transformed = transformer.transformPayload(new StringSource("foo")); - assertEquals(StringMessage.class, transformed.getClass()); - assertEquals("message: foo", ((StringMessage) transformed).getPayload()); + assertEquals(GenericMessage.class, transformed.getClass()); + assertEquals("message: foo", ((Message) transformed).getPayload()); } @Test @@ -79,15 +79,14 @@ public class UnmarshallingTransformerTests { char[] chars = new char[8]; ((StringSource) source).getReader().read(chars); if (returnMessage) { - return new StringMessage("message: " + new String(chars).trim()); + return new GenericMessage("message: " + new String(chars).trim()); } return "hello " + new String(chars).trim(); } return null; } - @SuppressWarnings("unchecked") - public boolean supports(Class clazz) { + public boolean supports(Class clazz) { return true; } }