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 [4/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...

Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/SSRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/SSRound2InteropTest.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/SSRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/SSRound2InteropTest.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;
 
@@ -41,7 +56,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
         }
@@ -52,253 +68,226 @@
      * Group Base
      * operation echoString
      */
-//    public void testR2BaseEchoString() throws AxisFault {
-//        url = "http://explorer.ne.mediaone.net/app/interop/interop";
-//        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://explorer.ne.mediaone.net/app/interop/interop";
-//        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://explorer.ne.mediaone.net/app/interop/interop";
-//        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://explorer.ne.mediaone.net/app/interop/interop";
-//        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://explorer.ne.mediaone.net/app/interop/interop";
-//        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://explorer.ne.mediaone.net/app/interop/interop";
-//        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://explorer.ne.mediaone.net/app/interop/interop";
-//        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://explorer.ne.mediaone.net/app/interop/interop";
-//        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://explorer.ne.mediaone.net/app/interop/interop";
-//        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://explorer.ne.mediaone.net/app/interop/interop";
-//        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://explorer.ne.mediaone.net/app/interop/interop";
-//        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://explorer.ne.mediaone.net/app/interop/interop";
-//        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://explorer.ne.mediaone.net/app/interop/interop";
-//        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://explorer.ne.mediaone.net/app/interop/interop";
-//        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 = SSRound2InteropTest.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://explorer.ne.mediaone.net/app/interop/interop";
+        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://explorer.ne.mediaone.net/app/interop/interop";
+        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://explorer.ne.mediaone.net/app/interop/interop";
+        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://explorer.ne.mediaone.net/app/interop/interop";
+        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://explorer.ne.mediaone.net/app/interop/interop";
+        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://explorer.ne.mediaone.net/app/interop/interop";
+        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://explorer.ne.mediaone.net/app/interop/interop";
+        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://explorer.ne.mediaone.net/app/interop/interop";
+        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://explorer.ne.mediaone.net/app/interop/interop";
+        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://explorer.ne.mediaone.net/app/interop/interop";
+        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://explorer.ne.mediaone.net/app/interop/interop";
+        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://explorer.ne.mediaone.net/app/interop/interop";
+        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://explorer.ne.mediaone.net/app/interop/interop";
+        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://explorer.ne.mediaone.net/app/interop/interop";
+        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/Soap12/ASPNetRound2Soap12Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/Soap12/ASPNetRound2Soap12Test.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/Soap12/ASPNetRound2Soap12Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/Soap12/ASPNetRound2Soap12Test.java Fri Sep 30 03:53:29 2005
@@ -359,41 +359,16 @@
      * operation echoVoid
      */
     //todo THis test failed, only the body returned without header
-//    public void testR2GCEchoVoid() throws AxisFault {
-//        url = "http://www.mssoapinterop.org/asmx/header.asmx";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupcSoap12VoidUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GroupcVoidRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2GCEchoVoid() throws AxisFault {
+        url = "http://www.mssoapinterop.org/asmx/header.asmx";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupcSoap12VoidUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GroupcVoidRes.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 = GSoapRound2Soap12InteropTest.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/Soap12/GSoapRound2Soap12InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/Soap12/GSoapRound2Soap12InteropTest.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/Soap12/GSoapRound2Soap12InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/Soap12/GSoapRound2Soap12InteropTest.java Fri Sep 30 03:53:29 2005
@@ -20,7 +20,25 @@
 import org.apache.axis2.interop.whitemesa.WhiteMesaIneterop;
 import org.apache.axis2.interop.whitemesa.round2.SunRound2Client;
 import org.apache.axis2.interop.whitemesa.round2.util.SunRound2ClientUtil;
-import org.apache.axis2.interop.whitemesa.round2.util.soap12.*;
+import org.apache.axis2.interop.whitemesa.round2.util.soap12.GroupbSoap12Echo2DStringArrayUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.soap12.GroupbSoap12EchoNestedArrayUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.soap12.GroupbSoap12EchoNestedStructUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.soap12.GroupbSoap12EchoSimpleTypesAsStructUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.soap12.GroupbSoap12EchoStructAsSimpleTypesUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.soap12.Round2SOAP12EchoIntegerArrayclientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.soap12.Round2Soap12EchoBase64ClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.soap12.Round2Soap12EchoBooleanClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.soap12.Round2Soap12EchoDateClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.soap12.Round2Soap12EchoDecimalClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.soap12.Round2Soap12EchoFloatArrayClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.soap12.Round2Soap12EchoFloatClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.soap12.Round2Soap12EchoHexBinaryUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.soap12.Round2Soap12EchoStructArrayClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.soap12.Round2Soap12EchoStructClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.soap12.Round2Soap12EchoVoidClientUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.soap12.Round2Soap12IntegerUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.soap12.Round2Soap12StringArrayUtil;
+import org.apache.axis2.interop.whitemesa.round2.util.soap12.Round2Soap12StringUtil;
 import org.apache.axis2.soap.SOAPEnvelope;
 
 import java.io.File;
