You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by in...@apache.org on 2009/02/23 14:12:38 UTC
svn commit: r747003 - in /synapse/trunk/java/modules:
core/src/main/java/org/apache/synapse/config/xml/endpoints/
core/src/test/java/org/apache/synapse/config/xml/
core/src/test/java/org/apache/synapse/mediators/
core/src/test/java/org/apache/synapse/m...
Author: indika
Date: Mon Feb 23 13:12:35 2009
New Revision: 747003
URL: http://svn.apache.org/viewvc?rev=747003&view=rev
Log:
change string to OM convertion methods in some locations to use SynapseConfigUtis.stringToOM
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/AbstractTestCase.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RegistrySerializationTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/AbstractMediatorTestCase.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/AbstractTestCase.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestUtils.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java
synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/throttle/ThrottleMediatorTest.java
synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/xquery/XQueryMediatorTest.java
synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/AbstractAutomationTestCase.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java?rev=747003&r1=747002&r2=747003&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java Mon Feb 23 13:12:35 2009
@@ -83,8 +83,8 @@
if (defaultElement != null) {
EndpointDefinition endpoint = createEndpointDefinition(defaultElement);
defaultEndpoint.setDefinition(endpoint);
+ processAuditStatus(defaultEndpoint, defaultElement);
}
- processAuditStatus(defaultEndpoint, defaultElement);
return defaultEndpoint;
}
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/AbstractTestCase.java?rev=747003&r1=747002&r2=747003&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/AbstractTestCase.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/AbstractTestCase.java Mon Feb 23 13:12:35 2009
@@ -22,6 +22,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.synapse.Mediator;
+import org.apache.synapse.config.SynapseConfigUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.custommonkey.xmlunit.XMLTestCase;
@@ -54,16 +55,7 @@
}
protected OMElement createOMElement(String xml) {
- try {
-
- XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(xml));
- StAXOMBuilder builder = new StAXOMBuilder(reader);
- return builder.getDocumentElement();
-
- }
- catch (XMLStreamException e) {
- throw new RuntimeException(e);
- }
+ return SynapseConfigUtils.stringToOM(xml);
}
protected boolean serialization(String inputXml, MediatorFactory mediatorFactory, MediatorSerializer mediatorSerializer) {
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RegistrySerializationTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RegistrySerializationTest.java?rev=747003&r1=747002&r2=747003&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RegistrySerializationTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RegistrySerializationTest.java Mon Feb 23 13:12:35 2009
@@ -25,17 +25,13 @@
public class RegistrySerializationTest extends AbstractTestCase {
- private RegistryFactory registryFactory = null;
- private RegistrySerializer registrySerializer = null;
-
public RegistrySerializationTest() {
- registryFactory = new RegistryFactory();
- registrySerializer = new RegistrySerializer();
}
public void testRegistrySerialization() {
- String regitryConfiguration = "<syn:registry xmlns:syn=\"http://ws.apache.org/ns/synapse\" provider=\"org.apache.synapse.registry.url.SimpleURLRegistry\">" +
+ String regitryConfiguration = "<syn:registry xmlns:syn=\"http://ws.apache.org/ns/synapse\" " +
+ "provider=\"org.apache.synapse.registry.url.SimpleURLRegistry\">" +
"<syn:parameter name=\"root\">file:./../../repository/</syn:parameter>" +
"<syn:parameter name=\"cachableDuration\">15000</syn:parameter>" +
"</syn:registry>";
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/AbstractMediatorTestCase.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/AbstractMediatorTestCase.java?rev=747003&r1=747002&r2=747003&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/AbstractMediatorTestCase.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/AbstractMediatorTestCase.java Mon Feb 23 13:12:35 2009
@@ -22,6 +22,7 @@
import junit.framework.TestCase;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.synapse.config.SynapseConfigUtils;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLInputFactory;
@@ -31,16 +32,6 @@
public class AbstractMediatorTestCase extends TestCase {
protected static OMElement createOMElement(String xml) {
- try {
-
- XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(xml));
- StAXOMBuilder builder = new StAXOMBuilder(reader);
- OMElement omElement = builder.getDocumentElement();
- return omElement;
-
- }
- catch (XMLStreamException e) {
- throw new RuntimeException(e);
- }
+ return SynapseConfigUtils.stringToOM(xml);
}
}
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/AbstractTestCase.java?rev=747003&r1=747002&r2=747003&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/AbstractTestCase.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/AbstractTestCase.java Mon Feb 23 13:12:35 2009
@@ -33,6 +33,7 @@
import org.apache.synapse.config.xml.MediatorFactory;
import org.apache.synapse.config.xml.MediatorFactoryFinder;
import org.apache.synapse.config.xml.MediatorSerializer;
+import org.apache.synapse.config.SynapseConfigUtils;
import org.custommonkey.xmlunit.XMLTestCase;
import org.xml.sax.SAXException;
@@ -58,17 +59,7 @@
}
protected OMElement createOMElement(String xml) {
- try {
-
- XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(xml));
- StAXOMBuilder builder = new StAXOMBuilder(reader);
- OMElement omElement = builder.getDocumentElement();
- return omElement;
-
- }
- catch (XMLStreamException e) {
- throw new RuntimeException(e);
- }
+ return SynapseConfigUtils.stringToOM(xml);
}
protected boolean serialization(String inputXml, MediatorFactory mediatorFactory, MediatorSerializer mediatorSerializer) {
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestUtils.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestUtils.java?rev=747003&r1=747002&r2=747003&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestUtils.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestUtils.java Mon Feb 23 13:12:35 2009
@@ -35,6 +35,7 @@
import org.apache.synapse.TestMessageContextBuilder;
import org.apache.synapse.config.Entry;
import org.apache.synapse.config.SynapseConfiguration;
+import org.apache.synapse.config.SynapseConfigUtils;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.core.axis2.Axis2SynapseEnvironment;
@@ -89,16 +90,7 @@
}
public static OMElement createOMElement(String xml) {
- try {
-
- XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(xml));
- StAXOMBuilder builder = new StAXOMBuilder(reader);
- OMElement omElement = builder.getDocumentElement();
- return omElement;
-
- } catch (XMLStreamException e) {
- throw new RuntimeException(e);
- }
+ return SynapseConfigUtils.stringToOM(xml);
}
}
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java?rev=747003&r1=747002&r2=747003&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java Mon Feb 23 13:12:35 2009
@@ -20,28 +20,25 @@
package org.apache.synapse.mediators.builtin;
import junit.framework.TestCase;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.commons.lang.mutable.MutableInt;
import org.apache.synapse.MessageContext;
import org.apache.synapse.TestMessageContextBuilder;
import org.apache.synapse.config.xml.ValidateMediatorFactory;
+import org.apache.synapse.config.SynapseConfigUtils;
import org.apache.synapse.mediators.TestMediateHandler;
import org.apache.synapse.mediators.TestMediator;
import org.apache.synapse.util.xpath.SynapseXPath;
import org.jaxen.JaxenException;
-import javax.xml.stream.XMLStreamException;
-import java.io.ByteArrayInputStream;
import java.util.Arrays;
import java.util.Collections;
public class ValidateMediatorTest extends TestCase {
- private static final String SCHEMA_FULL_CHECKING_FEATURE_ID =
+ private static final String SCHEMA_FULL_CHECKING_FEATURE_ID =
"http://apache.org/xml/features/validation/schema-full-checking";
- private static final String HONOUR_ALL_SCHEMA_LOCATIONS_FEATURE_ID =
+ private static final String HONOUR_ALL_SCHEMA_LOCATIONS_FEATURE_ID =
"http://apache.org/xml/features/honour-all-schemaLocations";
public static final String FEATURE_SECURE_PROCESSING =
@@ -87,7 +84,7 @@
"<Codes>String</Codes>\n" +
"</CheckPriceRequest>\n";
- private static final String DEFAULT_FEATURES_MEDIATOR_CONFIG =
+ private static final String DEFAULT_FEATURES_MEDIATOR_CONFIG =
"<validate xmlns=\"http://ws.apache.org/ns/synapse\">" +
" <schema key=\"file:synapse_repository/conf/sample/validate.xsd\"/>" +
" <on-fail>" +
@@ -98,7 +95,7 @@
" </on-fail>" +
"</validate>";
- private static final String CUSTOM_FEATURES_MEDIATOR_CONFIG =
+ private static final String CUSTOM_FEATURES_MEDIATOR_CONFIG =
"<validate xmlns=\"http://ws.apache.org/ns/synapse\">" +
" <schema key=\"file:synapse_repository/conf/sample/validate.xsd\"/>" +
" <feature name=\"" + SCHEMA_FULL_CHECKING_FEATURE_ID + "\" value=\"false\"/>" +
@@ -133,20 +130,20 @@
final MutableInt onFailInvoked = new MutableInt();
TestMediator testMediator = new TestMediator();
testMediator.setHandler(
- new TestMediateHandler() {
- public void handle(MessageContext synCtx) {
- onFailInvoked.setValue(1);
- }
- });
+ new TestMediateHandler() {
+ public void handle(MessageContext synCtx) {
+ onFailInvoked.setValue(1);
+ }
+ });
// set dummy mediator to be called on fail
validate.addChild(testMediator);
validate.mediate(synCtx);
if (expectFail) {
assertTrue("Expected ValidateMediator to trigger fail sequence",
- onFailInvoked.intValue() == 1);
+ onFailInvoked.intValue() == 1);
} else {
assertTrue("ValidateMediator unexpectedly triggered fail sequence",
- onFailInvoked.intValue() == 0);
+ onFailInvoked.intValue() == 0);
}
}
@@ -171,7 +168,7 @@
ValidateMediator validate = new ValidateMediator();
// set the schema url, source xpath and any name spaces
- validate.setSchemaKeys(Arrays.asList(new String[] { "xsd-key-1", "xsd-key-2"}));
+ validate.setSchemaKeys(Arrays.asList("xsd-key-1", "xsd-key-2"));
validate.setSource(createXPath("//m1:Outer"));
MessageContext synCtx = new TestMessageContextBuilder()
@@ -188,7 +185,7 @@
ValidateMediator validate = new ValidateMediator();
// set the schema url, source xpath and any name spaces
- validate.setSchemaKeys(Arrays.asList(new String[] { "xsd-key-1", "xsd-key-2"}));
+ validate.setSchemaKeys(Arrays.asList("xsd-key-1", "xsd-key-2"));
validate.setSource(createXPath("//m1:Outer"));
MessageContext synCtx = new TestMessageContextBuilder()
@@ -251,8 +248,8 @@
public void testValidateMediatorDefaultFeatures() throws Exception {
ValidateMediatorFactory mf = new ValidateMediatorFactory();
- ValidateMediator validate = (ValidateMediator)mf.createMediator(
- createOMElement(DEFAULT_FEATURES_MEDIATOR_CONFIG));
+ ValidateMediator validate = (ValidateMediator) mf.createMediator(
+ SynapseConfigUtils.stringToOM(DEFAULT_FEATURES_MEDIATOR_CONFIG));
assertNull(validate.getFeature(SCHEMA_FULL_CHECKING_FEATURE_ID));
assertNull(validate.getFeature(HONOUR_ALL_SCHEMA_LOCATIONS_FEATURE_ID));
@@ -260,16 +257,15 @@
makeValidInvocation(validate);
}
- public void testValidateMediatorCustomFeatures() throws Exception
- {
+ public void testValidateMediatorCustomFeatures() throws Exception {
ValidateMediatorFactory mf = new ValidateMediatorFactory();
- ValidateMediator validate = (ValidateMediator)mf.createMediator(
- createOMElement(CUSTOM_FEATURES_MEDIATOR_CONFIG));
+ ValidateMediator validate = (ValidateMediator) mf.createMediator(
+ SynapseConfigUtils.stringToOM(CUSTOM_FEATURES_MEDIATOR_CONFIG));
assertNotNull(validate.getFeature(SCHEMA_FULL_CHECKING_FEATURE_ID));
- assertFalse("true".equals((String)validate.getFeature(SCHEMA_FULL_CHECKING_FEATURE_ID)));
+ assertFalse("true".equals(validate.getFeature(SCHEMA_FULL_CHECKING_FEATURE_ID)));
assertNotNull(validate.getFeature(HONOUR_ALL_SCHEMA_LOCATIONS_FEATURE_ID));
- assertTrue("true".equals((String)validate.getFeature(HONOUR_ALL_SCHEMA_LOCATIONS_FEATURE_ID)));
+ assertTrue("true".equals(validate.getFeature(HONOUR_ALL_SCHEMA_LOCATIONS_FEATURE_ID)));
makeValidInvocation(validate);
}
@@ -287,13 +283,5 @@
test(validate, synCtx, false);
}
- private static OMElement createOMElement(String xml) {
- try {
- StAXOMBuilder builder = new StAXOMBuilder(new ByteArrayInputStream(xml.getBytes()));
- OMElement omElement = builder.getDocumentElement();
- return omElement;
- } catch (XMLStreamException e) {
- throw new RuntimeException(e);
- }
- }
+
}
Modified: synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/throttle/ThrottleMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/throttle/ThrottleMediatorTest.java?rev=747003&r1=747002&r2=747003&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/throttle/ThrottleMediatorTest.java (original)
+++ synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/throttle/ThrottleMediatorTest.java Mon Feb 23 13:12:35 2009
@@ -29,17 +29,14 @@
import org.apache.synapse.SynapseException;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.config.Entry;
+import org.apache.synapse.config.SynapseConfigUtils;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.core.axis2.Axis2SynapseEnvironment;
import org.apache.synapse.mediators.AbstractMediator;
import org.wso2.throttle.*;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
import java.io.ByteArrayInputStream;
-import java.io.StringReader;
/**
* Throttle Mediator Test - This class test throttling when policy has specified as both of
@@ -118,25 +115,12 @@
OMAbstractFactory.getSOAP11Factory().createOMDocument();
omDoc.addChild(envelope);
- envelope.getBody().addChild(createOMElement(payload));
+ envelope.getBody().addChild(SynapseConfigUtils.stringToOM(payload));
synMc.setEnvelope(envelope);
return synMc;
}
- public static OMElement createOMElement(String xml) {
- try {
- XMLStreamReader reader = XMLInputFactory
- .newInstance().createXMLStreamReader(new StringReader(xml));
- StAXOMBuilder builder = new StAXOMBuilder(reader);
- OMElement omElement = builder.getDocumentElement();
- return omElement;
- }
- catch (XMLStreamException e) {
- throw new RuntimeException(e);
- }
- }
-
public void testMediate() throws Exception {
ByteArrayInputStream in = new ByteArrayInputStream(POLICY.getBytes());
StAXOMBuilder builde = new StAXOMBuilder(in);
Modified: synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/xquery/XQueryMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/xquery/XQueryMediatorTest.java?rev=747003&r1=747002&r2=747003&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/xquery/XQueryMediatorTest.java (original)
+++ synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/xquery/XQueryMediatorTest.java Mon Feb 23 13:12:35 2009
@@ -20,17 +20,12 @@
import junit.framework.TestCase;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.config.SynapseConfigUtils;
import org.apache.synapse.mediators.TestUtils;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
import java.util.List;
import java.util.ArrayList;
-import java.io.StringReader;
import net.sf.saxon.javax.xml.xquery.XQItemType;
@@ -40,83 +35,85 @@
public class XQueryMediatorTest extends TestCase {
- public final static String sampleXml = "<bookstore><book category=\"COOKING\"> <title lang=\"en\">Everyday Italian</title>\n" +
- " <author>Giada De Laurentiis</author>\n" +
- " <year>2005</year>\n" +
- " <price>30.00</price>\n" +
- "\n" +
- "</book>\n" +
- "\n" +
- "<book category=\"CHILDREN\">\n" +
- " <title lang=\"en\">Harry Potter</title>\n" +
- " <author>J K. Rowling</author>\n" +
- " <year>2005</year>\n" +
- " <price>29.99</price>\n" +
- "</book>\n" +
- "\n" +
- "<book category=\"WEB\">\n" +
- " <title lang=\"en\">XQuery Kick Start</title>\n" +
- " <author>James McGovern</author>\n" +
- " <author>Per Bothner</author>\n" +
- " <author>Kurt Cagle</author>\n" +
- " <author>James Linn</author>\n" +
- " <author>Vaidyanathan Nagarajan</author>\n" +
- "\n" +
- " <year>2003</year>\n" +
- " <price>49.99</price>\n" +
- "</book>\n" +
- "\n" +
- "<book category=\"WEB\">\n" +
- " <title lang=\"en\">Learning XML</title>\n" +
- " <author>Erik T. Ray</author>\n" +
- " <year>2003</year>\n" +
- "\n" +
- " <price>39.95</price>\n" +
- "</book>\n" +
- "\n" +
- "</bookstore>";
-
- public final static String sampleXml2 = "<m0:CheckPriceRequest xmlns:m0=\"http://www.apache-synapse.org/test\">\n" +
- " <m0:Code>IBM</m0:Code>\n" +
- "</m0:CheckPriceRequest>";
+ public final static String sampleXml = "<bookstore><book category=\"COOKING\"> " +
+ "<title lang=\"en\">Everyday Italian</title>\n" +
+ " <author>Giada De Laurentiis</author>\n" +
+ " <year>2005</year>\n" +
+ " <price>30.00</price>\n" +
+ "\n" +
+ "</book>\n" +
+ "\n" +
+ "<book category=\"CHILDREN\">\n" +
+ " <title lang=\"en\">Harry Potter</title>\n" +
+ " <author>J K. Rowling</author>\n" +
+ " <year>2005</year>\n" +
+ " <price>29.99</price>\n" +
+ "</book>\n" +
+ "\n" +
+ "<book category=\"WEB\">\n" +
+ " <title lang=\"en\">XQuery Kick Start</title>\n" +
+ " <author>James McGovern</author>\n" +
+ " <author>Per Bothner</author>\n" +
+ " <author>Kurt Cagle</author>\n" +
+ " <author>James Linn</author>\n" +
+ " <author>Vaidyanathan Nagarajan</author>\n" +
+ "\n" +
+ " <year>2003</year>\n" +
+ " <price>49.99</price>\n" +
+ "</book>\n" +
+ "\n" +
+ "<book category=\"WEB\">\n" +
+ " <title lang=\"en\">Learning XML</title>\n" +
+ " <author>Erik T. Ray</author>\n" +
+ " <year>2003</year>\n" +
+ "\n" +
+ " <price>39.95</price>\n" +
+ "</book>\n" +
+ "\n" +
+ "</bookstore>";
+
+ public final static String sampleXml2 = "<m0:CheckPriceRequest" +
+ " xmlns:m0=\"http://www.apache-synapse.org/test\">\n" +
+ " <m0:Code>IBM</m0:Code>\n" +
+ "</m0:CheckPriceRequest>";
public final static String sampleXml3 = "<m0:return xmlns:m0=\"http://services.samples/xsd\">\n" +
- "\t<m0:symbol>IBM</m0:symbol>\n" +
- "\t<m0:last>122222</m0:last>\n" +
- "</m0:return>";
+ "\t<m0:symbol>IBM</m0:symbol>\n" +
+ "\t<m0:last>122222</m0:last>\n" +
+ "</m0:return>";
public final static String externalXMl = "<commission>\n" +
- " <vendor symbol=\"IBM\">44444</vendor>\n" +
- " <vendor symbol=\"MSFT\">55555</vendor>\n" +
- " <vendor symbol=\"SUN\">66666</vendor>\n" +
- "</commission>";
+ " <vendor symbol=\"IBM\">44444</vendor>\n" +
+ " <vendor symbol=\"MSFT\">55555</vendor>\n" +
+ " <vendor symbol=\"SUN\">66666</vendor>\n" +
+ "</commission>";
public void testQueryWithAll() throws Exception {
MessageContext mc = TestUtils.getTestContext("<foo/>", null);
XQueryMediator mediator = new XQueryMediator();
mediator.setQuerySource("declare variable $intVar as xs:int external;" +
- "declare variable $boolVar as xs:boolean external;" +
- "declare variable $byteVar as xs:byte external;" +
- "declare variable $longVar as xs:long external;" +
- "declare variable $doubleVar as xs:double external;" +
- "declare variable $shortVar as xs:short external;" +
- "declare variable $floatVar as xs:float external;" +
- "declare variable $stringVar as xs:string external;" +
- "declare variable $integerVar as xs:integer external;" +
- "document { " +
- "<a xmlns='http://a/uri' z:in='out' xmlns:z='http://z/uri'>" +
- "<b>{$intVar+2}<e>{$boolVar}</e>" +
- "<all>" +
- "{$byteVar}," +
- "{$shortVar}," +
- "{$doubleVar}," +
- "{$longVar}," +
- "{$floatVar}," +
- "{$stringVar}," +
- "{$integerVar+xs:integer('5')}," +
- "</all></b></a> }");
- List list = new ArrayList();
+ "declare variable $boolVar as xs:boolean external;" +
+ "declare variable $byteVar as xs:byte external;" +
+ "declare variable $longVar as xs:long external;" +
+ "declare variable $doubleVar as xs:double external;" +
+ "declare variable $shortVar as xs:short external;" +
+ "declare variable $floatVar as xs:float external;" +
+ "declare variable $stringVar as xs:string external;" +
+ "declare variable $integerVar as xs:integer external;" +
+ "document { " +
+ "<a xmlns='http://a/uri' z:in='out' xmlns:z='http://z/uri'>" +
+ "<b>{$intVar+2}<e>{$boolVar}</e>" +
+ "<all>" +
+ "{$byteVar}," +
+ "{$shortVar}," +
+ "{$doubleVar}," +
+ "{$longVar}," +
+ "{$floatVar}," +
+ "{$stringVar}," +
+ "{$integerVar+xs:integer('5')}," +
+ "</all></b></a> }");
+ List<MediatorVariable> list = new ArrayList<MediatorVariable>();
MediatorVariable intVariable = new MediatorBaseVariable(new QName("intVar"));
intVariable.setType(XQItemType.XQBASETYPE_INT);
- intVariable.setValue(new Integer(8));
+ intVariable.setValue(8);
list.add(intVariable);
MediatorVariable boolVariable = new MediatorBaseVariable(new QName("boolVar"));
boolVariable.setType(XQItemType.XQBASETYPE_BOOLEAN);
@@ -124,7 +121,7 @@
list.add(boolVariable);
MediatorVariable doubleVariable = new MediatorBaseVariable(new QName("doubleVar"));
doubleVariable.setType(XQItemType.XQBASETYPE_DOUBLE);
- doubleVariable.setValue(new Double(23.33));
+ doubleVariable.setValue(23.33);
list.add(doubleVariable);
MediatorVariable floatVariable = new MediatorBaseVariable(new QName("floatVar"));
floatVariable.setType(XQItemType.XQBASETYPE_FLOAT);
@@ -132,15 +129,15 @@
list.add(floatVariable);
MediatorVariable shortVariable = new MediatorBaseVariable(new QName("shortVar"));
shortVariable.setType(XQItemType.XQBASETYPE_SHORT);
- shortVariable.setValue(new Short((short) 327));
+ shortVariable.setValue((short) 327);
list.add(shortVariable);
MediatorVariable byteVariable = new MediatorBaseVariable(new QName("byteVar"));
byteVariable.setType(XQItemType.XQBASETYPE_BYTE);
- byteVariable.setValue(new Byte((byte) 3));
+ byteVariable.setValue((byte) 3);
list.add(byteVariable);
MediatorVariable longVariable = new MediatorBaseVariable(new QName("longVar"));
longVariable.setType(XQItemType.XQBASETYPE_LONG);
- longVariable.setValue(new Long(334));
+ longVariable.setValue((long) 334);
list.add(longVariable);
MediatorVariable stringValue = new MediatorBaseVariable(new QName("stringVar"));
stringValue.setType(XQItemType.XQBASETYPE_STRING);
@@ -148,7 +145,7 @@
list.add(stringValue);
MediatorVariable integerValue = new MediatorBaseVariable(new QName("integerVar"));
integerValue.setType(XQItemType.XQBASETYPE_INTEGER);
- integerValue.setValue(new Integer(5));
+ integerValue.setValue(5);
list.add(integerValue);
mediator.addAllVariables(list);
assertTrue(mediator.mediate(mc));
@@ -161,13 +158,13 @@
public void testQueryWithPayload() throws Exception {
MessageContext mc = TestUtils.getTestContext(sampleXml, null);
XQueryMediator mediator = new XQueryMediator();
- List list = new ArrayList();
+ List<MediatorVariable> list = new ArrayList<MediatorVariable>();
MediatorVariable variable = new MediatorCustomVariable(new QName("payload"));
variable.setType(XQItemType.XQITEMKIND_DOCUMENT);
list.add(variable);
mediator.addAllVariables(list);
mediator.setQuerySource("declare variable $payload as document-node() external;" +
- "$payload//bookstore/book/title");
+ "$payload//bookstore/book/title");
assertTrue(mediator.mediate(mc));
assertEquals("Everyday Italian", mc.getEnvelope().getBody().getFirstElement().getText());
}
@@ -175,19 +172,19 @@
public void testQueryWithPayloadTwo() throws Exception {
MessageContext mc = TestUtils.getTestContext(sampleXml2, null);
XQueryMediator mediator = new XQueryMediator();
- List list = new ArrayList();
+ List<MediatorVariable> list = new ArrayList<MediatorVariable>();
MediatorVariable variable = new MediatorCustomVariable(new QName("payload"));
variable.setType(XQItemType.XQITEMKIND_DOCUMENT);
list.add(variable);
mediator.addAllVariables(list);
mediator.setQuerySource("declare namespace m0=\"http://www.apache-synapse.org/test\"; " +
- "declare variable $payload as document-node() external;" +
- "<m:getQuote xmlns:m=\"http://services.samples/xsd\">\n" +
- "<m:request>" +
- " <m:symbol>{$payload//m0:CheckPriceRequest/m0:Code/child::text()}" +
- " </m:symbol><" +
- "/m:request>\n" +
- "</m:getQuote> ");
+ "declare variable $payload as document-node() external;" +
+ "<m:getQuote xmlns:m=\"http://services.samples/xsd\">\n" +
+ "<m:request>" +
+ " <m:symbol>{$payload//m0:CheckPriceRequest/m0:Code/child::text()}" +
+ " </m:symbol><" +
+ "/m:request>\n" +
+ "</m:getQuote> ");
assertTrue(mediator.mediate(mc));
assertEquals("IBM", mc.getEnvelope().getBody().getFirstElement().
@@ -197,41 +194,43 @@
public void testQueryWithPayloadThree() throws Exception {
MessageContext mc = TestUtils.getTestContext(sampleXml3, null);
XQueryMediator mediator = new XQueryMediator();
- List list = new ArrayList();
+ List<MediatorVariable> list = new ArrayList<MediatorVariable>();
MediatorVariable variable = new MediatorCustomVariable(new QName("payload"));
variable.setType(XQItemType.XQITEMKIND_DOCUMENT);
list.add(variable);
mediator.addAllVariables(list);
mediator.setQuerySource("declare namespace m0=\"http://services.samples/xsd\";" +
- " declare variable $payload as document-node() external;\n" +
- "<m:CheckPriceResponse xmlns:m=\"http://www.apache-synapse.org/test\">\n" +
- "\t<m:Code>{$payload//m0:return/m0:symbol/child::text()}</m:Code>\n" +
- "\t<m:Price>{$payload//m0:return/m0:last/child::text()}</m:Price>\n" +
- "</m:CheckPriceResponse>");
+ " declare variable $payload as document-node() external;\n" +
+ "<m:CheckPriceResponse xmlns:m=\"http://www.apache-synapse.org/test\">\n" +
+ "\t<m:Code>{$payload//m0:return/m0:symbol/child::text()}</m:Code>\n" +
+ "\t<m:Price>{$payload//m0:return/m0:last/child::text()}</m:Price>\n" +
+ "</m:CheckPriceResponse>");
assertTrue(mediator.mediate(mc));
}
public void testQueryWithPayloadFour() throws Exception {
MessageContext mc = TestUtils.getTestContext(sampleXml3, null);
XQueryMediator mediator = new XQueryMediator();
- List list = new ArrayList();
+ List<MediatorVariable> list = new ArrayList<MediatorVariable>();
MediatorVariable variable = new MediatorCustomVariable(new QName("payload"));
variable.setType(XQItemType.XQITEMKIND_DOCUMENT);
list.add(variable);
MediatorCustomVariable variableForXml = new MediatorCustomVariable(new QName("commission"));
variableForXml.setType(XQItemType.XQITEMKIND_DOCUMENT);
variableForXml.setRegKey("file:key");
- variableForXml.setValue(createOMElement(externalXMl));
+ variableForXml.setValue(SynapseConfigUtils.stringToOM(externalXMl));
list.add(variableForXml);
mediator.addAllVariables(list);
mediator.setQuerySource(" declare namespace m0=\"http://services.samples/xsd\";\n" +
- " declare variable $payload as document-node() external;\n" +
- " declare variable $commission as document-node() external;\n" +
- " <m0:return xmlns:m0=\"http://services.samples/xsd\">\n" +
- " \t<m0:symbol>{$payload//m0:return/m0:symbol/child::text()}" +
- " </m0:symbol>\n" +
- " \t<m0:last>{$payload//m0:return/m0:last/child::text()+ $commission//commission/vendor[@symbol=$payload//m0:return/m0:symbol/child::text()]}</m0:last>\n" +
- " </m0:return>");
+ " declare variable $payload as document-node() external;\n" +
+ " declare variable $commission as document-node() external;\n" +
+ " <m0:return xmlns:m0=\"http://services.samples/xsd\">\n" +
+ " \t<m0:symbol>{$payload//m0:return/m0:symbol/child::text()}" +
+ " </m0:symbol>\n" +
+ " \t<m0:last>{$payload//m0:return/m0:last/child::text()+ " +
+ "$commission//commission/vendor[@symbol=$payload//m0:return/m0:symbol/child::text()]}" +
+ "</m0:last>\n" +
+ " </m0:return>");
assertTrue(mediator.mediate(mc));
}
@@ -247,7 +246,7 @@
MessageContext mc = TestUtils.getTestContext("<foo/>", null);
XQueryMediator mediator = new XQueryMediator();
mediator.setQuerySource("declare variable $boolVar as xs:boolean external; $boolVar");
- List list = new ArrayList();
+ List<MediatorVariable> list = new ArrayList<MediatorVariable>();
MediatorVariable boolVariable = new MediatorBaseVariable(new QName("boolVar"));
boolVariable.setType(XQItemType.XQBASETYPE_BOOLEAN);
boolVariable.setValue(Boolean.TRUE);
@@ -256,20 +255,4 @@
assertTrue(mediator.mediate(mc));
assertEquals("true", mc.getEnvelope().getBody().getFirstElement().getText());
}
-
- protected OMElement createOMElement(String xml) {
- try {
-
- XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(
- new StringReader(xml));
- StAXOMBuilder builder = new StAXOMBuilder(reader);
- OMElement omElement = builder.getDocumentElement();
- return omElement;
-
- }
- catch (XMLStreamException e) {
- throw new RuntimeException(e);
- }
- }
-
}
Modified: synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/AbstractAutomationTestCase.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/AbstractAutomationTestCase.java?rev=747003&r1=747002&r2=747003&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/AbstractAutomationTestCase.java (original)
+++ synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/AbstractAutomationTestCase.java Mon Feb 23 13:12:35 2009
@@ -21,7 +21,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.synapse.ServerManager;
-import org.apache.axis2.engine.ListenerManager;
import org.custommonkey.xmlunit.NamespaceContext;
import org.custommonkey.xmlunit.SimpleNamespaceContext;
import org.custommonkey.xmlunit.XMLTestCase;
@@ -58,7 +57,7 @@
}
protected void setUpNSContext() {
- Map m = new HashMap();
+ Map<String, String> m = new HashMap<String, String>();
m.put("ms", "http://services.samples");
m.put("ns", "http://services.samples");
NamespaceContext nsCtx = new SimpleNamespaceContext(m);