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 ru...@apache.org on 2005/09/30 12:54:12 UTC

svn commit: r292698 [1/4] - in /webservices/axis2/trunk/java/modules/integration: ./ itest/org/apache/axis2/interop/whitemesa/round1/ itest/org/apache/axis2/interop/whitemesa/round2/ itest/org/apache/axis2/interop/whitemesa/round2/Soap12/ src/org/apach...

Author: ruchithf
Date: Fri Sep 30 03:53:29 2005
New Revision: 292698

URL: http://svn.apache.org/viewcvs?rev=292698&view=rev
Log:
Uncommented the failing test methods and changed the modules/integration/project.properties to include only the tests that should run

Modified:
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round1/Round1InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/FrtrRound2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/GSRound2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/KSRoun2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MSRemRound2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MSaxmsRound2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MStk2Round2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MStk3Round2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/NusRound2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/PSRound2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/RWRound2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/S4rRound2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/S4s4c2Round2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/S4s4cRound2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/SLRound2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/SPJRound2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/SSRound2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/Soap12/ASPNetRound2Soap12Test.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/Soap12/GSoapRound2Soap12InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/Soap12/WMRound2Soap12InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/SqlDataRound2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/SunRound2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/VWRound2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/WFRound2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/WMRound2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/WaspRound2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/XSRound2InteropTest.java
    webservices/axis2/trunk/java/modules/integration/project.properties
    webservices/axis2/trunk/java/modules/integration/src/org/apache/axis2/interop/sun/round4/complex/EchoBlockingClient.java
    webservices/axis2/trunk/java/modules/integration/src/org/apache/axis2/interop/sun/round4/simple/EchoBlockingClient.java

Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round1/Round1InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round1/Round1InteropTest.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round1/Round1InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round1/Round1InteropTest.java Fri Sep 30 03:53:29 2005
@@ -128,34 +128,4 @@
         result = compare(retEnv, tempPath);
         assertTrue(result);
     }
-
-//    private static boolean compare(SOAPEnvelope retEnv, String filePath) throws AxisFault {
-//        boolean ok;
-//
-//        try {
-//            if (retEnv != null) {
-//                SOAPBody body = retEnv.getBody();
-//                if (!body.hasFault()) {
-//
-//                    InputStream stream = Round1InteropTest.class.getClassLoader().getResourceAsStream(filePath);
-//
-//                    OMElement firstChild = body.getFirstElement();
-//                    XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(stream);
-//                    OMXMLParserWrapper builder = new StAXSOAPModelBuilder(parser, null);
-//                    SOAPEnvelope refEnv = (SOAPEnvelope) builder.getDocumentElement();
-//                    OMElement refNode = refEnv.getBody().getFirstElement();
-//                    XMLComparator comparator = new XMLComparator();
-//                    ok = comparator.compare(firstChild, refNode);
-//                } else
-//                    return false;
-//            } else
-//                return false;
-//        } catch (XMLStreamException e) {
-//            throw new AxisFault(e);
-//        }
-//
-//
-//        return ok;
-//    }
-
 }

Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/FrtrRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/FrtrRound2InteropTest.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/FrtrRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/FrtrRound2InteropTest.java Fri Sep 30 03:53:29 2005
@@ -16,7 +16,22 @@
 
 package org.apache.axis2.interop.whitemesa.round2;
 
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.interop.whitemesa.WhiteMesaIneterop;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoBase64ClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoBooleanClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoDateClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoDecimalClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoFloatArrayClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoFloatClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoHexBinaryClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoIntegerArrayclientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoIntegerClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoStringArrayClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoStringclientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoStructArrayClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoStructClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoVoidClientUtil;
 import org.apache.axis2.interop.whitemesa.round2.util.SunRound2ClientUtil;
 import org.apache.axis2.soap.SOAPEnvelope;
 
@@ -52,225 +67,225 @@
      * Group Base
      * operation echoString
      */