@@ -149,16 +167,16 @@
      * operation echoStruct
      */
     //todo : This test fails due to Axis2 Client Error
-//    public void testRBaseEchoStruct() throws AxisFault  {
-//        url = "http://websrv.cs.fsu.edu/~engelen/interop2.cgi";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2Soap12EchoStructClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GSoapR2_S12_StructRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testRBaseEchoStruct() throws AxisFault  {
+        url = "http://websrv.cs.fsu.edu/~engelen/interop2.cgi";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2Soap12EchoStructClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GSoapR2_S12_StructRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -182,16 +200,16 @@
      * operation echoVoid
      */
     //todo : This test fails due to Axis2 Client Error
-//    public void testR2BaseEchoVoid() throws AxisFault  {
-//        url = "http://websrv.cs.fsu.edu/~engelen/interop2.cgi";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2Soap12EchoVoidClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GSoapR2_S12_VoidRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2BaseEchoVoid() throws AxisFault  {
+        url = "http://websrv.cs.fsu.edu/~engelen/interop2.cgi";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2Soap12EchoVoidClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GSoapR2_S12_VoidRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -280,33 +298,33 @@
      * operation echoStructAsSimpleTypes
      */
     //todo : This test fails due to Axis2 Client Error
-//    public void testR2GBEchoStructAsSimpleTypes() throws AxisFault {
-//        url = "http://websrv.cs.fsu.edu/~engelen/interop2B.cgi";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupbSoap12EchoStructAsSimpleTypesUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GSoapR2Gb_S12_StructAsSimpleTypesRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2GBEchoStructAsSimpleTypes() throws AxisFault {
+        url = "http://websrv.cs.fsu.edu/~engelen/interop2B.cgi";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupbSoap12EchoStructAsSimpleTypesUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GSoapR2Gb_S12_StructAsSimpleTypesRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
      * Group B
      * operation echoSimpleTypesAsStruct
      */
-//    //todo : This test fails due to Axis2 Client Error
-//    public void testR2GBEchoSimpleTypesAsStruct() throws AxisFault {
-//        url = "http://websrv.cs.fsu.edu/~engelen/interop2B.cgi";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupbSoap12EchoSimpleTypesAsStructUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GSoapR2Gb_S12_SimpleTypesAsStructRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    //todo : This test fails due to Axis2 Client Error
+    public void testR2GBEchoSimpleTypesAsStruct() throws AxisFault {
+        url = "http://websrv.cs.fsu.edu/~engelen/interop2B.cgi";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupbSoap12EchoSimpleTypesAsStructUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GSoapR2Gb_S12_SimpleTypesAsStructRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -330,16 +348,16 @@
      * operation echoNestedStruct
      */
     //todo : This test fails due to Axis2 Client Error
-//    public void testR2GBEchoNestedStruct() throws AxisFault {
-//        url = "http://websrv.cs.fsu.edu/~engelen/interop2B.cgi";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupbSoap12EchoNestedStructUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GSoapR2Gb_S12_NestedStructRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2GBEchoNestedStruct() throws AxisFault {
+        url = "http://websrv.cs.fsu.edu/~engelen/interop2B.cgi";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupbSoap12EchoNestedStructUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GSoapR2Gb_S12_NestedStructRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -347,22 +365,24 @@
      * operation echoNestedArray
      */
     //todo : This test fails due to Axis2 Client Error
-//    public void testR2GBEchoNestedArray() throws AxisFault {
-//        url = "http://websrv.cs.fsu.edu/~engelen/interop2B.cgi";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupbSoap12EchoNestedArrayUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GSoapR2Gb_S12_NestedArrayRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2GBEchoNestedArray() throws AxisFault {
+        url = "http://websrv.cs.fsu.edu/~engelen/interop2B.cgi";
+        soapAction = "http://soapinterop.org/";
 
-    /**
-     * Round2
-     * Group C
-     * operation echoVoid
-     */
+        util = new GroupbSoap12EchoNestedArrayUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GSoapR2Gb_S12_NestedArrayRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    
+// Cannot uncomment this : GSGroupcSoap12VoidUtil is not available
+//    /**
+//     * Round2
+//     * Group C
+//     * operation echoVoid
+//     */
 //   //todo : This test fails due to Axis2 Client Error
 //    public void testR2GCEchoVoid() throws AxisFault {
 //        url = "http://websrv.cs.fsu.edu/~engelen/interop2C.cgi";
@@ -375,30 +395,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 = GSoapRound2Soap12InteropTest.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/Soap12/WMRound2Soap12InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/Soap12/WMRound2Soap12InteropTest.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/Soap12/WMRound2Soap12InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/Soap12/WMRound2Soap12InteropTest.java Fri Sep 30 03:53:29 2005
@@ -542,31 +542,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 = GSoapRound2Soap12InteropTest.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/SqlDataRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/SqlDataRound2InteropTest.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/SqlDataRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/SqlDataRound2InteropTest.java Fri Sep 30 03:53:29 2005
@@ -542,32 +542,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 = SqlDataRound2InteropTest.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/SunRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/SunRound2InteropTest.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/SunRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/SunRound2InteropTest.java Fri Sep 30 03:53:29 2005
@@ -541,32 +541,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 = SunRound2InteropTest.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/VWRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/VWRound2InteropTest.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/VWRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/VWRound2InteropTest.java Fri Sep 30 03:53:29 2005
@@ -16,7 +16,27 @@
 
 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.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.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;
 
@@ -42,7 +62,7 @@
     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
     }
