You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2005/09/28 07:22:48 UTC
svn commit: r292128 - in
/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/sun:
complex/SunGroupHMain.java simple/SunGroupHMain.java
Author: deepal
Date: Tue Sep 27 22:22:41 2005
New Revision: 292128
URL: http://svn.apache.org/viewcvs?rev=292128&view=rev
Log:
applying Nadanas' patch
Modified:
webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/sun/complex/SunGroupHMain.java
webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/sun/simple/SunGroupHMain.java
Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/sun/complex/SunGroupHMain.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/sun/complex/SunGroupHMain.java?rev=292128&r1=292127&r2=292128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/sun/complex/SunGroupHMain.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/sun/complex/SunGroupHMain.java Tue Sep 27 22:22:41 2005
@@ -50,7 +50,7 @@
boolean compare=false;
if(retEle!=null){
InputStream stream = Thread.currentThread()
- .getContextClassLoader().getResourceAsStream("/" + filepath);
+ .getContextClassLoader().getResourceAsStream(filepath);
javax.xml.stream.XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(stream);
OMXMLParserWrapper builder = new StAXSOAPModelBuilder(parser, null);
SOAPEnvelope resEnv = (SOAPEnvelope) builder.getDocumentElement();
@@ -68,7 +68,7 @@
util=new EchoSOAPStructFaultClientUtil();
retEle = client.sendMsg(util,soapAction);
assertTrue(
- Compare(retEle,"/interop/sun/round4/complex/resSoapStructFault.xml"));
+ Compare(retEle,"interop/sun/round4/complex/resSoapStructFault.xml"));
}
@@ -77,7 +77,7 @@
util=new EchoBaseStructFaultClientutil();
retEle = client.sendMsg(util,soapAction);
assertTrue(
- Compare( retEle,"/interop/sun/round4/complex/resBaseStrutFault.xml"));
+ Compare( retEle,"interop/sun/round4/complex/resBaseStrutFault.xml"));
}
@@ -86,7 +86,7 @@
util=new EchoExtendedStructFaultClientUtil();
retEle = client.sendMsg(util,soapAction);
assertTrue(
- Compare(retEle,"/interop/sun/round4/complex/resExtendedStructFault.xml"));
+ Compare(retEle,"interop/sun/round4/complex/resExtendedStructFault.xml"));
}
@@ -95,7 +95,7 @@
util=new EchoMultipleFaults1ClientUtil();
retEle = client.sendMsg(util,soapAction);
assertTrue(
- Compare( retEle,"/interop/sun/round4/complex/resMultipleFaults1.xml"));
+ Compare( retEle,"interop/sun/round4/complex/resMultipleFaults1.xml"));
}
//echomultiplefaults2
@@ -103,7 +103,7 @@
util=new EchoMultipleFaults2ClientUtil();
retEle = client.sendMsg(util,soapAction);
assertTrue(
- Compare( retEle,"/interop/sun/round4/complex/resMultipleFaults2.xml"));
+ Compare( retEle,"interop/sun/round4/complex/resMultipleFaults2.xml"));
}
}
Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/sun/simple/SunGroupHMain.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/sun/simple/SunGroupHMain.java?rev=292128&r1=292127&r2=292128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/sun/simple/SunGroupHMain.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/sun/simple/SunGroupHMain.java Tue Sep 27 22:22:41 2005
@@ -3,17 +3,12 @@
import junit.framework.TestCase;
import org.apache.axis2.interop.sun.round4.simple.EchoBlockingClient;
-import org.apache.axis2.interop.sun.round4.simple.util.EchoEmptyFaultClientUtil;
-import org.apache.axis2.interop.sun.round4.simple.util.EchoMultipleFaults1ClientUtil;
-import org.apache.axis2.interop.sun.round4.simple.util.EchoMultipleFaults2ClientUtil;
-import org.apache.axis2.interop.sun.round4.simple.util.EchoMultipleFaults3Clientutil;
-import org.apache.axis2.interop.sun.round4.simple.util.EchoMultipleFaults4ClientUtil;
-import org.apache.axis2.interop.sun.round4.simple.util.EchoStringFaultClientUtil;
-import org.apache.axis2.interop.sun.round4.simple.util.SunGroupHClientUtil;
+import org.apache.axis2.interop.sun.round4.simple.util.*;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.llom.exception.XMLComparisonException;
-import org.apache.axis2.om.impl.llom.util.XMLComparator;
+//import org.apache.axis2.om.impl.llom.util.XMLComparator;
+ import org.apache.axis2.XMLComparatorInterop;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.impl.llom.builder.StAXSOAPModelBuilder;
@@ -45,12 +40,12 @@
boolean compare=false;
if(retEle!=null){
InputStream stream = Thread.currentThread()
- .getContextClassLoader().getResourceAsStream("/" + filepath);
+ .getContextClassLoader().getResourceAsStream(filepath);
javax.xml.stream.XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(stream);
OMXMLParserWrapper builder = new StAXSOAPModelBuilder(parser, null);
SOAPEnvelope resEnv = (SOAPEnvelope) builder.getDocumentElement();
OMElement resElementtobe = resEnv.getBody().getFirstElement();
- XMLComparator comparator = new XMLComparator();
+ XMLComparatorInterop comparator = new XMLComparatorInterop();
compare = comparator.compare(retEle,resElementtobe);
}
return compare;
@@ -63,7 +58,7 @@
public void testEchoEmptyFault() throws Exception{
util=new EchoEmptyFaultClientUtil();
retEle =client.sendMsg(util,soapAction);
- assertTrue(Compare(retEle,"/interop/sun/round4/simple/resEmptyfault.xml"));
+ assertTrue(Compare(retEle,"interop/sun/round4/simple/resEmptyfault.xml"));
}
@@ -71,11 +66,11 @@
//todo fix me Nadana , this fails due to bug in XML Comparator
//echoBaseSoapStructFault
-// public void testIntArrayFault()throws Exception{
-// util=new EchoIntArrayFaultClientUtil();
-// retEle = client.sendMsg(util,soapAction);
-// assertTrue(Compare( retEle,"/interop/sun/round4/simple/resIntArrayFault.xml"));
-// }
+ public void testIntArrayFault()throws Exception{
+ util=new EchoIntArrayFaultClientUtil();
+ retEle = client.sendMsg(util,soapAction);
+ assertTrue(Compare( retEle,"interop/sun/round4/simple/resIntArrayFault.xml"));
+ }
@@ -84,7 +79,7 @@
public void testStringFault()throws Exception{
util=new EchoStringFaultClientUtil();
retEle = client.sendMsg(util,soapAction);
- assertTrue(Compare( retEle,"/interop/sun/round4/simple/resStringFault.xml"));
+ assertTrue(Compare( retEle,"interop/sun/round4/simple/resStringFault.xml"));
@@ -95,14 +90,14 @@
public void testMultiplefaults1()throws Exception{
util=new EchoMultipleFaults1ClientUtil();
retEle = client.sendMsg(util,soapAction);
- assertTrue(Compare( retEle,"/interop/sun/round4/simple/resMultipleFaults1.xml"));
+ assertTrue(Compare( retEle,"interop/sun/round4/simple/resMultipleFaults1.xml"));
}
//echomultiplefaults2
public void testMultiplefaults2()throws Exception{
util=new EchoMultipleFaults2ClientUtil();
retEle = client.sendMsg(util,soapAction);
- assertTrue(Compare( retEle,"/interop/sun/round4/simple/resMultipleFaults2.xml"));
+ assertTrue(Compare( retEle,"interop/sun/round4/simple/resMultipleFaults2.xml"));
}
@@ -111,7 +106,7 @@
public void testMultiplefaults3()throws Exception{
util=new EchoMultipleFaults3Clientutil();
retEle = client.sendMsg(util,soapAction);
- assertTrue(Compare( retEle,"/interop/sun/round4/simple/resMultipleFaults3.xml"));
+ assertTrue(Compare( retEle,"interop/sun/round4/simple/resMultipleFaults3.xml"));
}
@@ -119,7 +114,7 @@
public void testMultiplefaults4()throws Exception{
util=new EchoMultipleFaults4ClientUtil();
retEle = client.sendMsg(util,soapAction);
- assertTrue(Compare( retEle,"/interop/sun/round4/simple/resMultipleFaults4.xml"));
+ assertTrue(Compare( retEle,"interop/sun/round4/simple/resMultipleFaults4.xml"));
}