You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2007/03/04 19:17:07 UTC
svn commit: r514453 [19/26] - in
/webservices/axis2/trunk/java/modules/kernel: src/org/apache/axis2/
src/org/apache/axis2/addressing/ src/org/apache/axis2/addressing/wsdl/
src/org/apache/axis2/builder/ src/org/apache/axis2/client/
src/org/apache/axis2/...
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java Sun Mar 4 10:16:54 2007
@@ -15,112 +15,112 @@
*/
package org.apache.axis2.addressing;
-import java.util.ArrayList;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
+import junit.framework.TestCase;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-import junit.framework.TestCase;
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.Map;
public class EndpointReferenceHelperTest extends TestCase {
- public void testToAndFromOMForFinalSpecEPR() throws Exception{
+ public void testToAndFromOMForFinalSpecEPR() throws Exception {
String address = "http://ws.apache.org/axis2";
EndpointReference epr = new EndpointReference(address);
-
+
OMFactory omf = OMAbstractFactory.getOMFactory();
- OMNamespace ns1 = omf.createOMNamespace("http://uri1","prefix1");
- OMAttribute attr1 = omf.createOMAttribute("attr1",ns1,"attr1value");
- OMNamespace ns2 = omf.createOMNamespace("http://uri2","prefix2");
- OMAttribute attr2 = omf.createOMAttribute("attr2",ns2,"attr2value");
+ OMNamespace ns1 = omf.createOMNamespace("http://uri1", "prefix1");
+ OMAttribute attr1 = omf.createOMAttribute("attr1", ns1, "attr1value");
+ OMNamespace ns2 = omf.createOMNamespace("http://uri2", "prefix2");
+ OMAttribute attr2 = omf.createOMAttribute("attr2", ns2, "attr2value");
epr.addAttribute(attr1);
epr.addAttribute(attr2);
- OMElement md1 = omf.createOMElement("md1", "http://mduri1", "md1prefix");
+ OMElement md1 = omf.createOMElement("md1", "http://mduri1", "md1prefix");
OMElement md2 = omf.createOMElement("md2", "http://mduri2", "md2prefix");
epr.addMetaData(md1);
epr.addMetaData(md2);
- OMElement ext1 = omf.createOMElement("ext1", "http://exturi1", "ext1prefix");
+ OMElement ext1 = omf.createOMElement("ext1", "http://exturi1", "ext1prefix");
OMElement ext2 = omf.createOMElement("ext2", "http://exturi2", "ext2prefix");
epr.addExtensibleElement(ext1);
epr.addExtensibleElement(ext2);
- QName rp1Qname = new QName("http://rp1uri","refParm1","rp1prefix");
- QName rp2Qname = new QName("http://rp2uri","refParm2","rp2prefix");
- epr.addReferenceParameter(rp1Qname,"rp1");
- epr.addReferenceParameter(rp2Qname,"rp2");
-
+ QName rp1Qname = new QName("http://rp1uri", "refParm1", "rp1prefix");
+ QName rp2Qname = new QName("http://rp2uri", "refParm2", "rp2prefix");
+ epr.addReferenceParameter(rp1Qname, "rp1");
+ epr.addReferenceParameter(rp2Qname, "rp2");
+
ArrayList addressAttributes = new ArrayList();
addressAttributes.add(attr1);
addressAttributes.add(attr2);
epr.setAddressAttributes(addressAttributes);
-
+
ArrayList metadataAttributes = new ArrayList();
metadataAttributes.add(attr1);
metadataAttributes.add(attr2);
epr.setMetadataAttributes(metadataAttributes);
-
- OMElement om = EndpointReferenceHelper.toOM(omf, epr, new QName("http://nsurl","localName","prefix"), AddressingConstants.Final.WSA_NAMESPACE);
-
+
+ OMElement om = EndpointReferenceHelper.toOM(omf, epr, new QName("http://nsurl", "localName",
+ "prefix"),
+ AddressingConstants.Final.WSA_NAMESPACE);
+
//Test deserialize using fromOM(OMElement)
EndpointReference deser = EndpointReferenceHelper.fromOM(om);
-
- assertEquals(epr.getAddress(),deser.getAddress());
+
+ assertEquals(epr.getAddress(), deser.getAddress());
ArrayList addrAttrs = deser.getAddressAttributes();
- assertEquals(attr1,addrAttrs.get(0));
- assertEquals(attr2,addrAttrs.get(1));
-
+ assertEquals(attr1, addrAttrs.get(0));
+ assertEquals(attr2, addrAttrs.get(1));
+
ArrayList attrs = deser.getAttributes();
- assertEquals(attr1,attrs.get(0));
- assertEquals(attr2,attrs.get(1));
-
+ assertEquals(attr1, attrs.get(0));
+ assertEquals(attr2, attrs.get(1));
+
ArrayList metadata = deser.getMetaData();
assertEquals(md1, metadata.get(0));
assertEquals(md2, metadata.get(1));
ArrayList mdAttrs = deser.getMetadataAttributes();
- assertEquals(attr1,mdAttrs.get(0));
- assertEquals(attr2,mdAttrs.get(1));
-
+ assertEquals(attr1, mdAttrs.get(0));
+ assertEquals(attr2, mdAttrs.get(1));
+
ArrayList extelts = deser.getExtensibleElements();
- assertEquals(ext1,extelts.get(0));
- assertEquals(ext2,extelts.get(1));
-
+ assertEquals(ext1, extelts.get(0));
+ assertEquals(ext2, extelts.get(1));
+
Map m = deser.getAllReferenceParameters();
- assertEquals("rp1", ((OMElement)m.get(rp1Qname)).getText());
- assertEquals("rp2", ((OMElement)m.get(rp2Qname)).getText());
-
+ assertEquals("rp1", ((OMElement) m.get(rp1Qname)).getText());
+ assertEquals("rp2", ((OMElement) m.get(rp2Qname)).getText());
+
//Test deserialize using fromOM(EndpointReference, OMElement, String)
deser = new EndpointReference("");
EndpointReferenceHelper.fromOM(deser, om, AddressingConstants.Final.WSA_NAMESPACE);
-
- assertEquals(epr.getAddress(),deser.getAddress());
+
+ assertEquals(epr.getAddress(), deser.getAddress());
addrAttrs = deser.getAddressAttributes();
- assertEquals(attr1,addrAttrs.get(0));
- assertEquals(attr2,addrAttrs.get(1));
-
+ assertEquals(attr1, addrAttrs.get(0));
+ assertEquals(attr2, addrAttrs.get(1));
+
attrs = deser.getAttributes();
- assertEquals(attr1,attrs.get(0));
- assertEquals(attr2,attrs.get(1));
-
+ assertEquals(attr1, attrs.get(0));
+ assertEquals(attr2, attrs.get(1));
+
metadata = deser.getMetaData();
assertEquals(md1, metadata.get(0));
assertEquals(md2, metadata.get(1));
mdAttrs = deser.getMetadataAttributes();
- assertEquals(attr1,mdAttrs.get(0));
- assertEquals(attr2,mdAttrs.get(1));
-
+ assertEquals(attr1, mdAttrs.get(0));
+ assertEquals(attr2, mdAttrs.get(1));
+
extelts = deser.getExtensibleElements();
- assertEquals(ext1,extelts.get(0));
- assertEquals(ext2,extelts.get(1));
-
+ assertEquals(ext1, extelts.get(0));
+ assertEquals(ext2, extelts.get(1));
+
m = deser.getAllReferenceParameters();
- assertEquals("rp1", ((OMElement)m.get(rp1Qname)).getText());
- assertEquals("rp2", ((OMElement)m.get(rp2Qname)).getText());
-
+ assertEquals("rp1", ((OMElement) m.get(rp1Qname)).getText());
+ assertEquals("rp2", ((OMElement) m.get(rp2Qname)).getText());
+
//Failure test
try {
deser = new EndpointReference("");
@@ -131,105 +131,108 @@
//pass
}
}
-
- public void testToAndFromOMForSubmissionSpecEPR() throws Exception{
+
+ public void testToAndFromOMForSubmissionSpecEPR() throws Exception {
String address = "http://ws.apache.org/axis2";
EndpointReference epr = new EndpointReference(address);
-
+
OMFactory omf = OMAbstractFactory.getOMFactory();
- OMNamespace ns1 = omf.createOMNamespace("http://uri1","prefix1");
- OMAttribute attr1 = omf.createOMAttribute("attr1",ns1,"attr1value");
- OMNamespace ns2 = omf.createOMNamespace("http://uri2","prefix2");
- OMAttribute attr2 = omf.createOMAttribute("attr2",ns2,"attr2value");
+ OMNamespace ns1 = omf.createOMNamespace("http://uri1", "prefix1");
+ OMAttribute attr1 = omf.createOMAttribute("attr1", ns1, "attr1value");
+ OMNamespace ns2 = omf.createOMNamespace("http://uri2", "prefix2");
+ OMAttribute attr2 = omf.createOMAttribute("attr2", ns2, "attr2value");
epr.addAttribute(attr1);
epr.addAttribute(attr2);
- OMElement md1 = omf.createOMElement("md1", "http://mduri1", "md1prefix");
+ OMElement md1 = omf.createOMElement("md1", "http://mduri1", "md1prefix");
OMElement md2 = omf.createOMElement("md2", "http://mduri2", "md2prefix");
epr.addMetaData(md1);
epr.addMetaData(md2);
- OMElement ext1 = omf.createOMElement("ext1", "http://exturi1", "ext1prefix");
+ OMElement ext1 = omf.createOMElement("ext1", "http://exturi1", "ext1prefix");
OMElement ext2 = omf.createOMElement("ext2", "http://exturi2", "ext2prefix");
epr.addExtensibleElement(ext1);
epr.addExtensibleElement(ext2);
- QName rp1Qname = new QName("http://rp1uri","refParm1","rp1prefix");
- QName rp2Qname = new QName("http://rp2uri","refParm2","rp2prefix");
- epr.addReferenceParameter(rp1Qname,"rp1");
- epr.addReferenceParameter(rp2Qname,"rp2");
-
+ QName rp1Qname = new QName("http://rp1uri", "refParm1", "rp1prefix");
+ QName rp2Qname = new QName("http://rp2uri", "refParm2", "rp2prefix");
+ epr.addReferenceParameter(rp1Qname, "rp1");
+ epr.addReferenceParameter(rp2Qname, "rp2");
+
ArrayList addressAttributes = new ArrayList();
addressAttributes.add(attr1);
addressAttributes.add(attr2);
epr.setAddressAttributes(addressAttributes);
-
- OMElement om = EndpointReferenceHelper.toOM(omf, epr, new QName("http://nsurl","localName","prefix"), AddressingConstants.Submission.WSA_NAMESPACE);
-
+
+ OMElement om = EndpointReferenceHelper.toOM(omf, epr, new QName("http://nsurl", "localName",
+ "prefix"),
+ AddressingConstants.Submission.WSA_NAMESPACE);
+
//Add some reference properties.
- QName p1Qname = new QName("http://p1uri","refProp1","p1prefix");
- QName p2Qname = new QName("http://p2uri","refProp2","p2prefix");
- QName qname = new QName(AddressingConstants.Submission.WSA_NAMESPACE, "ReferenceProperties", AddressingConstants.WSA_DEFAULT_PREFIX);
+ QName p1Qname = new QName("http://p1uri", "refProp1", "p1prefix");
+ QName p2Qname = new QName("http://p2uri", "refProp2", "p2prefix");
+ QName qname = new QName(AddressingConstants.Submission.WSA_NAMESPACE, "ReferenceProperties",
+ AddressingConstants.WSA_DEFAULT_PREFIX);
OMElement referenceProperties = omf.createOMElement(qname, om);
OMElement prop1 = omf.createOMElement(p1Qname, referenceProperties);
OMElement prop2 = omf.createOMElement(p2Qname, referenceProperties);
prop1.setText("p1");
prop2.setText("p2");
-
+
//Test deserialize using fromOM(OMElement)
EndpointReference deser = EndpointReferenceHelper.fromOM(om);
-
- assertEquals(epr.getAddress(),deser.getAddress());
+
+ assertEquals(epr.getAddress(), deser.getAddress());
ArrayList addrAttrs = deser.getAddressAttributes();
- assertEquals(attr1,addrAttrs.get(0));
- assertEquals(attr2,addrAttrs.get(1));
-
+ assertEquals(attr1, addrAttrs.get(0));
+ assertEquals(attr2, addrAttrs.get(1));
+
ArrayList attrs = deser.getAttributes();
- assertEquals(attr1,attrs.get(0));
- assertEquals(attr2,attrs.get(1));
-
+ assertEquals(attr1, attrs.get(0));
+ assertEquals(attr2, attrs.get(1));
+
//Metadata will be lost unless it is saved as an extensibility element.
ArrayList metadata = deser.getMetaData();
assertNull(metadata);
-
+
ArrayList extelts = deser.getExtensibleElements();
- assertEquals(ext1,extelts.get(0));
- assertEquals(ext2,extelts.get(1));
-
+ assertEquals(ext1, extelts.get(0));
+ assertEquals(ext2, extelts.get(1));
+
//All reference properties are returned as reference parameters.
Map m = deser.getAllReferenceParameters();
assertEquals(4, m.size());
- assertEquals("rp1", ((OMElement)m.get(rp1Qname)).getText());
- assertEquals("rp2", ((OMElement)m.get(rp2Qname)).getText());
- assertEquals("p1", ((OMElement)m.get(p1Qname)).getText());
- assertEquals("p2", ((OMElement)m.get(p2Qname)).getText());
-
+ assertEquals("rp1", ((OMElement) m.get(rp1Qname)).getText());
+ assertEquals("rp2", ((OMElement) m.get(rp2Qname)).getText());
+ assertEquals("p1", ((OMElement) m.get(p1Qname)).getText());
+ assertEquals("p2", ((OMElement) m.get(p2Qname)).getText());
+
//Test deserialize using fromOM(EndpointReference, OMElement, String)
deser = new EndpointReference("");
EndpointReferenceHelper.fromOM(deser, om, AddressingConstants.Submission.WSA_NAMESPACE);
-
- assertEquals(epr.getAddress(),deser.getAddress());
+
+ assertEquals(epr.getAddress(), deser.getAddress());
addrAttrs = deser.getAddressAttributes();
- assertEquals(attr1,addrAttrs.get(0));
- assertEquals(attr2,addrAttrs.get(1));
-
+ assertEquals(attr1, addrAttrs.get(0));
+ assertEquals(attr2, addrAttrs.get(1));
+
attrs = deser.getAttributes();
- assertEquals(attr1,attrs.get(0));
- assertEquals(attr2,attrs.get(1));
-
+ assertEquals(attr1, attrs.get(0));
+ assertEquals(attr2, attrs.get(1));
+
//Metadata will be lost unless it is saved as an extensibility element.
metadata = deser.getMetaData();
assertNull(metadata);
-
+
extelts = deser.getExtensibleElements();
- assertEquals(ext1,extelts.get(0));
- assertEquals(ext2,extelts.get(1));
-
+ assertEquals(ext1, extelts.get(0));
+ assertEquals(ext2, extelts.get(1));
+
//All reference properties are returned as reference parameters.
m = deser.getAllReferenceParameters();
assertEquals(4, m.size());
- assertEquals("rp1", ((OMElement)m.get(rp1Qname)).getText());
- assertEquals("rp2", ((OMElement)m.get(rp2Qname)).getText());
- assertEquals("p1", ((OMElement)m.get(p1Qname)).getText());
- assertEquals("p2", ((OMElement)m.get(p2Qname)).getText());
-
+ assertEquals("rp1", ((OMElement) m.get(rp1Qname)).getText());
+ assertEquals("rp2", ((OMElement) m.get(rp2Qname)).getText());
+ assertEquals("p1", ((OMElement) m.get(p1Qname)).getText());
+ assertEquals("p2", ((OMElement) m.get(p2Qname)).getText());
+
//Failure test
try {
deser = new EndpointReference("");
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceTypeTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceTypeTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceTypeTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceTypeTest.java Sun Mar 4 10:16:54 2007
@@ -18,7 +18,6 @@
import junit.framework.TestCase;
import junit.textui.TestRunner;
-
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
@@ -26,7 +25,6 @@
import org.apache.axiom.om.OMNamespace;
import javax.xml.namespace.QName;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
@@ -54,14 +52,14 @@
public void testGetAndSetAddress() {
assertEquals("Address not set properly in the constructor",
- address,
- endpointReference.getAddress());
+ address,
+ endpointReference.getAddress());
String newAddress = "http://www.axis2.com";
endpointReference.setAddress(newAddress);
assertEquals("Address not set properly in the setter method",
- newAddress,
- endpointReference.getAddress());
+ newAddress,
+ endpointReference.getAddress());
}
public void testGetAndSetReferenceParameters() {
@@ -81,107 +79,107 @@
"value " + i * 50);
}
}
-
- public void testHasAnonymousAddress(){
+
+ public void testHasAnonymousAddress() {
// Default EndpointReference does not has 'anonymous address'
assertFalse(endpointReference.hasAnonymousAddress());
-
+
// EndpointReference with 2005/08 Anonymous address
- EndpointReference epr200508anon = new EndpointReference(AddressingConstants.Final.WSA_ANONYMOUS_URL);
+ EndpointReference epr200508anon =
+ new EndpointReference(AddressingConstants.Final.WSA_ANONYMOUS_URL);
assertTrue(epr200508anon.hasAnonymousAddress());
-
+
// EndpointReference with 2004/08 Anonymous address
- EndpointReference epr200408anon = new EndpointReference(AddressingConstants.Submission.WSA_ANONYMOUS_URL);
+ EndpointReference epr200408anon =
+ new EndpointReference(AddressingConstants.Submission.WSA_ANONYMOUS_URL);
assertTrue(epr200408anon.hasAnonymousAddress());
}
-
- public void testHasNoneAddress(){
+
+ public void testHasNoneAddress() {
// Default EndpointReference does not has 'anonymous address'
assertFalse(endpointReference.hasNoneAddress());
-
+
// EndpointReference with 2005/08 None address
- EndpointReference epr200508none = new EndpointReference(AddressingConstants.Final.WSA_NONE_URI);
+ EndpointReference epr200508none =
+ new EndpointReference(AddressingConstants.Final.WSA_NONE_URI);
assertTrue(epr200508none.hasNoneAddress());
}
-
-
+
+
public void testSerializationDeserialization()
- throws Exception
- {
- String address = "http://ws.apache.org/axis2";
- EndpointReference epr = new EndpointReference(address);
-
- OMFactory omf = OMAbstractFactory.getOMFactory();
- OMNamespace ns1 = omf.createOMNamespace("http://uri1","prefix1");
- OMAttribute attr1 = omf.createOMAttribute("attr1",ns1,"attr1value");
- OMNamespace ns2 = omf.createOMNamespace("http://uri2","prefix2");
- OMAttribute attr2 = omf.createOMAttribute("attr2",ns2,"attr2value");
- epr.addAttribute(attr1);
- epr.addAttribute(attr2);
- OMElement md1 = omf.createOMElement("md1", "http://mduri1", "md1prefix");
- OMElement md2 = omf.createOMElement("md2", "http://mduri2", "md2prefix");
- epr.addMetaData(md1);
- epr.addMetaData(md2);
- OMElement ext1 = omf.createOMElement("ext1", "http://exturi1", "ext1prefix");
- OMElement ext2 = omf.createOMElement("ext2", "http://exturi2", "ext2prefix");
- epr.addExtensibleElement(ext1);
- epr.addExtensibleElement(ext2);
- QName rp1Qname = new QName("http://rp1uri","refParm1","rp1prefix");
- QName rp2Qname = new QName("http://rp2uri","refParm2","rp2prefix");
- epr.addReferenceParameter(rp1Qname,"rp1");
- epr.addReferenceParameter(rp2Qname,"rp2");
-
- ArrayList addressAttributes = new ArrayList();
- addressAttributes.add(attr1);
- addressAttributes.add(attr2);
- epr.setAddressAttributes(addressAttributes);
-
- ArrayList metadataAttributes = new ArrayList();
- metadataAttributes.add(attr1);
- metadataAttributes.add(attr2);
- epr.setMetadataAttributes(metadataAttributes);
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(baos);
- oos.writeObject(epr);
-
- ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
- ObjectInputStream ois = new ObjectInputStream(bais);
- EndpointReference deserializedEPR = (EndpointReference)ois.readObject();
-
- assertEquals(epr.getAddress(),deserializedEPR.getAddress());
- ArrayList addrAttrs = deserializedEPR.getAddressAttributes();
- assertAttributesEqual(attr1,(OMAttribute)addrAttrs.get(0));
- assertAttributesEqual(attr2,(OMAttribute)addrAttrs.get(1));
-
- ArrayList attrs = deserializedEPR.getAttributes();
- assertAttributesEqual(attr1,(OMAttribute)attrs.get(0));
- assertAttributesEqual(attr2,(OMAttribute)attrs.get(1));
-
- ArrayList metadata = deserializedEPR.getMetaData();
- assertEquals(md1.toString(), metadata.get(0).toString());
- assertEquals(md2.toString(), metadata.get(1).toString());
- ArrayList mdAttrs = deserializedEPR.getMetadataAttributes();
- assertAttributesEqual(attr1,(OMAttribute)mdAttrs.get(0));
- assertAttributesEqual(attr2,(OMAttribute)mdAttrs.get(1));
-
- ArrayList extelts = deserializedEPR.getExtensibleElements();
- assertEquals(ext1.toString(),extelts.get(0).toString());
- assertEquals(ext2.toString(),extelts.get(1).toString());
-
- Map m = deserializedEPR.getAllReferenceParameters();
- assertEquals("rp1", ((OMElement)m.get(rp1Qname)).getText());
- assertEquals("rp2", ((OMElement)m.get(rp2Qname)).getText());
- }
-
- private void assertAttributesEqual(OMAttribute attribute1, OMAttribute attribute2)
- {
- if (!attribute1.getAttributeValue().equals(attribute2.getAttributeValue())
- || (!attribute1.getQName().equals(attribute2.getQName())))
- {
- fail("expected:"+attribute1.getQName()+"="
- +attribute1.getAttributeValue()+" but got "+attribute2.getQName()
- +"="+attribute2.getAttributeValue());
- }
+ throws Exception {
+ String address = "http://ws.apache.org/axis2";
+ EndpointReference epr = new EndpointReference(address);
+
+ OMFactory omf = OMAbstractFactory.getOMFactory();
+ OMNamespace ns1 = omf.createOMNamespace("http://uri1", "prefix1");
+ OMAttribute attr1 = omf.createOMAttribute("attr1", ns1, "attr1value");
+ OMNamespace ns2 = omf.createOMNamespace("http://uri2", "prefix2");
+ OMAttribute attr2 = omf.createOMAttribute("attr2", ns2, "attr2value");
+ epr.addAttribute(attr1);
+ epr.addAttribute(attr2);
+ OMElement md1 = omf.createOMElement("md1", "http://mduri1", "md1prefix");
+ OMElement md2 = omf.createOMElement("md2", "http://mduri2", "md2prefix");
+ epr.addMetaData(md1);
+ epr.addMetaData(md2);
+ OMElement ext1 = omf.createOMElement("ext1", "http://exturi1", "ext1prefix");
+ OMElement ext2 = omf.createOMElement("ext2", "http://exturi2", "ext2prefix");
+ epr.addExtensibleElement(ext1);
+ epr.addExtensibleElement(ext2);
+ QName rp1Qname = new QName("http://rp1uri", "refParm1", "rp1prefix");
+ QName rp2Qname = new QName("http://rp2uri", "refParm2", "rp2prefix");
+ epr.addReferenceParameter(rp1Qname, "rp1");
+ epr.addReferenceParameter(rp2Qname, "rp2");
+
+ ArrayList addressAttributes = new ArrayList();
+ addressAttributes.add(attr1);
+ addressAttributes.add(attr2);
+ epr.setAddressAttributes(addressAttributes);
+
+ ArrayList metadataAttributes = new ArrayList();
+ metadataAttributes.add(attr1);
+ metadataAttributes.add(attr2);
+ epr.setMetadataAttributes(metadataAttributes);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(epr);
+
+ ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+ ObjectInputStream ois = new ObjectInputStream(bais);
+ EndpointReference deserializedEPR = (EndpointReference) ois.readObject();
+
+ assertEquals(epr.getAddress(), deserializedEPR.getAddress());
+ ArrayList addrAttrs = deserializedEPR.getAddressAttributes();
+ assertAttributesEqual(attr1, (OMAttribute) addrAttrs.get(0));
+ assertAttributesEqual(attr2, (OMAttribute) addrAttrs.get(1));
+
+ ArrayList attrs = deserializedEPR.getAttributes();
+ assertAttributesEqual(attr1, (OMAttribute) attrs.get(0));
+ assertAttributesEqual(attr2, (OMAttribute) attrs.get(1));
+
+ ArrayList metadata = deserializedEPR.getMetaData();
+ assertEquals(md1.toString(), metadata.get(0).toString());
+ assertEquals(md2.toString(), metadata.get(1).toString());
+ ArrayList mdAttrs = deserializedEPR.getMetadataAttributes();
+ assertAttributesEqual(attr1, (OMAttribute) mdAttrs.get(0));
+ assertAttributesEqual(attr2, (OMAttribute) mdAttrs.get(1));
+
+ ArrayList extelts = deserializedEPR.getExtensibleElements();
+ assertEquals(ext1.toString(), extelts.get(0).toString());
+ assertEquals(ext2.toString(), extelts.get(1).toString());
+
+ Map m = deserializedEPR.getAllReferenceParameters();
+ assertEquals("rp1", ((OMElement) m.get(rp1Qname)).getText());
+ assertEquals("rp2", ((OMElement) m.get(rp2Qname)).getText());
+ }
+
+ private void assertAttributesEqual(OMAttribute attribute1, OMAttribute attribute2) {
+ if (!attribute1.getAttributeValue().equals(attribute2.getAttributeValue())
+ || (!attribute1.getQName().equals(attribute2.getQName()))) {
+ fail("expected:" + attribute1.getQName() + "="
+ + attribute1.getAttributeValue() + " but got " + attribute2.getQName()
+ + "=" + attribute2.getAttributeValue());
+ }
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/miheaders/RelatesToTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/miheaders/RelatesToTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/miheaders/RelatesToTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/miheaders/RelatesToTest.java Sun Mar 4 10:16:54 2007
@@ -47,8 +47,8 @@
String newAddress = "www.newRelation.org";
relatesTo.setValue(newAddress);
assertEquals("RelatesTo address has not been get/set properly",
- relatesTo.getValue(),
- newAddress);
+ relatesTo.getValue(),
+ newAddress);
}
@@ -63,8 +63,8 @@
String newRelationshipType = "AnyOtherType";
relatesTo.setRelationshipType(newRelationshipType);
assertEquals("RelatesTo address has not been get/set properly",
- relatesTo.getRelationshipType(),
- newRelationshipType);
+ relatesTo.getRelationshipType(),
+ newRelationshipType);
}
public void testSingleArgumentConstructor() {
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/wsdl/WSDL11ActionHelperTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/wsdl/WSDL11ActionHelperTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/wsdl/WSDL11ActionHelperTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/wsdl/WSDL11ActionHelperTest.java Sun Mar 4 10:16:54 2007
@@ -16,9 +16,7 @@
package org.apache.axis2.addressing.wsdl;
-import java.io.File;
-import java.net.URL;
-import java.util.List;
+import junit.framework.TestCase;
import javax.wsdl.Definition;
import javax.wsdl.Fault;
@@ -29,108 +27,133 @@
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
+import java.io.File;
+import java.net.URL;
+import java.util.List;
public class WSDL11ActionHelperTest extends TestCase {
String testWSDLFile = "/target/test-resources/wsdl/actionTests.wsdl";
-
+
Definition definition;
-
+
protected void setUp() throws Exception {
super.setUp();
WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
reader.setFeature("javax.wsdl.importDocuments", false);
reader.setFeature("javax.wsdl.verbose", false);
- URL wsdlFile = new File(System.getProperty("basedir")+testWSDLFile).toURL();//getClass().getClassLoader().getResource(testWSDLFile);
- definition = reader.readWSDL(wsdlFile.toString());
+ URL wsdlFile = new File(System.getProperty("basedir") + testWSDLFile)
+ .toURL();//getClass().getClassLoader().getResource(testWSDLFile);
+ definition = reader.readWSDL(wsdlFile.toString());
+ }
+
+
+ // Test DefaultActionPattern (no names in WSDL)
+ // Test not required for Fault as Fault elements MUST have naes per the WSDL 1.1 spec
+ // portType=withoutWSAWActionNoName
+ // operation=echo
+ public void testGenerateInputActionNoNames() {
+ String expectedAction =
+ "http://ws.apache.org/axis2/actiontest/withoutWSAWActionNoName/echoRequest";
+ PortType pt = definition.getPortType(
+ new QName("http://ws.apache.org/axis2/actiontest/", "withoutWSAWActionNoName"));
+ List operations = pt.getOperations();
+ Operation op = (Operation) operations.get(0);
+ Input in = op.getInput();
+ String actualAction = WSDL11ActionHelper.getActionFromInputElement(definition, pt, op, in);
+ assertEquals(expectedAction, actualAction);
+ }
+
+ public void testGenerateOutputActionNoNames() {
+ String expectedAction =
+ "http://ws.apache.org/axis2/actiontest/withoutWSAWActionNoName/echoResponse";
+ PortType pt = definition.getPortType(
+ new QName("http://ws.apache.org/axis2/actiontest/", "withoutWSAWActionNoName"));
+ List operations = pt.getOperations();
+ Operation op = (Operation) operations.get(0);
+ Output out = op.getOutput();
+ String actualAction =
+ WSDL11ActionHelper.getActionFromOutputElement(definition, pt, op, out);
+ assertEquals(expectedAction, actualAction);
}
+ // Test DefaultActionPattern (names explicitly set in WSDL)
+ // portType=withoutWSAWAction
+ // operation=echo
+ public void testGenerateInputAction() {
+ String expectedAction =
+ "http://ws.apache.org/axis2/actiontest/withoutWSAWAction/NamedInput";
+ PortType pt = definition.getPortType(
+ new QName("http://ws.apache.org/axis2/actiontest/", "withoutWSAWAction"));
+ List operations = pt.getOperations();
+ Operation op = (Operation) operations.get(0);
+ Input in = op.getInput();
+ String actualAction = WSDL11ActionHelper.getActionFromInputElement(definition, pt, op, in);
+ assertEquals(expectedAction, actualAction);
+ }
- // Test DefaultActionPattern (no names in WSDL)
- // Test not required for Fault as Fault elements MUST have naes per the WSDL 1.1 spec
- // portType=withoutWSAWActionNoName
- // operation=echo
- public void testGenerateInputActionNoNames(){
- String expectedAction = "http://ws.apache.org/axis2/actiontest/withoutWSAWActionNoName/echoRequest";
- PortType pt = definition.getPortType(new QName("http://ws.apache.org/axis2/actiontest/","withoutWSAWActionNoName"));
- List operations = pt.getOperations();
- Operation op = (Operation)operations.get(0);
- Input in = op.getInput();
- String actualAction = WSDL11ActionHelper.getActionFromInputElement(definition,pt,op,in);
- assertEquals(expectedAction, actualAction);
- }
- public void testGenerateOutputActionNoNames(){
- String expectedAction = "http://ws.apache.org/axis2/actiontest/withoutWSAWActionNoName/echoResponse";
- PortType pt = definition.getPortType(new QName("http://ws.apache.org/axis2/actiontest/","withoutWSAWActionNoName"));
- List operations = pt.getOperations();
- Operation op = (Operation)operations.get(0);
- Output out = op.getOutput();
- String actualAction = WSDL11ActionHelper.getActionFromOutputElement(definition,pt,op,out);
- assertEquals(expectedAction, actualAction);
- }
-
- // Test DefaultActionPattern (names explicitly set in WSDL)
- // portType=withoutWSAWAction
- // operation=echo
- public void testGenerateInputAction(){
- String expectedAction = "http://ws.apache.org/axis2/actiontest/withoutWSAWAction/NamedInput";
- PortType pt = definition.getPortType(new QName("http://ws.apache.org/axis2/actiontest/","withoutWSAWAction"));
- List operations = pt.getOperations();
- Operation op = (Operation)operations.get(0);
- Input in = op.getInput();
- String actualAction = WSDL11ActionHelper.getActionFromInputElement(definition,pt,op,in);
- assertEquals(expectedAction, actualAction);
- }
- public void testGenerateOutputAction(){
- String expectedAction = "http://ws.apache.org/axis2/actiontest/withoutWSAWAction/NamedOutput";
- PortType pt = definition.getPortType(new QName("http://ws.apache.org/axis2/actiontest/","withoutWSAWAction"));
- List operations = pt.getOperations();
- Operation op = (Operation)operations.get(0);
- Output out = op.getOutput();
- String actualAction = WSDL11ActionHelper.getActionFromOutputElement(definition,pt,op,out);
- assertEquals(expectedAction, actualAction);
- }
- public void testGenerateFaultAction(){
- String expectedAction = "http://ws.apache.org/axis2/actiontest/withoutWSAWAction/echo/Fault/echoFault";
- PortType pt = definition.getPortType(new QName("http://ws.apache.org/axis2/actiontest/","withoutWSAWAction"));
- List operations = pt.getOperations();
- Operation op = (Operation)operations.get(0);
- Fault fault = op.getFault("echoFault");
- String actualAction = WSDL11ActionHelper.getActionFromFaultElement(definition,pt,op,fault);
- assertEquals(expectedAction, actualAction);
- }
-
- // Test reading wsaw:Action values
- // portType=withWSAWAction
- // operation=echo
- public void testGetWSAWInputAction(){
- String expectedAction = "http://example.org/action/echoIn";
- PortType pt = definition.getPortType(new QName("http://ws.apache.org/axis2/actiontest/","withWSAWAction"));
- List operations = pt.getOperations();
- Operation op = (Operation)operations.get(0);
- Input in = op.getInput();
- String actualAction = WSDL11ActionHelper.getActionFromInputElement(definition,pt,op,in);
- assertEquals(expectedAction, actualAction);
- }
- public void testGetWSAWOutputAction(){
- String expectedAction = "http://example.org/action/echoOut";
- PortType pt = definition.getPortType(new QName("http://ws.apache.org/axis2/actiontest/","withWSAWAction"));
- List operations = pt.getOperations();
- Operation op = (Operation)operations.get(0);
- Output out = op.getOutput();
- String actualAction = WSDL11ActionHelper.getActionFromOutputElement(definition,pt,op,out);
- assertEquals(expectedAction, actualAction);
- }
- public void testGetWSAWFaultAction(){
- String expectedAction = "http://example.org/action/echoFault";
- PortType pt = definition.getPortType(new QName("http://ws.apache.org/axis2/actiontest/","withWSAWAction"));
- List operations = pt.getOperations();
- Operation op = (Operation)operations.get(0);
- Fault fault = op.getFault("echoFault");
- String actualAction = WSDL11ActionHelper.getActionFromFaultElement(definition,pt,op,fault);
- assertEquals(expectedAction, actualAction);
- }
+ public void testGenerateOutputAction() {
+ String expectedAction =
+ "http://ws.apache.org/axis2/actiontest/withoutWSAWAction/NamedOutput";
+ PortType pt = definition.getPortType(
+ new QName("http://ws.apache.org/axis2/actiontest/", "withoutWSAWAction"));
+ List operations = pt.getOperations();
+ Operation op = (Operation) operations.get(0);
+ Output out = op.getOutput();
+ String actualAction =
+ WSDL11ActionHelper.getActionFromOutputElement(definition, pt, op, out);
+ assertEquals(expectedAction, actualAction);
+ }
+
+ public void testGenerateFaultAction() {
+ String expectedAction =
+ "http://ws.apache.org/axis2/actiontest/withoutWSAWAction/echo/Fault/echoFault";
+ PortType pt = definition.getPortType(
+ new QName("http://ws.apache.org/axis2/actiontest/", "withoutWSAWAction"));
+ List operations = pt.getOperations();
+ Operation op = (Operation) operations.get(0);
+ Fault fault = op.getFault("echoFault");
+ String actualAction =
+ WSDL11ActionHelper.getActionFromFaultElement(definition, pt, op, fault);
+ assertEquals(expectedAction, actualAction);
+ }
+
+ // Test reading wsaw:Action values
+ // portType=withWSAWAction
+ // operation=echo
+ public void testGetWSAWInputAction() {
+ String expectedAction = "http://example.org/action/echoIn";
+ PortType pt = definition
+ .getPortType(new QName("http://ws.apache.org/axis2/actiontest/", "withWSAWAction"));
+ List operations = pt.getOperations();
+ Operation op = (Operation) operations.get(0);
+ Input in = op.getInput();
+ String actualAction = WSDL11ActionHelper.getActionFromInputElement(definition, pt, op, in);
+ assertEquals(expectedAction, actualAction);
+ }
+
+ public void testGetWSAWOutputAction() {
+ String expectedAction = "http://example.org/action/echoOut";
+ PortType pt = definition
+ .getPortType(new QName("http://ws.apache.org/axis2/actiontest/", "withWSAWAction"));
+ List operations = pt.getOperations();
+ Operation op = (Operation) operations.get(0);
+ Output out = op.getOutput();
+ String actualAction =
+ WSDL11ActionHelper.getActionFromOutputElement(definition, pt, op, out);
+ assertEquals(expectedAction, actualAction);
+ }
+
+ public void testGetWSAWFaultAction() {
+ String expectedAction = "http://example.org/action/echoFault";
+ PortType pt = definition
+ .getPortType(new QName("http://ws.apache.org/axis2/actiontest/", "withWSAWAction"));
+ List operations = pt.getOperations();
+ Operation op = (Operation) operations.get(0);
+ Fault fault = op.getFault("echoFault");
+ String actualAction =
+ WSDL11ActionHelper.getActionFromFaultElement(definition, pt, op, fault);
+ assertEquals(expectedAction, actualAction);
+ }
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/ContextHierarchyTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/ContextHierarchyTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/ContextHierarchyTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/ContextHierarchyTest.java Sun Mar 4 10:16:54 2007
@@ -50,12 +50,13 @@
ConfigurationContext configurationContext = new ConfigurationContext(
axisConfiguration);
ServiceGroupContext serviceGroupContext = ContextFactory.createServiceGroupContext(
- configurationContext,(AxisServiceGroup) axisService.getParent());
- ServiceContext serviceContext = ContextFactory.createServiceContext(serviceGroupContext,axisService);
+ configurationContext, (AxisServiceGroup) axisService.getParent());
+ ServiceContext serviceContext =
+ ContextFactory.createServiceContext(serviceGroupContext, axisService);
MessageContext msgctx = ContextFactory.createMessageContext(configurationContext);
OperationContext opContext = axisOperation.findOperationContext(msgctx,
- serviceContext);
- axisOperation.registerOperationContext(msgctx,opContext);
+ serviceContext);
+ axisOperation.registerOperationContext(msgctx, opContext);
msgctx.setServiceContext(serviceContext);
// test the complte Hierarchy built
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java Sun Mar 4 10:16:54 2007
@@ -16,6 +16,7 @@
package org.apache.axis2.context;
+import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axis2.AbstractTestCase;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.RelatesTo;
@@ -26,7 +27,6 @@
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axiom.om.util.UUIDGenerator;
import javax.xml.namespace.QName;
@@ -43,16 +43,17 @@
AxisService axisService = new AxisService("TempSC");
configContext.getAxisConfiguration().addService(axisService);
- ServiceGroupContext sgc =ContextFactory.createServiceGroupContext(configContext,
- (AxisServiceGroup) axisService.getParent()) ;
- ServiceContext sessionContext = ContextFactory.createServiceContext(sgc,axisService);
+ ServiceGroupContext sgc = ContextFactory.createServiceGroupContext(configContext,
+ (AxisServiceGroup) axisService
+ .getParent());
+ ServiceContext sessionContext = ContextFactory.createServiceContext(sgc, axisService);
MessageContext messageContext1 = this.getBasicMessageContext();
messageContext1.setMessageID(UUIDGenerator.getUUID());
AxisOperation axisOperation = new InOutAxisOperation(new QName("test"));
OperationContext operationContext1 = axisOperation
.findOperationContext(messageContext1, sessionContext);
- axisOperation.registerOperationContext(messageContext1,operationContext1);
+ axisOperation.registerOperationContext(messageContext1, operationContext1);
MessageContext messageContext2 = this.getBasicMessageContext();
messageContext2.setMessageID(UUIDGenerator.getUUID());
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/AddingObserverTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/AddingObserverTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/AddingObserverTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/AddingObserverTest.java Sun Mar 4 10:16:54 2007
@@ -26,8 +26,11 @@
public void testAddingObservs() throws Exception {
try {
- String filename = System.getProperty("basedir")+"/test-resources/deployment/ConfigWithObservers";
- er = ConfigurationContextFactory.createConfigurationContextFromFileSystem(filename, filename + "/axis2.xml").getAxisConfiguration();
+ String filename = System.getProperty("basedir") +
+ "/test-resources/deployment/ConfigWithObservers";
+ er = ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem(filename, filename + "/axis2.xml")
+ .getAxisConfiguration();
assertNotNull(er);
} catch (DeploymentException e) {
throw new DeploymentException(e);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/AxisMessageTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/AxisMessageTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/AxisMessageTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/AxisMessageTest.java Sun Mar 4 10:16:54 2007
@@ -29,8 +29,10 @@
public class AxisMessageTest extends TestCase {
public void testAxisMessage() throws Exception {
- String filename = System.getProperty("basedir")+"/test-resources/deployment/AxisMessageTestRepo";
- AxisConfiguration er = ConfigurationContextFactory.createConfigurationContextFromFileSystem(filename, filename + "/axis2.xml")
+ String filename =
+ System.getProperty("basedir") + "/test-resources/deployment/AxisMessageTestRepo";
+ AxisConfiguration er = ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem(filename, filename + "/axis2.xml")
.getAxisConfiguration();
assertNotNull(er);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/AxisObserverImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/AxisObserverImpl.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/AxisObserverImpl.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/AxisObserverImpl.java Sun Mar 4 10:16:54 2007
@@ -18,7 +18,12 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisServiceGroup;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.ParameterInclude;
+import org.apache.axis2.description.ParameterIncludeImpl;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisEvent;
import org.apache.axis2.engine.AxisObserver;
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BadModuleTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BadModuleTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BadModuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BadModuleTest.java Sun Mar 4 10:16:54 2007
@@ -36,7 +36,7 @@
InputStream in = new FileInputStream(
getTestResourceFile("deployment/Badmodule.xml"));
AxisConfiguration glabl = new AxisConfiguration();
- AxisConfigBuilder builder =new AxisConfigBuilder(in, glabl,null);
+ AxisConfigBuilder builder = new AxisConfigBuilder(in, glabl, null);
builder.populateConfig();
fail(
"this must failed gracefully with DeploymentException or FileNotFoundException");
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java Sun Mar 4 10:16:54 2007
@@ -17,11 +17,11 @@
package org.apache.axis2.deployment;
import org.apache.axis2.AbstractTestCase;
-import org.apache.axis2.util.Loader;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.util.Loader;
import javax.xml.namespace.QName;
@@ -35,8 +35,9 @@
public void testDeployment() {
try {
- String filename = System.getProperty("basedir")+"/target/test-resources/deployment";
- AxisConfiguration er = ConfigurationContextFactory.createConfigurationContextFromFileSystem(filename,null)
+ String filename = System.getProperty("basedir") + "/target/test-resources/deployment";
+ AxisConfiguration er = ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem(filename, null)
.getAxisConfiguration();
assertNotNull(er);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuilderSelectorDeploymentTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuilderSelectorDeploymentTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuilderSelectorDeploymentTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuilderSelectorDeploymentTest.java Sun Mar 4 10:16:54 2007
@@ -16,16 +16,10 @@
package org.apache.axis2.deployment;
-import java.io.File;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-
import org.apache.axis2.AbstractTestCase;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.description.TransportOutDescription;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.phaseresolver.PhaseException;
+
+import java.io.File;
public class BuilderSelectorDeploymentTest extends AbstractTestCase {
/**
@@ -47,14 +41,17 @@
// className = axisConfig.getMessageBuilder("application/soap+xml").getClass().getName();
// assertEquals(className,"org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder");
}
-
- public void testBuilderSelectionInvalidEntry() throws AxisFault{
- String repositoryName =System.getProperty("basedir",".")+"/"+"target/test-resources/deployment";
+
+ public void testBuilderSelectionInvalidEntry() throws AxisFault {
+ String repositoryName =
+ System.getProperty("basedir", ".") + "/" + "target/test-resources/deployment";
File repo = new File(repositoryName);
- String xmlFile = System.getProperty("basedir",".")+"/"+"test-resources/deployment/builderSelectorTest/bad-axis2.xml";
+ String xmlFile = System.getProperty("basedir", ".") + "/" +
+ "test-resources/deployment/builderSelectorTest/bad-axis2.xml";
File xml = new File(xmlFile);
- FileSystemConfigurator fsc = new FileSystemConfigurator(repo.getAbsolutePath(), xml.getAbsolutePath());
- AxisFault testFault=null;
+ FileSystemConfigurator fsc =
+ new FileSystemConfigurator(repo.getAbsolutePath(), xml.getAbsolutePath());
+ AxisFault testFault = null;
try {
fsc.getAxisConfiguration();
} catch (AxisFault e) {
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/DeploymentTotalTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/DeploymentTotalTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/DeploymentTotalTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/DeploymentTotalTest.java Sun Mar 4 10:16:54 2007
@@ -18,8 +18,8 @@
import junit.framework.TestCase;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.description.Parameter;
import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.phaseresolver.PhaseException;
@@ -32,9 +32,10 @@
DeploymentException,
AxisFault,
XMLStreamException {
- String filename = System.getProperty("basedir")+"/target/test-resources/deployment";
- er = ConfigurationContextFactory.createConfigurationContextFromFileSystem(filename, filename + "/axis2.xml")
- .getAxisConfiguration();
+ String filename = System.getProperty("basedir") + "/target/test-resources/deployment";
+ er = ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem(filename, filename + "/axis2.xml")
+ .getAxisConfiguration();
// OK, no exceptions. Now make sure we read the correct file...
Parameter param = er.getParameter("FavoriteColor");
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java Sun Mar 4 10:16:54 2007
@@ -16,16 +16,11 @@
package org.apache.axis2.deployment;
-import java.io.File;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-
import org.apache.axis2.AbstractTestCase;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.phaseresolver.PhaseException;
+
+import java.io.File;
public class MessageFormatterDeploymentTest extends AbstractTestCase {
/**
@@ -36,23 +31,30 @@
}
public void testBuilderSelection() throws AxisFault {
- String repositoryName =System.getProperty("basedir",".")+"/"+"target/test-resources/deployment";
+ String repositoryName =
+ System.getProperty("basedir", ".") + "/" + "target/test-resources/deployment";
File repo = new File(repositoryName);
- String xmlFile = System.getProperty("basedir",".")+"/"+"test-resources/deployment/messageFormatterTest/axis2.xml";
+ String xmlFile = System.getProperty("basedir", ".") + "/" +
+ "test-resources/deployment/messageFormatterTest/axis2.xml";
File xml = new File(xmlFile);
- FileSystemConfigurator fsc = new FileSystemConfigurator(repo.getAbsolutePath(), xml.getAbsolutePath());
+ FileSystemConfigurator fsc =
+ new FileSystemConfigurator(repo.getAbsolutePath(), xml.getAbsolutePath());
AxisConfiguration axisConfig = fsc.getAxisConfiguration();
- String className = axisConfig.getMessageFormatter("application/soap+xml").getClass().getName();
- assertEquals("org.apache.axis2.transport.http.SOAPMessageFormatter",className);
+ String className =
+ axisConfig.getMessageFormatter("application/soap+xml").getClass().getName();
+ assertEquals("org.apache.axis2.transport.http.SOAPMessageFormatter", className);
}
-
- public void testBuilderSelectionInvalidEntry() throws AxisFault{
- String repositoryName =System.getProperty("basedir",".")+"/"+"target/test-resources/deployment";
+
+ public void testBuilderSelectionInvalidEntry() throws AxisFault {
+ String repositoryName =
+ System.getProperty("basedir", ".") + "/" + "target/test-resources/deployment";
File repo = new File(repositoryName);
- String xmlFile = System.getProperty("basedir",".")+"/"+"test-resources/deployment/messageFormatterTest/bad-axis2.xml";
+ String xmlFile = System.getProperty("basedir", ".") + "/" +
+ "test-resources/deployment/messageFormatterTest/bad-axis2.xml";
File xml = new File(xmlFile);
- FileSystemConfigurator fsc = new FileSystemConfigurator(repo.getAbsolutePath(), xml.getAbsolutePath());
- AxisFault testFault=null;
+ FileSystemConfigurator fsc =
+ new FileSystemConfigurator(repo.getAbsolutePath(), xml.getAbsolutePath());
+ AxisFault testFault = null;
try {
fsc.getAxisConfiguration();
} catch (AxisFault e) {
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModifiedConfigFileTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModifiedConfigFileTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModifiedConfigFileTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModifiedConfigFileTest.java Sun Mar 4 10:16:54 2007
@@ -28,10 +28,12 @@
public void testPhaseOrderchage() {
try {
String filename = "./test-resources/deployment/BadConfigOrderChange/axis2.xml";
- er = ConfigurationContextFactory.createConfigurationContextFromFileSystem(null,filename).getAxisConfiguration();
+ er = ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem(null, filename)
+ .getAxisConfiguration();
fail(
"this must failed gracefully with DeploymentException \"Invalid System predefined " +
- "inphases , phase order does not\" +\n support\\n recheck axis2.xml\"");
+ "inphases , phase order does not\" +\n support\\n recheck axis2.xml\"");
} catch (AxisFault e) {
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java Sun Mar 4 10:16:54 2007
@@ -36,7 +36,8 @@
QName opName = new QName("testOperation");
protected void setUp() throws Exception {
- String filename = System.getProperty("basedir")+"/test-resources/deployment/moduleDisEngegeRepo";
+ String filename =
+ System.getProperty("basedir") + "/test-resources/deployment/moduleDisEngegeRepo";
er = ConfigurationContextFactory.
createConfigurationContextFromFileSystem(filename, null).getAxisConfiguration();
AxisService testService = new AxisService();
@@ -156,7 +157,7 @@
assertEquals(0, userPhase.getHandlerCount());
}
- public void testServiceEnageOperationDisengag() throws AxisFault {
+ public void testServiceEnageOperationDisengag() throws AxisFault {
AxisModule module = er.getModule(new QName("testModule"));
assertNotNull(module);
Phase predisptah;
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleversionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleversionTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleversionTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleversionTest.java Sun Mar 4 10:16:54 2007
@@ -30,9 +30,11 @@
public class ModuleversionTest extends TestCase {
public void testDefautModuleVersion() throws AxisFault {
- String filename = System.getProperty("basedir")+"/test-resources/deployment/moduleVersion/Test1/axis2.xml";
- AxisConfiguration ac = ConfigurationContextFactory.createConfigurationContextFromFileSystem(null,filename)
- .getAxisConfiguration();
+ String filename = System.getProperty("basedir") +
+ "/test-resources/deployment/moduleVersion/Test1/axis2.xml";
+ AxisConfiguration ac =
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, filename)
+ .getAxisConfiguration();
assertNotNull(ac);
assertEquals(ac.getDefaultModuleVersion("abc"), "1.23");
assertEquals(ac.getDefaultModuleVersion("foo"), "0.89");
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SameServiceAddingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SameServiceAddingTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SameServiceAddingTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SameServiceAddingTest.java Sun Mar 4 10:16:54 2007
@@ -33,7 +33,8 @@
AxisConfiguration ar;
public void testServiceGroup() throws AxisFault {
- ar = ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, null).getAxisConfiguration();
+ ar = ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, null)
+ .getAxisConfiguration();
AxisServiceGroup axisServiceGroup1 = new AxisServiceGroup();
axisServiceGroup1.setServiceGroupName("ServiceGroup1");
AxisService service1 = new AxisService();
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ServiceGroupTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ServiceGroupTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ServiceGroupTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ServiceGroupTest.java Sun Mar 4 10:16:54 2007
@@ -22,14 +22,15 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.engine.AxisConfiguration;
+
public class ServiceGroupTest extends TestCase {
AxisConfiguration ar;
- String repo = System.getProperty("basedir")+"/test-resources/deployment/serviceGroupRepo";
-
+ String repo = System.getProperty("basedir") + "/test-resources/deployment/serviceGroupRepo";
protected void setUp() throws Exception {
- ar = ConfigurationContextFactory.createConfigurationContextFromFileSystem(repo,null).getAxisConfiguration();
+ ar = ConfigurationContextFactory.createConfigurationContextFromFileSystem(repo, null)
+ .getAxisConfiguration();
}
public void testServiceGroup() throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SpeakingHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SpeakingHandler.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SpeakingHandler.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SpeakingHandler.java Sun Mar 4 10:16:54 2007
@@ -39,7 +39,7 @@
public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
log.info("I am " + message + " Handler Running :)");
- return InvocationResponse.CONTINUE;
+ return InvocationResponse.CONTINUE;
}
public void revoke(MessageContext msgContext) {
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SystemPhasesremovedTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SystemPhasesremovedTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SystemPhasesremovedTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SystemPhasesremovedTest.java Sun Mar 4 10:16:54 2007
@@ -31,11 +31,12 @@
public void testPhaseOrderchage() {
try {
String filename = "./test-resources/deployment/SystemPhaseRemove";
- er =ConfigurationContextFactory.createConfigurationContextFromFileSystem(filename,filename + "/axis2.xml")
+ er = ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem(filename, filename + "/axis2.xml")
.getAxisConfiguration();
fail(
"this must failed gracefully with DeploymentException \"Invalid System predefined " +
- "inphases , phase order does not\" +\n support\\n recheck axis2.xml\"");
+ "inphases , phase order does not\" +\n support\\n recheck axis2.xml\"");
} catch (AxisFault e) {
log.info(e.getCause());
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/TransportDeploymentTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/TransportDeploymentTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/TransportDeploymentTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/TransportDeploymentTest.java Sun Mar 4 10:16:54 2007
@@ -16,17 +16,16 @@
package org.apache.axis2.deployment;
-import java.io.File;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-
import org.apache.axis2.AbstractTestCase;
import org.apache.axis2.AxisFault;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.phaseresolver.PhaseException;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import java.io.File;
+
public class TransportDeploymentTest extends AbstractTestCase {
/**
* Constructor.
@@ -39,11 +38,12 @@
PhaseException,
DeploymentException,
XMLStreamException {
- String repositoryName = System.getProperty("basedir")+"/target/test-resources/deployment";
+ String repositoryName = System.getProperty("basedir") + "/target/test-resources/deployment";
File repo = new File(repositoryName);
String xmlFile = repositoryName + "/server-transport.xml";
File xml = new File(xmlFile);
- FileSystemConfigurator fsc = new FileSystemConfigurator(repo.getAbsolutePath(), xml.getAbsolutePath());
+ FileSystemConfigurator fsc =
+ new FileSystemConfigurator(repo.getAbsolutePath(), xml.getAbsolutePath());
AxisConfiguration er = fsc.getAxisConfiguration();
TransportOutDescription transport1 = er.getTransportOut(
new QName("custom"));
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/MockFlow.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/MockFlow.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/MockFlow.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/MockFlow.java Sun Mar 4 10:16:54 2007
@@ -27,8 +27,8 @@
SpeakingHandler1 h1 = new SpeakingHandler1(
"Executing " + i + " inside " + message);
Utils.addHandler(this,
- h1,
- PhaseMetadata.PHASE_POLICY_DETERMINATION);
+ h1,
+ PhaseMetadata.PHASE_POLICY_DETERMINATION);
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/RegistryTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/RegistryTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/RegistryTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/RegistryTest.java Sun Mar 4 10:16:54 2007
@@ -82,8 +82,8 @@
public void testHandlers() throws AxisFault {
Handler handler = new AbstractHandler() {
- public InvocationResponse invoke(MessageContext msgContext) {
- return InvocationResponse.CONTINUE;
+ public InvocationResponse invoke(MessageContext msgContext) {
+ return InvocationResponse.CONTINUE;
}
};
handler.init(new HandlerDescription());
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler.java Sun Mar 4 10:16:54 2007
@@ -39,7 +39,7 @@
public InvocationResponse invoke(MessageContext msgContext) throws
AxisFault {
log.info("I am " + message + " Handler Running :)");
- return InvocationResponse.CONTINUE;
+ return InvocationResponse.CONTINUE;
}
public void revoke(MessageContext msgContext) {
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler1.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler1.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler1.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler1.java Sun Mar 4 10:16:54 2007
@@ -38,7 +38,7 @@
public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
log.info("I am " + message + " Handler Running :)");
- return InvocationResponse.CONTINUE;
+ return InvocationResponse.CONTINUE;
}
public void revoke(MessageContext msgContext) {
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/WSDLToAllServicesBuilderTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/WSDLToAllServicesBuilderTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/WSDLToAllServicesBuilderTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/WSDLToAllServicesBuilderTest.java Sun Mar 4 10:16:54 2007
@@ -17,43 +17,36 @@
*/
package org.apache.axis2.description;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.List;
-
+import junit.framework.TestCase;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.WSDL11ToAllAxisServicesBuilder;
-import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
-import org.apache.axis2.description.WSDL20ToAllAxisServicesBuilder;
import org.apache.axis2.engine.ListenerManager;
-import junit.framework.TestCase;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.Iterator;
+import java.util.List;
/**
* Tests the WSDL11ToAllServicesBuilder class.
- *
*/
public class WSDLToAllServicesBuilderTest extends TestCase {
private static final String[] expectedService11 = {
- "EchoServicePortOne",
- "EchoServicePortTwo",
- "EchoServicePortThree"};
+ "EchoServicePortOne",
+ "EchoServicePortTwo",
+ "EchoServicePortThree"};
private static final String[] expectedService20 = {
- "echoService1$echoServiceSOAPBinding_http",
- "echoService1$echoServiceEndpoint2SOAPBinding_http",
- "echoService2$echoServiceSOAPBinding_http"};
+ "echoService1$echoServiceSOAPBinding_http",
+ "echoService1$echoServiceEndpoint2SOAPBinding_http",
+ "echoService2$echoServiceSOAPBinding_http"};
private ConfigurationContext configContext;
ListenerManager lm;
protected void setUp() throws Exception {
- configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, null);
+ configContext =
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, null);
lm = new ListenerManager();
lm.init(configContext);
lm.start();
@@ -64,7 +57,7 @@
}
private void checkResults(List axisServices, String expectedService[]) {
-
+
Iterator asi = axisServices.iterator();
int i = 0;
while (asi.hasNext() && i < expectedService.length) {
@@ -72,12 +65,12 @@
System.out.println("AxisService : " + as.getName());
assertEquals("Unexpected service name in AxisService List: expected "
+ expectedService[i] + " but found " + as.getName() + ".",
- as.getName(),
- expectedService[i]);
+ as.getName(),
+ expectedService[i]);
i++;
}
}
-
+
public void testWSDL11toAllAxisServices() throws Exception {
File testResourceFile = new File("target/test-classes/wsdl/EchoServiceWsdl11.wsdl");
File outLocation = new File("target/test-resources");
@@ -119,7 +112,6 @@
}
}
-
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/ActionBasedOperationDispatchTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/ActionBasedOperationDispatchTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/ActionBasedOperationDispatchTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/ActionBasedOperationDispatchTest.java Sun Mar 4 10:16:54 2007
@@ -13,42 +13,40 @@
*/
package org.apache.axis2.dispatchers;
-import java.util.ArrayList;
-
-import javax.xml.namespace.QName;
-
+import junit.framework.TestCase;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.InOnlyAxisOperation;
-import junit.framework.TestCase;
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
public class ActionBasedOperationDispatchTest extends TestCase {
- public void testFindOperation() throws Exception{
+ public void testFindOperation() throws Exception {
MessageContext messageContext = new MessageContext();
AxisService as = new AxisService("Service1");
messageContext.setAxisService(as);
-
+
AxisOperation operation1 = new InOnlyAxisOperation(new QName("operation1"));
ArrayList op1actions = new ArrayList();
op1actions.add("urn:org.apache.axis2.dispatchers.test:operation1");
operation1.setWsamappingList(op1actions);
-
+
AxisOperation operation2 = new InOnlyAxisOperation(new QName("operation2"));
ArrayList op2actions = new ArrayList();
op2actions.add("urn:org.apache.axis2.dispatchers.test:operation2");
operation2.setWsamappingList(op2actions);
-
+
as.addOperation(operation1);
as.addOperation(operation2);
-
+
as.mapActionToOperation("urn:org.apache.axis2.dispatchers.test:operation1", operation1);
as.mapActionToOperation("urn:org.apache.axis2.dispatchers.test:operation2", operation2);
-
+
messageContext.setWSAAction("urn:org.apache.axis2.dispatchers.test:operation2");
-
+
ActionBasedOperationDispatcher abod = new ActionBasedOperationDispatcher();
abod.invoke(messageContext);
assertEquals(operation2, messageContext.getAxisOperation());
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcherTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcherTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcherTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcherTest.java Sun Mar 4 10:16:54 2007
@@ -13,47 +13,47 @@
*/
package org.apache.axis2.dispatchers;
-import javax.xml.namespace.QName;
-
import junit.framework.TestCase;
-
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.RelatesTo;
import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.InOnlyAxisOperation;
import org.apache.axis2.engine.AxisConfiguration;
+import javax.xml.namespace.QName;
+
public class RelatesToBasedOperationDispatcherTest extends TestCase {
- public void testFindOperation() throws AxisFault{
+ public void testFindOperation() throws AxisFault {
MessageContext messageContext;
AxisService as1 = new AxisService("Service1");
AxisConfiguration ac = new AxisConfiguration();
ac.addService(as1);
-
+
AxisOperation operation1 = new InOnlyAxisOperation(new QName("operation1"));
AxisOperation operation2 = new InOnlyAxisOperation(new QName("operation2"));
as1.addOperation(operation1);
as1.addOperation(operation2);
-
+
ConfigurationContext cc = new ConfigurationContext(ac);
- OperationContext oc1 =ContextFactory.createOperationContext(operation1,null);
- OperationContext oc2 = ContextFactory.createOperationContext(operation2,null);
+ OperationContext oc1 = ContextFactory.createOperationContext(operation1, null);
+ OperationContext oc2 = ContextFactory.createOperationContext(operation2, null);
cc.registerOperationContext("urn:org.apache.axis2.dispatchers.messageid:123", oc1);
cc.registerOperationContext("urn:org.apache.axis2.dispatchers.messageid:456", oc2);
messageContext = ContextFactory.createMessageContext(cc);
- messageContext.addRelatesTo(new RelatesTo("urn:org.apache.axis2.dispatchers.messageid:456"));
+ messageContext
+ .addRelatesTo(new RelatesTo("urn:org.apache.axis2.dispatchers.messageid:456"));
messageContext.setAxisService(as1);
-
+
RelatesToBasedOperationDispatcher ruisd = new RelatesToBasedOperationDispatcher();
ruisd.invoke(messageContext);
-
+
assertEquals(operation2, messageContext.getAxisOperation());
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedServiceDispatcherTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedServiceDispatcherTest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedServiceDispatcherTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedServiceDispatcherTest.java Sun Mar 4 10:16:54 2007
@@ -13,55 +13,61 @@
*/
package org.apache.axis2.dispatchers;
-import javax.xml.namespace.QName;
-
import junit.framework.TestCase;
-
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.RelatesTo;
-import org.apache.axis2.context.*;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ContextFactory;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.InOnlyAxisOperation;
import org.apache.axis2.engine.AxisConfiguration;
+import javax.xml.namespace.QName;
+
public class RelatesToBasedServiceDispatcherTest extends TestCase {
- public void testFindService() throws AxisFault{
-
+ public void testFindService() throws AxisFault {
+
MessageContext messageContext;
-
+
AxisConfiguration ac = new AxisConfiguration();
ConfigurationContext cc = new ConfigurationContext(ac);
-
+
AxisService as1 = new AxisService("Service1");
- ServiceContext sc1 = new ServiceContext(as1, ContextFactory.createServiceGroupContext(cc,null));
+ ServiceContext sc1 =
+ new ServiceContext(as1, ContextFactory.createServiceGroupContext(cc, null));
AxisService as2 = new AxisService("Service2");
-
- ServiceContext sc2 = new ServiceContext(as2, ContextFactory.createServiceGroupContext(cc,null));
-
-
+
+ ServiceContext sc2 =
+ new ServiceContext(as2, ContextFactory.createServiceGroupContext(cc, null));
+
+
ac.addService(as1);
ac.addService(as2);
-
+
AxisOperation operation1 = new InOnlyAxisOperation(new QName("operation1"));
AxisOperation operation2 = new InOnlyAxisOperation(new QName("operation2"));
as1.addOperation(operation1);
as2.addOperation(operation2);
-
-
- OperationContext oc1 = ContextFactory.createOperationContext(operation1,sc1);
- OperationContext oc2 = ContextFactory.createOperationContext(operation2,sc2);
+
+
+ OperationContext oc1 = ContextFactory.createOperationContext(operation1, sc1);
+ OperationContext oc2 = ContextFactory.createOperationContext(operation2, sc2);
cc.registerOperationContext("urn:org.apache.axis2.dispatchers.messageid:123", oc1);
cc.registerOperationContext("urn:org.apache.axis2.dispatchers.messageid:456", oc2);
messageContext = ContextFactory.createMessageContext(cc);
- messageContext.addRelatesTo(new RelatesTo("urn:org.apache.axis2.dispatchers.messageid:456"));
-
+ messageContext
+ .addRelatesTo(new RelatesTo("urn:org.apache.axis2.dispatchers.messageid:456"));
+
RelatesToBasedServiceDispatcher ruisd = new RelatesToBasedServiceDispatcher();
ruisd.invoke(messageContext);
-
+
assertEquals(as2, messageContext.getAxisService());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org