@@ -53,333 +73,305 @@
      * Group Base
      * operation echoString
      */
-//    public void testR2BaseEchoString() throws AxisFault {
-//        url = "http://www.cincomsmalltalk.com/soap/interop";              //www.cincomsmalltalk.com
-//        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.cincomsmalltalk.com/soap/interop";
-//        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.cincomsmalltalk.com/soap/interop";
-//        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.cincomsmalltalk.com/soap/interop";
-//        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.cincomsmalltalk.com/soap/interop";
-//        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.cincomsmalltalk.com/soap/interop";
-//        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.cincomsmalltalk.com/soap/interop";
-//        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.cincomsmalltalk.com/soap/interop";
-//        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.cincomsmalltalk.com/soap/interop";
-//        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.cincomsmalltalk.com/soap/interop";
-//        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.cincomsmalltalk.com/soap/interop";
-//        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.cincomsmalltalk.com/soap/interop";
-//        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.cincomsmalltalk.com/soap/interop";
-//        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.cincomsmalltalk.com/soap/interop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoBooleanClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunBaseBooleanRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group B
-//     * operation echoStructAsSimpleTypes
-//     */
-//    public void testR2GBEchoStructAsSimpleTypes() throws AxisFault {
-//        url = "http://www.cincomsmalltalk.com/r2groupb/interop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupbEchoStructAsSimpleTypesUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunGroupbStructAsSimpleTypesRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group B
-//     * operation echoSimpleTypesAsStruct
-//     */
-//    public void testR2GBEchoSimpleTypesAsStruct() throws AxisFault {
-//        url = "http://www.cincomsmalltalk.com/r2groupb/interop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupbEchoSimpleTypesAsStructUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunGroupbSimpletypesAsStructRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group B
-//     * operation echo2DStringArray
-//     */
-//    public void testR2GBEcho2DStringArray() throws AxisFault {
-//        url = "http://www.cincomsmalltalk.com/r2groupb/interop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupbEcho2DStringArrayUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunGroupb2DStringArrayRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group B
-//     * operation echoNestedStruct
-//     */
-//    public void testR2GBEchoNestedStruct() throws AxisFault {
-//        url = "http://www.cincomsmalltalk.com/r2groupb/interop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupbEchoNestedStructUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunGroupbNestedStructRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group B
-//     * operation echoNestedArray
-//     */
-//    public void testR2GBEchoNestedArray() throws AxisFault {
-//        url = "http://www.cincomsmalltalk.com/r2groupb/interop";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupbEchoNestedArrayUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "sunGroupbNestedArrayRes.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 = VWRound2InteropTest.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://www.cincomsmalltalk.com/soap/interop";              //www.cincomsmalltalk.com
+        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.cincomsmalltalk.com/soap/interop";
+        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.cincomsmalltalk.com/soap/interop";
+        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.cincomsmalltalk.com/soap/interop";
+        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.cincomsmalltalk.com/soap/interop";
+        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.cincomsmalltalk.com/soap/interop";
+        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.cincomsmalltalk.com/soap/interop";
+        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.cincomsmalltalk.com/soap/interop";
+        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.cincomsmalltalk.com/soap/interop";
+        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.cincomsmalltalk.com/soap/interop";
+        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.cincomsmalltalk.com/soap/interop";
+        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.cincomsmalltalk.com/soap/interop";
+        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.cincomsmalltalk.com/soap/interop";
+        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.cincomsmalltalk.com/soap/interop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoBooleanClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunBaseBooleanRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group B
+     * operation echoStructAsSimpleTypes
+     */
+    public void testR2GBEchoStructAsSimpleTypes() throws AxisFault {
+        url = "http://www.cincomsmalltalk.com/r2groupb/interop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupbEchoStructAsSimpleTypesUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunGroupbStructAsSimpleTypesRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group B
+     * operation echoSimpleTypesAsStruct
+     */
+    public void testR2GBEchoSimpleTypesAsStruct() throws AxisFault {
+        url = "http://www.cincomsmalltalk.com/r2groupb/interop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupbEchoSimpleTypesAsStructUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunGroupbSimpletypesAsStructRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group B
+     * operation echo2DStringArray
+     */
+    public void testR2GBEcho2DStringArray() throws AxisFault {
+        url = "http://www.cincomsmalltalk.com/r2groupb/interop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupbEcho2DStringArrayUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunGroupb2DStringArrayRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group B
+     * operation echoNestedStruct
+     */
+    public void testR2GBEchoNestedStruct() throws AxisFault {
+        url = "http://www.cincomsmalltalk.com/r2groupb/interop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupbEchoNestedStructUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunGroupbNestedStructRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group B
+     * operation echoNestedArray
+     */
+    public void testR2GBEchoNestedArray() throws AxisFault {
+        url = "http://www.cincomsmalltalk.com/r2groupb/interop";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupbEchoNestedArrayUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "sunGroupbNestedArrayRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
 }
 

Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/WFRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/WFRound2InteropTest.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/WFRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/WFRound2InteropTest.java Fri Sep 30 03:53:29 2005
@@ -305,16 +305,16 @@
      * operation echo2DStringArray
      */
     //todo Test Failed !!!
-//    public void testR2GBEcho2DStringArray() throws AxisFault {
-//        url = "http://www.wingfoot.com/servlet/wserver";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupbEcho2DStringArrayUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "WFGroupb2DStringArrayRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2GBEcho2DStringArray() throws AxisFault {
+        url = "http://www.wingfoot.com/servlet/wserver";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupbEcho2DStringArrayUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "WFGroupb2DStringArrayRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -348,33 +348,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 = WFRound2InteropTest.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/WMRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/WMRound2InteropTest.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/WMRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/WMRound2InteropTest.java Fri Sep 30 03:53:29 2005
@@ -541,32 +541,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 = WMRound2InteropTest.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/WaspRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/WaspRound2InteropTest.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/WaspRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/WaspRound2InteropTest.java Fri Sep 30 03:53:29 2005
@@ -355,128 +355,128 @@
      * Group C
      * operation echoString
      */
-//    public void testR2GCEchoString() throws AxisFault {
-//        url = "http://soap.systinet.net:6060/InteropCService/";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupcEchoStringUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GroupcEchoStringRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group C
-//     * operation echoInterger
-//     */
-//    public void testR2GCEchoInterger() throws AxisFault {
-//        url = "http://soap.systinet.net:6060/InteropCService/";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupcIntergerUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GroupcIntergerRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group C
-//     * operation echoStringArray
-//     */
-//    public void testR2GCEchoStringArray() throws AxisFault {
-//        url = "http://soap.systinet.net:6060/InteropCService/";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupcStringArrayUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GroupcStringArrayRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group C
-//     * operation echoIntergerArray
-//     */
-//    public void testR2GCEchoIntergerArray() throws AxisFault {
-//        url = "http://soap.systinet.net:6060/InteropCService/";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupcIntegerArrayUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GroupcIntegerArrayRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group C
-//     * operation echoFloat
-//     */
-//    public void testR2GCEchoFloat() throws AxisFault {
-//        url = "http://soap.systinet.net:6060/InteropCService/";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupcFloatUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GroupcFloatRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group C
-//     * operation echoFloatArray
-//     */
-//    public void testR2GCEchoFloatArray() throws AxisFault {
-//        url = "http://soap.systinet.net:6060/InteropCService/";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupcFloatArrayUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GroupcFloatArrayRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group C
-//     * operation echoStruct
-//     */
-//    public void testR2GCEchoStruct() throws AxisFault {
-//        url = "http://soap.systinet.net:6060/InteropCService/";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupcStructUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GroupcStructRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group C
-//     * operation echoStructArray
-//     */
-//    public void testR2GCEchoStructArray() throws AxisFault {
-//        url = "http://soap.systinet.net:6060/InteropCService/";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupcStructArrayUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GroupcStructArrayRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
+    public void testR2GCEchoString() throws AxisFault {
+        url = "http://soap.systinet.net:6060/InteropCService/";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupcEchoStringUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GroupcEchoStringRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group C
+     * operation echoInterger
+     */
+    public void testR2GCEchoInterger() throws AxisFault {
+        url = "http://soap.systinet.net:6060/InteropCService/";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupcIntergerUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GroupcIntergerRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group C
+     * operation echoStringArray
+     */
+    public void testR2GCEchoStringArray() throws AxisFault {
+        url = "http://soap.systinet.net:6060/InteropCService/";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupcStringArrayUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GroupcStringArrayRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group C
+     * operation echoIntergerArray
+     */
+    public void testR2GCEchoIntergerArray() throws AxisFault {
+        url = "http://soap.systinet.net:6060/InteropCService/";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupcIntegerArrayUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GroupcIntegerArrayRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group C
+     * operation echoFloat
+     */
+    public void testR2GCEchoFloat() throws AxisFault {
+        url = "http://soap.systinet.net:6060/InteropCService/";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupcFloatUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GroupcFloatRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group C
+     * operation echoFloatArray
+     */
+    public void testR2GCEchoFloatArray() throws AxisFault {
+        url = "http://soap.systinet.net:6060/InteropCService/";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupcFloatArrayUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GroupcFloatArrayRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group C
+     * operation echoStruct
+     */
+    public void testR2GCEchoStruct() throws AxisFault {
+        url = "http://soap.systinet.net:6060/InteropCService/";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupcStructUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GroupcStructRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group C
+     * operation echoStructArray
+     */
+    public void testR2GCEchoStructArray() throws AxisFault {
+        url = "http://soap.systinet.net:6060/InteropCService/";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupcStructArrayUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GroupcStructArrayRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
 
     /**
      * Round2
@@ -500,75 +500,48 @@
      * Group C
      * operation echoBase64
      */
-//    public void testR2GCEchoBase64() throws AxisFault {
-//        url = "http://soap.systinet.net:6060/InteropCService/";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupcBase64Util();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GroupcBase64Res.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group C
-//     * operation echoHexBinary
-//     */
-//    public void testR2GCEchoHexBinary() throws AxisFault {
-//        url = "http://soap.systinet.net:6060/InteropCService/";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupcHexBinaryUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GroupcHexBinaryRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//    }
-//
-//    /**
-//     * Round2
-//     * Group C
-//     * operation echoBoolean
-//     */
-//    public void testR2GCEchoBoolean() throws AxisFault {
-//        url = "http://soap.systinet.net:6060/InteropCService/";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new GroupcBooleanUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "GroupcBooleanRes.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 = WaspRound2InteropTest.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 testR2GCEchoBase64() throws AxisFault {
+        url = "http://soap.systinet.net:6060/InteropCService/";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupcBase64Util();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GroupcBase64Res.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group C
+     * operation echoHexBinary
+     */
+    public void testR2GCEchoHexBinary() throws AxisFault {
+        url = "http://soap.systinet.net:6060/InteropCService/";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupcHexBinaryUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GroupcHexBinaryRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
+    /**
+     * Round2
+     * Group C
+     * operation echoBoolean
+     */
+    public void testR2GCEchoBoolean() throws AxisFault {
+        url = "http://soap.systinet.net:6060/InteropCService/";
+        soapAction = "http://soapinterop.org/";
+
+        util = new GroupcBooleanUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "GroupcBooleanRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+    }
+
 }
 

Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/XSRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/XSRound2InteropTest.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/XSRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/interop/whitemesa/round2/XSRound2InteropTest.java Fri Sep 30 03:53:29 2005
@@ -209,16 +209,16 @@
      * operation echoBase64
      * todo - this test failed, have tocheck the dateTime format that remote server asking
      */
-//    public void testR2BaseEchoDate() throws AxisFault  {
-//        url = "http://localhost:8010/";
-//        soapAction = "http://soapinterop.org/";
-//
-//        util = new Round2EchoDateClientUtil();
-//        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
-//        tempPath = resFilePath + "XSBaseDateRes.xml";
-//        results = compare(retEnv, tempPath);
-//        assertTrue(results);
-//   }
+    public void testR2BaseEchoDate() throws AxisFault  {
+        url = "http://localhost:8010/";
+        soapAction = "http://soapinterop.org/";
+
+        util = new Round2EchoDateClientUtil();
+        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        tempPath = resFilePath + "XSBaseDateRes.xml";
+        results = compare(retEnv, tempPath);
+        assertTrue(results);
+   }
 
 
     /**
@@ -269,33 +269,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 = XSRound2InteropTest.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/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/project.properties?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/project.properties (original)
+++ webservices/axis2/trunk/java/modules/integration/project.properties Fri Sep 30 03:53:29 2005
@@ -17,7 +17,17 @@
 maven.multiproject.type=jar
 
 maven.itest.src=${basedir}/itest
-maven.itest.includes=**/*.java
+maven.itest.src.excludes=org/apache/axis2/interop/whitemesa/round2/**/*.java
+maven.itest.includes=org/apache/axis2/mtom/**/*.java,\
+                     org/apache/axis2/interop/sun/**/*.java,\
+                     org/apache/axis2/interop/whitemesa/round1/**/*.java,\
+                     org/apache/axis2/interop/whitemesa/round3/**/*.java,\
+                     org/apache/axis2/interop/whitemesa/round4/**/*.java
+
+#This doesn't seem to exclude the unwanted tests
+#Therefore we have to add the required tests to includes one by one
+#we have to fix this!!!
+#maven.itest.exclude=org/apache/axis2/interop/whitemesa/round2/**/*.java
 
 maven.junit.fork=true
 maven.junit.jvmargs=-ea
@@ -27,3 +37,5 @@
 itestConfig.dir=${basedir}/itest-resources
 itestConfig.includes=**/*.xml
 itestConfig.excludes=
+
+

Modified: webservices/axis2/trunk/java/modules/integration/src/org/apache/axis2/interop/sun/round4/complex/EchoBlockingClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/org/apache/axis2/interop/sun/round4/complex/EchoBlockingClient.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/org/apache/axis2/interop/sun/round4/complex/EchoBlockingClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/org/apache/axis2/interop/sun/round4/complex/EchoBlockingClient.java Fri Sep 30 03:53:29 2005
@@ -22,8 +22,6 @@
 import org.apache.axis2.clientapi.Call;
 import org.apache.axis2.om.OMElement;
 
-import java.io.StringWriter;
-
 public class EchoBlockingClient {
 
 
@@ -44,10 +42,6 @@
             //Blocking invocation
 
             firstchild = call.invokeBlocking("",util.getEchoOMElement());
-
-            StringWriter writer = new StringWriter();
-
-            System.out.println(writer.toString());
 
         } catch (AxisFault axisFault) {
             axisFault.printStackTrace();

Modified: webservices/axis2/trunk/java/modules/integration/src/org/apache/axis2/interop/sun/round4/simple/EchoBlockingClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/org/apache/axis2/interop/sun/round4/simple/EchoBlockingClient.java?rev=292698&r1=292697&r2=292698&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/org/apache/axis2/interop/sun/round4/simple/EchoBlockingClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/org/apache/axis2/interop/sun/round4/simple/EchoBlockingClient.java Fri Sep 30 03:53:29 2005
@@ -23,8 +23,6 @@
 import org.apache.axis2.interop.sun.round4.simple.util.SunGroupHClientUtil;
 import org.apache.axis2.om.OMElement;
 
-import java.io.StringWriter;
-
 public class EchoBlockingClient {
     public OMElement sendMsg(SunGroupHClientUtil util,String soapAction){
         OMElement firstchild=null;
@@ -41,12 +39,6 @@
             //Blocking invocation
 
             firstchild = call.invokeBlocking("",util.getEchoOMElement());
-
-            StringWriter writer = new StringWriter();
-
-
-
-            System.out.println(writer.toString());
 
         } catch (AxisFault axisFault) {
             axisFault.printStackTrace();