-//    public void testR2BaseEchoString() throws AxisFault {
-//        url = "http://www.soapware.org/xmethodsInterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoStringclientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseStringRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoStringArray
-//     */
-//    public void testR2BaseEchoStringArray() throws AxisFault {
-//        url = "http://www.soapware.org/xmethodsInterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoStringArrayClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "SunBaseStringArrayRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoInteger
-//     */
-//    public void testR2BaseEchoInteger() throws AxisFault {
-//        url = "http://www.soapware.org/xmethodsInterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoIntegerClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseIntegerRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoIntegerArray
-//     */
-//    public void testR2BaseEchoIntegerArray() throws AxisFault  {
-//        url = "http://www.soapware.org/xmethodsInterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoIntegerArrayclientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseIntegerArrayRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoFloat
-//     */
-//    public void testR2BaseEchoFloat()  throws AxisFault {
-//        url = "http://www.soapware.org/xmethodsInterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoFloatClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseFloatRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoFloatArray
-//     */
-//    public void testR2BaseEchoFloatArray()  throws AxisFault {
-//        url = "http://www.soapware.org/xmethodsInterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoFloatArrayClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseFloatArrayRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoStruct
-//     */
-//    public void testRBaseEchoStruct() throws AxisFault  {
-//        url = "http://www.soapware.org/xmethodsInterop";
-//        soapAction = "";
-//
-//        util = new Round2EchoStructClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseStructRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoStructArray
-//     */
-//    public void testR2BaseEchoStructArray() throws AxisFault  {
-//        url = "http://www.soapware.org/xmethodsInterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoStructArrayClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseStructArrayRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoVoid
-//     */
-//    public void testR2BaseEchoVoid() throws AxisFault  {
-//        url = "http://www.soapware.org/xmethodsInterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoVoidClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseVoidRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoBase64
-//     */
-//    public void testR2BaseEchoBase64() throws AxisFault  {
-//        url = "http://www.soapware.org/xmethodsInterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoBase64ClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseBase64Res.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoBase64
-//     */
-//    public void testR2BaseEchoDate() throws AxisFault  {
-//        url = "http://www.soapware.org/xmethodsInterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoDateClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseDateRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoHexBinary
-//     */
-//    public void testR2BaseEchoHexBinary() throws AxisFault  {
-//        url = "http://www.soapware.org/xmethodsInterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoHexBinaryClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseHexBinaryRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoDecimal
-//     */
-//    public void testR2BaseEchoDecimal() throws AxisFault  {
-//        url = "http://www.soapware.org/xmethodsInterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoDecimalClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseDecimalRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoBoolean
-//     */
-//    public void testR2BaseEchoBoolean() throws AxisFault  {
-//        url = "http://www.soapware.org/xmethodsInterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoBooleanClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseBooleanRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2BaseEchoString() throws AxisFault {
+        url = "http://www.soapware.org/xmethodsInterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoStringclientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseStringRes.xml";
+        boolean results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoStringArray
+     */
+    public void testR2BaseEchoStringArray() throws AxisFault {
+        url = "http://www.soapware.org/xmethodsInterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoStringArrayClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "SunBaseStringArrayRes.xml";
+        boolean results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoInteger
+     */
+    public void testR2BaseEchoInteger() throws AxisFault {
+        url = "http://www.soapware.org/xmethodsInterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoIntegerClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseIntegerRes.xml";
+        boolean results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoIntegerArray
+     */
+    public void testR2BaseEchoIntegerArray() throws AxisFault  {
+        url = "http://www.soapware.org/xmethodsInterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoIntegerArrayclientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseIntegerArrayRes.xml";
+        boolean results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoFloat
+     */
+    public void testR2BaseEchoFloat()  throws AxisFault {
+        url = "http://www.soapware.org/xmethodsInterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoFloatClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseFloatRes.xml";
+        boolean results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoFloatArray
+     */
+    public void testR2BaseEchoFloatArray()  throws AxisFault {
+        url = "http://www.soapware.org/xmethodsInterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoFloatArrayClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseFloatArrayRes.xml";
+        boolean results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoStruct
+     */
+    public void testRBaseEchoStruct() throws AxisFault  {
+        url = "http://www.soapware.org/xmethodsInterop";
+        soapAction = "";
+
+        util = new Round2EchoStructClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseStructRes.xml";
+        boolean results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoStructArray
+     */
+    public void testR2BaseEchoStructArray() throws AxisFault  {
+        url = "http://www.soapware.org/xmethodsInterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoStructArrayClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseStructArrayRes.xml";
+        boolean results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoVoid
+     */
+    public void testR2BaseEchoVoid() throws AxisFault  {
+        url = "http://www.soapware.org/xmethodsInterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoVoidClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseVoidRes.xml";
+        boolean results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoBase64
+     */
+    public void testR2BaseEchoBase64() throws AxisFault  {
+        url = "http://www.soapware.org/xmethodsInterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoBase64ClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseBase64Res.xml";
+        boolean results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoBase64
+     */
+    public void testR2BaseEchoDate() throws AxisFault  {
+        url = "http://www.soapware.org/xmethodsInterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoDateClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseDateRes.xml";
+        boolean results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoHexBinary
+     */
+    public void testR2BaseEchoHexBinary() throws AxisFault  {
+        url = "http://www.soapware.org/xmethodsInterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoHexBinaryClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseHexBinaryRes.xml";
+        boolean results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoDecimal
+     */
+    public void testR2BaseEchoDecimal() throws AxisFault  {
+        url = "http://www.soapware.org/xmethodsInterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoDecimalClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseDecimalRes.xml";
+        boolean results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoBoolean
+     */
+    public void testR2BaseEchoBoolean() throws AxisFault  {
+        url = "http://www.soapware.org/xmethodsInterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoBooleanClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseBooleanRes.xml";
+        boolean results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
 }
 

Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/GSRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/GSRound2InteropTest.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/GSRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/GSRound2InteropTest.java Fri Sep 30 03:53:29 2005
@@ -18,7 +18,27 @@
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.interop.whitemesa.WhiteMesaIneterop;
-import org.apache.axis2.interop.whitemesa.round2.util.*;
+import org.apache.axis2.interop.whitemesa.round2.util.GroupbEcho2DStringArrayUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.GroupbEchoNestedArrayUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.GroupbEchoNestedStructUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.GroupbEchoSimpleTypesAsStructUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.GroupbEchoStructAsSimpleTypesUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.GroupcVoidUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoBase64ClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoBooleanClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoDateClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoDecimalClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoFloatArrayClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoFloatClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoHexBinaryClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoIntegerArrayclientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoIntegerClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoStringArrayClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoStringclientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoStructArrayClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoStructClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoVoidClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.SunRound2ClientUtil;
 import org.apache.axis2.soap.SOAPEnvelope;
 
 import java.io.File;
@@ -146,16 +166,16 @@
      * operation echoStruct
      */
     //todo this test fails due to axis2 client error
-//    public void testRBaseEchoStruct() throws AxisFault  {
-//        url = "http://www.cs.fsu.edu/~engelen/interop2.cgi";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoStructClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GSBaseStructRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testRBaseEchoStruct() throws AxisFault  {
+        url = "http://www.cs.fsu.edu/~engelen/interop2.cgi";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoStructClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GSBaseStructRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -179,16 +199,16 @@
      * operation echoVoid
      */
     //todo this test fails due to axis2 client error
-//    public void testR2BaseEchoVoid() throws AxisFault  {
-//        url = "http://www.cs.fsu.edu/~engelen/interop2.cgi";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoVoidClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GSBaseVoidRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2BaseEchoVoid() throws AxisFault  {
+        url = "http://www.cs.fsu.edu/~engelen/interop2.cgi";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoVoidClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GSBaseVoidRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -277,16 +297,16 @@
      * operation echoStructAsSimpleTypes
      */
 //    //todo this test fails due to axis2 client error
-//    public void testR2GBEchoStructAsSimpleTypes() throws AxisFault {
-//        url = "http://www.cs.fsu.edu/~engelen/interop2B.cgi";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupbEchoStructAsSimpleTypesUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GSGroupbStructAsSimpleTypesRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2GBEchoStructAsSimpleTypes() throws AxisFault {
+        url = "http://www.cs.fsu.edu/~engelen/interop2B.cgi";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupbEchoStructAsSimpleTypesUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GSGroupbStructAsSimpleTypesRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -294,16 +314,16 @@
      * operation echoSimpleTypesAsStruct
      */
     //todo this test fails due to axis2 client error
-//    public void testR2GBEchoSimpleTypesAsStruct() throws AxisFault {
-//        url = "http://www.cs.fsu.edu/~engelen/interop2B.cgi";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupbEchoSimpleTypesAsStructUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GSGroupbSimpletypesAsStructRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2GBEchoSimpleTypesAsStruct() throws AxisFault {
+        url = "http://www.cs.fsu.edu/~engelen/interop2B.cgi";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupbEchoSimpleTypesAsStructUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GSGroupbSimpletypesAsStructRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -327,16 +347,16 @@
      * operation echoNestedStruct
      */
     //todo this test fails due to axis2 client error
-//    public void testR2GBEchoNestedStruct() throws AxisFault {
-//        url = "http://www.cs.fsu.edu/~engelen/interop2B.cgi";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupbEchoNestedStructUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GSGroupbNestedStructRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2GBEchoNestedStruct() throws AxisFault {
+        url = "http://www.cs.fsu.edu/~engelen/interop2B.cgi";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupbEchoNestedStructUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GSGroupbNestedStructRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -344,16 +364,16 @@
      * operation echoNestedArray
      */
     //todo this test fails due to axis2 client error
-//    public void testR2GBEchoNestedArray() throws AxisFault {
-//        url = "http://www.cs.fsu.edu/~engelen/interop2B.cgi";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupbEchoNestedArrayUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GSGroupbNestedArrayRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2GBEchoNestedArray() throws AxisFault {
+        url = "http://www.cs.fsu.edu/~engelen/interop2B.cgi";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupbEchoNestedArrayUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GSGroupbNestedArrayRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
 
     /**
@@ -361,45 +381,17 @@
      * Group C
      * operation echoVoid
      */
-//    //todo this test fails due to axis2 client error
-//    public void testR2GCEchoVoid() throws AxisFault {
-//        url = "http://www.cs.fsu.edu/~engelen/interop2C.cgi";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupcVoidUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GSGroupcVoidRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-
-
-//    private static boolean compare(SOAPEnvelope retEnv, String filePath) throws AxisFault {
-//
-//        boolean ok = false;
-//        try {
-//            if (retEnv != null) {
-//                SOAPBody body = retEnv.getBody();
-//                if (!body.hasFault()) {
-//                    //OMElement firstChild = (OMElement) body.getFirstElement();
-//
-//                    InputStream stream = GSRound2InteropTest.class.getClassLoader().getResourceAsStream(filePath);
-//
-//                    XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(stream);
-//                    OMXMLParserWrapper builder = new StAXSOAPModelBuilder(parser, null);
-//                    SOAPEnvelope refEnv = (SOAPEnvelope) builder.getDocumentElement();
-//                    //OMElement refNode = (OMElement) resEnv.getBody().getFirstElement();
-//                    XMLComparator comparator = new XMLComparator();
-//                    ok = comparator.compare(retEnv, refEnv);
-//                } else
-//                    return false;
-//            } else
-//                return false;
-//
-//        } catch (Exception e) {
-//            throw new AxisFault(e);
-//        }
-//        return ok;
-//    }
+    //todo this test fails due to axis2 client error
+    public void testR2GCEchoVoid() throws AxisFault {
+        url = "http://www.cs.fsu.edu/~engelen/interop2C.cgi";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupcVoidUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GSGroupcVoidRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
 }
 

Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/KSRoun2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/KSRoun2InteropTest.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/KSRoun2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/KSRoun2InteropTest.java Fri Sep 30 03:53:29 2005
@@ -16,7 +16,22 @@
 
 package org.apache.axis2.interop.whitemesa.round2;
 
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.interop.whitemesa.WhiteMesaIneterop;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoBase64ClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoBooleanClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoDateClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoDecimalClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoFloatArrayClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoFloatClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoHexBinaryClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoIntegerArrayclientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoIntegerClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoStringArrayClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoStringclientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoStructArrayClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoStructClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoVoidClientUtil;
 import org.apache.axis2.interop.whitemesa.round2.util.SunRound2ClientUtil;
 import org.apache.axis2.soap.SOAPEnvelope;
 
@@ -40,7 +55,8 @@
     String resFilePath = "interop/whitemesa/round2/";
     String tempPath = "";
     SunRound2ClientUtil util;
-
+    boolean results;
+    
     public void testChack(){
         //just addding a test case , since all the tase casea are fail
     }
@@ -50,253 +66,227 @@
      * Group Base
      * operation echoString
      */
-//    public void testR2BaseEchoString() throws AxisFault {
-//        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoStringclientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseStringRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoStringArray
-//     */
-//    public void testR2BaseEchoStringArray() throws AxisFault {
-//        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoStringArrayClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "SunBaseStringArrayRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoInteger
-//     */
-//    public void testR2BaseEchoInteger() throws AxisFault {
-//        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoIntegerClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseIntegerRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoIntegerArray
-//     */
-//    public void testR2BaseEchoIntegerArray() throws AxisFault  {
-//        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoIntegerArrayclientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseIntegerArrayRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoFloat
-//     */
-//    public void testR2BaseEchoFloat()  throws AxisFault {
-//        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoFloatClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseFloatRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoFloatArray
-//     */
-//    public void testR2BaseEchoFloatArray()  throws AxisFault {
-//        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoFloatArrayClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseFloatArrayRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoStruct
-//     */
-//    public void testRBaseEchoStruct() throws AxisFault  {
-//        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
-//        soapAction = "";
-//
-//        util = new Round2EchoStructClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseStructRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoStructArray
-//     */
-//    public void testR2BaseEchoStructArray() throws AxisFault  {
-//        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoStructArrayClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseStructArrayRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoVoid
-//     */
-//    public void testR2BaseEchoVoid() throws AxisFault  {
-//        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoVoidClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseVoidRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoBase64
-//     */
-//    public void testR2BaseEchoBase64() throws AxisFault  {
-//        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoBase64ClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseBase64Res.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoBase64
-//     */
-//    public void testR2BaseEchoDate() throws AxisFault  {
-//        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoDateClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseDateRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoHexBinary
-//     */
-//    public void testR2BaseEchoHexBinary() throws AxisFault  {
-//        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoHexBinaryClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseHexBinaryRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoDecimal
-//     */
-//    public void testR2BaseEchoDecimal() throws AxisFault  {
-//        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoDecimalClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseDecimalRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group Base
-//     * operation echoBoolean
-//     */
-//    public void testR2BaseEchoBoolean() throws AxisFault  {
-//        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoBooleanClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseBooleanRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-
-//    private static boolean compare(SOAPEnvelope retEnv, String filePath) throws AxisFault {
-//
-//        boolean ok = false;
-//        try {
-//            if (retEnv != null) {
-//                SOAPBody body = retEnv.getBody();
-//                if (!body.hasFault()) {
-//                    //OMElement firstChild = (OMElement) body.getFirstElement();
-//
-//                    InputStream stream = KSRoun2InteropTest.class.getClassLoader().getResourceAsStream(filePath);
-//
-//                    XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(stream);
-//                    OMXMLParserWrapper builder = new StAXSOAPModelBuilder(parser, null);
-//                    SOAPEnvelope refEnv = (SOAPEnvelope) builder.getDocumentElement();
-//                    //OMElement refNode = (OMElement) resEnv.getBody().getFirstElement();
-//                    XMLComparator comparator = new XMLComparator();
-//                    ok = comparator.compare(retEnv, refEnv);
-//                } else
-//                    return false;
-//            } else
-//                return false;
-//
-//        } catch (Exception e) {
-//            throw new AxisFault(e);
-//        }
-//        return ok;
-//    }
+    public void testR2BaseEchoString() throws AxisFault {
+        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoStringclientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseStringRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoStringArray
+     */
+    public void testR2BaseEchoStringArray() throws AxisFault {
+        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoStringArrayClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "SunBaseStringArrayRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoInteger
+     */
+    public void testR2BaseEchoInteger() throws AxisFault {
+        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoIntegerClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseIntegerRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoIntegerArray
+     */
+    public void testR2BaseEchoIntegerArray() throws AxisFault  {
+        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoIntegerArrayclientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseIntegerArrayRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoFloat
+     */
+    public void testR2BaseEchoFloat()  throws AxisFault {
+        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoFloatClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseFloatRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoFloatArray
+     */
+    public void testR2BaseEchoFloatArray()  throws AxisFault {
+        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoFloatArrayClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseFloatArrayRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoStruct
+     */
+    public void testRBaseEchoStruct() throws AxisFault  {
+        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
+        soapAction = "";
+
+        util = new Round2EchoStructClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseStructRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoStructArray
+     */
+    public void testR2BaseEchoStructArray() throws AxisFault  {
+        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoStructArrayClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseStructArrayRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoVoid
+     */
+    public void testR2BaseEchoVoid() throws AxisFault  {
+        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoVoidClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseVoidRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoBase64
+     */
+    public void testR2BaseEchoBase64() throws AxisFault  {
+        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoBase64ClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseBase64Res.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoBase64
+     */
+    public void testR2BaseEchoDate() throws AxisFault  {
+        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoDateClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseDateRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoHexBinary
+     */
+    public void testR2BaseEchoHexBinary() throws AxisFault  {
+        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoHexBinaryClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseHexBinaryRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoDecimal
+     */
+    public void testR2BaseEchoDecimal() throws AxisFault  {
+        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoDecimalClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseDecimalRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group Base
+     * operation echoBoolean
+     */
+    public void testR2BaseEchoBoolean() throws AxisFault  {
+        url = "http://kissen.cs.uni-dortmund.de:8080/ksoapinterop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoBooleanClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseBooleanRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+
+
 }
 

Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MSRemRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MSRemRound2InteropTest.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MSRemRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MSRemRound2InteropTest.java Fri Sep 30 03:53:29 2005
@@ -146,16 +146,16 @@
      * operation echoStruct
      */
     //todo test failed!!!
-//    public void testRBaseEchoStruct() throws AxisFault  {
-//        url = "http://www.mssoapinterop.org:80/Remoting/ServiceA.soap";
-//        soapAction = "";
-//
-//        util = new Round2EchoStructClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "MSRemBaseStructRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testRBaseEchoStruct() throws AxisFault  {
+        url = "http://www.mssoapinterop.org:80/Remoting/ServiceA.soap";
+        soapAction = "";
+
+        util = new Round2EchoStructClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "MSRemBaseStructRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -228,16 +228,16 @@
      * operation echoHexBinary
      */
     //todo test failed!!!
-//    public void testR2BaseEchoHexBinary() throws AxisFault  {
-//        url = "http://www.mssoapinterop.org:80/Remoting/ServiceA.soap";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoHexBinaryClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "MSRemBaseHexBinaryRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2BaseEchoHexBinary() throws AxisFault  {
+        url = "http://www.mssoapinterop.org:80/Remoting/ServiceA.soap";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoHexBinaryClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "MSRemBaseHexBinaryRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -351,33 +351,5 @@
         assertTrue(results);
     }
 
-
-//    private static boolean compare(SOAPEnvelope retEnv, String filePath) throws AxisFault {
-//
-//        boolean ok = false;
-//        try {
-//            if (retEnv != null) {
-//                SOAPBody body = retEnv.getBody();
-//                if (!body.hasFault()) {
-//                    //OMElement firstChild = (OMElement) body.getFirstElement();
-//
-//                    InputStream stream = MSRemRound2InteropTest.class.getClassLoader().getResourceAsStream(filePath);
-//
-//                    XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(stream);
-//                    OMXMLParserWrapper builder = new StAXSOAPModelBuilder(parser, null);
-//                    SOAPEnvelope refEnv = (SOAPEnvelope) builder.getDocumentElement();
-//                    //OMElement refNode = (OMElement) resEnv.getBody().getFirstElement();
-//                    XMLComparator comparator = new XMLComparator();
-//                    ok = comparator.compare(retEnv, refEnv);
-//                } else
-//                    return false;
-//            } else
-//                return false;
-//
-//        } catch (Exception e) {
-//            throw new AxisFault(e);
-//        }
-//        return ok;
-//    }
 }
 

Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MSaxmsRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MSaxmsRound2InteropTest.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MSaxmsRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MSaxmsRound2InteropTest.java Fri Sep 30 03:53:29 2005
@@ -18,7 +18,27 @@
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.interop.whitemesa.WhiteMesaIneterop;
-import org.apache.axis2.interop.whitemesa.round2.util.*;
+import org.apache.axis2.interop.whitemesa.round2.util.GroupbEchoNestedArrayUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.GroupbEchoNestedStructUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.GroupbEchoSimpleTypesAsStructUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.GroupbEchoStructAsSimpleTypesUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.GroupcVoidUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.R2MSaxms2DStringArrayUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoBase64ClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoBooleanClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoDateClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoDecimalClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoFloatArrayClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoFloatClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoHexBinaryClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoIntegerArrayclientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoIntegerClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoStringArrayClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoStringclientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoStructArrayClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoStructClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.Round2EchoVoidClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.SunRound2ClientUtil;
 import org.apache.axis2.soap.SOAPEnvelope;
 
 import java.io.File;
@@ -355,44 +375,18 @@
      * operation echoVoid
      */
      //todo This test failed, doesn't echo header
-//    public void testR2GCEchoVoid() throws AxisFault {
-//        url = "http://www.mssoapinterop.org/asmx/header.asmx";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupcVoidUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "MSaxmsGroupcVoidRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-
-
-//    private static boolean compare(SOAPEnvelope retEnv, String filePath) throws AxisFault {
-//
-//        boolean ok = false;
-//        try {
-//            if (retEnv != null) {
-//                SOAPBody body = retEnv.getBody();
-//                if (!body.hasFault()) {
-//                    //OMElement firstChild = (OMElement) body.getFirstElement();
-//
-//                    InputStream stream = MSaxmsRound2InteropTest.class.getClassLoader().getResourceAsStream(filePath);
-//
-//                    XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(stream);
-//                    OMXMLParserWrapper builder = new StAXSOAPModelBuilder(parser, null);
-//                    SOAPEnvelope refEnv = (SOAPEnvelope) builder.getDocumentElement();
-//                    //OMElement refNode = (OMElement) resEnv.getBody().getFirstElement();
-//                    XMLComparator comparator = new XMLComparator();
-//                    ok = comparator.compare(retEnv, refEnv);
-//                } else
-//                    return false;
-//            } else
-//                return false;
-//
-//        } catch (Exception e) {
-//            throw new AxisFault(e);
-//        }
-//        return ok;
-//    }
+    public void testR2GCEchoVoid() throws AxisFault {
+        url = "http://www.mssoapinterop.org/asmx/header.asmx";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupcVoidUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "MSaxmsGroupcVoidRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+
+
 }
 

Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MStk2Round2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MStk2Round2InteropTest.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MStk2Round2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MStk2Round2InteropTest.java Fri Sep 30 03:53:29 2005
@@ -227,33 +227,5 @@
         results = compare(retEnv, tempPath);
         assertTrue(results);
     }
-
-//    private static boolean compare(SOAPEnvelope retEnv, String filePath) throws AxisFault {
-//
-//        boolean ok = false;
-//        try {
-//            if (retEnv != null) {
-//                SOAPBody body = retEnv.getBody();
-//                if (!body.hasFault()) {
-//                    //OMElement firstChild = (OMElement) body.getFirstElement();
-//
-//                    InputStream stream = MStk2Round2InteropTest.class.getClassLoader().getResourceAsStream(filePath);
-//
-//                    XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(stream);
-//                    OMXMLParserWrapper builder = new StAXSOAPModelBuilder(parser, null);
-//                    SOAPEnvelope refEnv = (SOAPEnvelope) builder.getDocumentElement();
-//                    //OMElement refNode = (OMElement) resEnv.getBody().getFirstElement();
-//                    XMLComparator comparator = new XMLComparator();
-//                    ok = comparator.compare(retEnv, refEnv);
-//                } else
-//                    return false;
-//            } else
-//                return false;
-//
-//        } catch (Exception e) {
-//            throw new AxisFault(e);
-//        }
-//        return ok;
-//    }
 }
 

Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MStk3Round2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MStk3Round2InteropTest.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MStk3Round2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/MStk3Round2InteropTest.java Fri Sep 30 03:53:29 2005
@@ -262,16 +262,16 @@
      * operation echoBoolean
      */
     //todo test failed!!!
-//    public void testR2BaseEchoBoolean() throws AxisFault  {
-//        url = "http://mssoapinterop.org/stkV3/Interop.wsdle";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoBooleanClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "MStk3BaseBooleanRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2BaseEchoBoolean() throws AxisFault  {
+        url = "http://mssoapinterop.org/stkV3/Interop.wsdle";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoBooleanClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "MStk3BaseBooleanRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -472,16 +472,16 @@
      * operation echoDecimal
      */
     //todo test failed!!!
-//    public void testR2BaseTypedEchoDecimal() throws AxisFault  {
-//        url = "http://mssoapinterop.org/stkV3/InteropTyped.wsdle";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoDecimalClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "MStk3BaseTypedDecimalRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2BaseTypedEchoDecimal() throws AxisFault  {
+        url = "http://mssoapinterop.org/stkV3/InteropTyped.wsdle";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoDecimalClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "MStk3BaseTypedDecimalRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -489,16 +489,16 @@
      * operation echoBoolean
      */
     //todo test failed!!!
-//    public void testR2BaseTypedEchoBoolean() throws AxisFault  {
-//        url = "http://mssoapinterop.org/stkV3/InteropTyped.wsdle";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoBooleanClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "MStk3BaseTypedBooleanRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2BaseTypedEchoBoolean() throws AxisFault  {
+        url = "http://mssoapinterop.org/stkV3/InteropTyped.wsdle";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoBooleanClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "MStk3BaseTypedBooleanRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -676,33 +676,5 @@
         assertTrue(results);
     }
 
-//
-//    private static boolean compare(SOAPEnvelope retEnv, String filePath) throws AxisFault {
-//
-//        boolean ok = false;
-//        try {
-//            if (retEnv != null) {
-//                SOAPBody body = retEnv.getBody();
-//                if (!body.hasFault()) {
-//                    //OMElement firstChild = (OMElement) body.getFirstElement();
-//
-//                    InputStream stream = MStk3Round2InteropTest.class.getClassLoader().getResourceAsStream(filePath);
-//
-//                    XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(stream);
-//                    OMXMLParserWrapper builder = new StAXSOAPModelBuilder(parser, null);
-//                    SOAPEnvelope refEnv = (SOAPEnvelope) builder.getDocumentElement();
-//                    //OMElement refNode = (OMElement) resEnv.getBody().getFirstElement();
-//                    XMLComparator comparator = new XMLComparator();
-//                    ok = comparator.compare(retEnv, refEnv);
-//                } else
-//                    return false;
-//            } else
-//                return false;
-//
-//        } catch (Exception e) {
-//            throw new AxisFault(e);
-//        }
-//        return ok;
-//    }
 }
 

Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/NusRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/NusRound2InteropTest.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/NusRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/NusRound2InteropTest.java Fri Sep 30 03:53:29 2005
@@ -274,16 +274,16 @@
      * operation echoStructAsSimpleTypes
      */
     //todo Test failed !!!
-//    public void testR2GBEchoStructAsSimpleTypes() throws AxisFault {
-//        url = "http://dietrich.ganx4.com/nusoap/testbed/round2_groupb_server.php";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupbEchoStructAsSimpleTypesUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "NusGroupbStructAsSimpleTypesRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2GBEchoStructAsSimpleTypes() throws AxisFault {
+        url = "http://dietrich.ganx4.com/nusoap/testbed/round2_groupb_server.php";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupbEchoStructAsSimpleTypesUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "NusGroupbStructAsSimpleTypesRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -291,16 +291,16 @@
      * operation echoSimpleTypesAsStruct
      */
     //todo Test failed !!!
-//    public void testR2GBEchoSimpleTypesAsStruct() throws AxisFault {
-//        url = "http://dietrich.ganx4.com/nusoap/testbed/round2_groupb_server.php";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupbEchoSimpleTypesAsStructUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "NusGroupbSimpletypesAsStructRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2GBEchoSimpleTypesAsStruct() throws AxisFault {
+        url = "http://dietrich.ganx4.com/nusoap/testbed/round2_groupb_server.php";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupbEchoSimpleTypesAsStructUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "NusGroupbSimpletypesAsStructRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -308,16 +308,16 @@
      * operation echo2DStringArray
      */
     //todo test failed !!!
-//    public void testR2GBEcho2DStringArray() throws AxisFault {
-//        url = "http://dietrich.ganx4.com/nusoap/testbed/round2_groupb_server.php";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupbEcho2DStringArrayUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "NusGroupb2DStringArrayRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2GBEcho2DStringArray() throws AxisFault {
+        url = "http://dietrich.ganx4.com/nusoap/testbed/round2_groupb_server.php";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupbEcho2DStringArrayUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "NusGroupb2DStringArrayRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -325,16 +325,16 @@
      * operation echoNestedStruct
      */
     //todo test failed !!!
-//    public void testR2GBEchoNestedStruct() throws AxisFault {
-//        url = "http://dietrich.ganx4.com/nusoap/testbed/round2_groupb_server.php";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupbEchoNestedStructUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "NusGroupbNestedStructRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2GBEchoNestedStruct() throws AxisFault {
+        url = "http://dietrich.ganx4.com/nusoap/testbed/round2_groupb_server.php";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupbEchoNestedStructUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "NusGroupbNestedStructRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -342,44 +342,16 @@
      * operation echoNestedArray
      */
     //todo Test failed !!!
-//    public void testR2GBEchoNestedArray() throws AxisFault {
-//        url = "http://dietrich.ganx4.com/nusoap/testbed/round2_groupb_server.php";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupbEchoNestedArrayUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "NusGroupbNestedArrayRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-
-
-//    private static boolean compare(SOAPEnvelope retEnv, String filePath) throws AxisFault {
-//
-//        boolean ok = false;
-//        try {
-//            if (retEnv != null) {
-//                SOAPBody body = retEnv.getBody();
-//                if (!body.hasFault()) {
-//                    //OMElement firstChild = (OMElement) body.getFirstElement();
-//
-//                    InputStream stream = NusRound2InteropTest.class.getClassLoader().getResourceAsStream(filePath);
-//
-//                    XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(stream);
-//                    OMXMLParserWrapper builder = new StAXSOAPModelBuilder(parser, null);
-//                    SOAPEnvelope refEnv = (SOAPEnvelope) builder.getDocumentElement();
-//                    //OMElement refNode = (OMElement) resEnv.getBody().getFirstElement();
-//                    XMLComparator comparator = new XMLComparator();
-//                    ok = comparator.compare(retEnv, refEnv);
-//                } else
-//                    return false;
-//            } else
-//                return false;
-//
-//        } catch (Exception e) {
-//            throw new AxisFault(e);
-//        }
-//        return ok;
-//    }
+    public void testR2GBEchoNestedArray() throws AxisFault {
+        url = "http://dietrich.ganx4.com/nusoap/testbed/round2_groupb_server.php";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupbEchoNestedArrayUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "NusGroupbNestedArrayRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+    
 }