Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 38389 invoked from network); 8 Feb 2007 20:14:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Feb 2007 20:14:20 -0000 Received: (qmail 16111 invoked by uid 500); 8 Feb 2007 20:14:23 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 16062 invoked by uid 500); 8 Feb 2007 20:14:22 -0000 Mailing-List: contact axis-dev-help@ws.apache.org; run by ezmlm Precedence: bulk Reply-To: axis-dev@ws.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-dev@ws.apache.org Received: (qmail 16051 invoked by uid 99); 8 Feb 2007 20:14:22 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Feb 2007 12:14:22 -0800 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (herse.apache.org: domain of davanum@gmail.com designates 64.233.184.238 as permitted sender) Received: from [64.233.184.238] (HELO wr-out-0506.google.com) (64.233.184.238) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Feb 2007 12:14:11 -0800 Received: by wr-out-0506.google.com with SMTP id 57so646236wri for ; Thu, 08 Feb 2007 12:13:51 -0800 (PST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:reply-to:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition; b=k9CVqBBa+iqJzofGD59m1ZVlwZZPIzYt27CL64ueDmLeA41Yhs5l7mxJ4TVJwZ0E5TEncwh+aM77+g2Hw6TSFBjzCbcNmQ7c9ftP5XPbXeR3Zpy3kHF79C3olmmpKufvVQFTBs9w2lPDeLEeOOp1zxZN3P0K/bJuJprXBzxzaQc= Received: by 10.114.200.2 with SMTP id x2mr3769224waf.1170965629966; Thu, 08 Feb 2007 12:13:49 -0800 (PST) Received: by 10.114.73.14 with HTTP; Thu, 8 Feb 2007 12:13:49 -0800 (PST) Message-ID: <19e0530f0702081213x10dccdeal4dda807db151cf77@mail.gmail.com> Date: Thu, 8 Feb 2007 15:13:49 -0500 From: "Davanum Srinivas" Reply-To: dims@apache.org To: axis-dev@ws.apache.org Subject: Re: [Axis2] CTR protocol (Re: svn commit: r505003 [1/2] - in /webservices/axis2/trunk/java/modules/jaxws: ./ src/org/apache/axis2/jaxws/client/ test/org/apache/axis2/jaxws/anytype/tests/ test/org/apache/axis2/jaxws/attachments/ test/org/apache/axis2/ MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline X-Virus-Checked: Checked by ClamAV on apache.org Bill, I ran this on WinXP (Sun JDK) and on Linux (SUN JDK). I just ran this on IBM JDK as well. All clear. So where's the problem? Which test was failing? thanks, dims On 2/8/07, Bill Nagy wrote: > Hi dims, > > While I usually agree with that -- this was breaking our ability to even > build the code, a high priority issue, and therefore I would argue that > the reversal was warranted. I certainly would not advocating backing > out changes to logic in this manner, but I believe that a build > break/issue is an acceptable exception to the rule. > > -Bill > > On Thu, 2007-02-08 at 14:30 -0500, Davanum Srinivas wrote: > > Jeff, > > > > If you did not like the change, you should -1 the change and give an > > opportunity for the person who made the change to fix your > > issue/problem. Just reverting w/o a chance for discussion is not > > kosher. > > > > thanks, > > dims > > > > On 2/8/07, barrettj@apache.org wrote: > > > Author: barrettj > > > Date: Thu Feb 8 11:08:26 2007 > > > New Revision: 505003 > > > > > > URL: http://svn.apache.org/viewvc?view=rev&rev=505003 > > > Log: > > > Undoing the changes for revision 504712. That change seperated the JAXWS Tests out of a single JAXWSTest and into individual tests. > > > While that is a great idea because it makes the tests easier to run (and debug) individually, it causes serious issues on Windows and > > > intermittent issues on Linux. The issues are related to starting and stopping the server repeatedly. On Windows, tests will hang > > > and on Linux there are intermittent socket in use errors. In addition, starting and stopping the server over and over causes the > > > tests to take considerably longer (when they work). That was the reasoning for putting all tests that require a server in a single test. > > > > > > Added: > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/DOMSourceDispatch.java > > > - copied unchanged from r504711, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/DOMSourceDispatch.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/DispatchTestSuite.java > > > - copied unchanged from r504711, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/DispatchTestSuite.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/JAXBDispatch.java > > > - copied unchanged from r504711, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/JAXBDispatch.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/JAXBSourceDispatch.java > > > - copied unchanged from r504711, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/JAXBSourceDispatch.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/SAXSourceDispatch.java > > > - copied unchanged from r504711, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/SAXSourceDispatch.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/SOAP12Dispatch.java > > > - copied unchanged from r504711, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/SOAP12Dispatch.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatch.java > > > - copied unchanged from r504711, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatch.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/StreamSourceDispatch.java > > > - copied unchanged from r504711, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/StreamSourceDispatch.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/StringDispatch.java > > > - copied unchanged from r504711, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/StringDispatch.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/framework/JAXWSTest.java > > > - copied unchanged from r504711, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/framework/JAXWSTest.java > > > Removed: > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/DOMSourceDispatchTest.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/JAXBDispatchTest.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/JAXBSourceDispatchTest.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/SAXSourceDispatchTest.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/SOAP12DispatchTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatchTest.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/StreamSourceDispatchTest.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/StringDispatchTest.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/framework/AbstractTestCase.java > > > Modified: > > > webservices/axis2/trunk/java/modules/jaxws/pom.xml > > > webservices/axis2/trunk/java/modules/jaxws/project.xml > > > webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/JAXBDispatch.java > > > webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/XMLDispatch.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/anytype/tests/AnyTypeTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/attachments/MTOMSerializationTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/ClientConfigTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/DispatchSoapActionTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/PropertyValueTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/ProxySoapActionTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/databinding/BindingToProtocolTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/AnnotationDescriptionTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/GetDescFromBindingProviderTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/PortSelectionTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/ServiceTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/WSDLDescriptionTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/WSDLTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/exception/ExceptionFactoryTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerChainProcessorTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/i18n/JaxwsMessageBundleTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/lifecycle/EndpointLifecycleTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/FaultTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/MessageTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/SAAJConverterTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/SOAP12Tests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/XMLStreamReaderSplitterTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/nonanonymous/complextype/NonAnonymousComplexTypeTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/JAXBProviderTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/ProviderTestCase.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SourceMessageProviderTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SourceProviderTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/StringMessageProviderTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/StringProviderTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddressBookTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/BareTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultyWebServiceTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleByteArrayTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/NonWrapTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/ParallelAsyncTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/WSGenTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/WrapTests.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/wsgen/client/WSGenService.java > > > webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/security/BasicAuthSecurityTests.java > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/pom.xml > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/pom.xml?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/pom.xml (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/pom.xml Thu Feb 8 11:08:26 2007 > > > @@ -713,8 +713,7 @@ > > > > > > false > > > > > > - org/**/*Test.java > > > - org/**/*Tests.java > > > + **/*Test.java > > > > > > > > > > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/project.xml > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/project.xml?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/project.xml (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/project.xml Thu Feb 8 11:08:26 2007 > > > @@ -79,7 +79,6 @@ > > > > > > > > > **/*Test.java > > > - **/*Tests.java > > > > > > > > > > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/JAXBDispatch.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/JAXBDispatch.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/JAXBDispatch.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/JAXBDispatch.java Thu Feb 8 11:08:26 2007 > > > @@ -103,7 +103,7 @@ > > > } > > > > > > /** > > > - * Common code to get the value for JAXBDispatchTest and JAXBDispatchAsyncListener > > > + * Common code to get the value for JAXBDispatch and JAXBDispatchAsyncListener > > > * @param message > > > * @param mode > > > * @param jaxbContext > > > @@ -124,7 +124,7 @@ > > > // REVIEW This seems like the correct behavior. If the body is empty, return a null > > > // Any changes here should also be made to XMLDispatch.getValue > > > if (log.isDebugEnabled()) { > > > - log.debug("There are no elements in the body to unmarshal. JAXBDispatchTest returns a null value"); > > > + log.debug("There are no elements in the body to unmarshal. JAXBDispatch returns a null value"); > > > } > > > value = null; > > > } > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/XMLDispatch.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/XMLDispatch.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/XMLDispatch.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/XMLDispatch.java Thu Feb 8 11:08:26 2007 > > > @@ -173,7 +173,7 @@ > > > value = message.getAsSOAPMessage(); > > > > > > } else { > > > - // NOTE Similar code in JAXBDispatchTest > > > + // NOTE Similar code in JAXBDispatch > > > > > > // TODO: This doesn't seem right to me. We should not have an intermediate StringBlock. > > > // This is not performant. Scheu > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/anytype/tests/AnyTypeTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/anytype/tests/AnyTypeTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/anytype/tests/AnyTypeTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/anytype/tests/AnyTypeTests.java Thu Feb 8 11:08:26 2007 > > > @@ -19,18 +19,11 @@ > > > package org.apache.axis2.jaxws.anytype.tests; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.anytype.sei.AnyTypeMessagePortType; > > > import org.apache.axis2.jaxws.anytype.sei.AnyTypeMessageService; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > -public class AnyTypeTests extends AbstractTestCase { > > > +public class AnyTypeTests extends TestCase { > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(AnyTypeTests.class)); > > > - } > > > - > > > public void testAnyTypeElementinWrappedWSDL(){ > > > System.out.println("------------------------------"); > > > System.out.println("Test : "+getName()); > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/attachments/MTOMSerializationTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/attachments/MTOMSerializationTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/attachments/MTOMSerializationTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/attachments/MTOMSerializationTests.java Thu Feb 8 11:08:26 2007 > > > @@ -12,8 +12,6 @@ > > > import javax.xml.bind.JAXBContext; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axiom.om.OMAbstractFactory; > > > import org.apache.axiom.om.OMElement; > > > import org.apache.axiom.om.OMFactory; > > > @@ -33,12 +31,11 @@ > > > import org.apache.axis2.jaxws.message.factory.MessageFactory; > > > import org.apache.axis2.jaxws.provider.DataSourceImpl; > > > import org.apache.axis2.jaxws.registry.FactoryRegistry; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > import org.test.mtom.ImageDepot; > > > import org.test.mtom.ObjectFactory; > > > import org.test.mtom.SendImage; > > > > > > -public class MTOMSerializationTests extends AbstractTestCase { > > > +public class MTOMSerializationTests extends TestCase { > > > > > > private DataSource imageDS; > > > > > > @@ -56,10 +53,6 @@ > > > super(name); > > > } > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(MTOMSerializationTests.class)); > > > - } > > > - > > > /* > > > * Simulate building up an OM that is sourced from JAXB and contains > > > * binary data that should be optimized when serialized. > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/ClientConfigTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/ClientConfigTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/ClientConfigTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/ClientConfigTests.java Thu Feb 8 11:08:26 2007 > > > @@ -11,20 +11,13 @@ > > > import javax.xml.ws.WebServiceException; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > -public class ClientConfigTests extends AbstractTestCase { > > > +public class ClientConfigTests extends TestCase { > > > > > > public ClientConfigTests(String name) { > > > super(name); > > > } > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(ClientConfigTests.class)); > > > - } > > > - > > > public void testBadWsdlUrl() throws Exception { > > > > > > URL url = null; > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/DispatchSoapActionTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/DispatchSoapActionTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/DispatchSoapActionTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/DispatchSoapActionTests.java Thu Feb 8 11:08:26 2007 > > > @@ -27,10 +27,7 @@ > > > import javax.xml.ws.Service.Mode; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.BindingProvider; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > import org.apache.axis2.jaxws.client.soapaction.BookStoreService; > > > import org.apache.axis2.jaxws.client.soapaction.GetPriceResponseType; > > > import org.apache.axis2.jaxws.client.soapaction.GetPriceType; > > > @@ -39,15 +36,11 @@ > > > /** > > > * A suite of SOAPAction related tests for the dispatch client > > > */ > > > -public class DispatchSoapActionTests extends AbstractTestCase { > > > +public class DispatchSoapActionTests extends TestCase { > > > > > > private static final String targetNamespace = "http://jaxws.axis2.apache.org/client/soapaction"; > > > private static final String portName = "BookStorePort"; > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(DispatchSoapActionTests.class)); > > > - } > > > - > > > /** > > > * Invoke an operation this is defined in the WSDL as having a SOAPAction. > > > * Since this is a Dispatch client, we'll need to specify that SOAPAction > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/PropertyValueTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/PropertyValueTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/PropertyValueTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/PropertyValueTests.java Thu Feb 8 11:08:26 2007 > > > @@ -28,23 +28,16 @@ > > > import javax.xml.ws.WebServiceException; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > /** > > > * A suite to test the validation of the client request/response context properties > > > */ > > > -public class PropertyValueTests extends AbstractTestCase { > > > +public class PropertyValueTests extends TestCase { > > > > > > public PropertyValueTests(String name) { > > > super(name); > > > } > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(PropertyValueTests.class)); > > > - } > > > - > > > public void testSetInvalidClientProperties() throws Exception { > > > Service svc = Service.create(new QName("http://test", "TestService")); > > > QName portQName = new QName("http://test", "TestPort"); > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/ProxySoapActionTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/ProxySoapActionTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/ProxySoapActionTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/ProxySoapActionTests.java Thu Feb 8 11:08:26 2007 > > > @@ -19,25 +19,18 @@ > > > package org.apache.axis2.jaxws.client; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.client.soapaction.BookStore; > > > import org.apache.axis2.jaxws.client.soapaction.BookStoreService; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > /** > > > * A suite of SOAPAction related tests for the dynamic proxy client > > > */ > > > -public class ProxySoapActionTests extends AbstractTestCase { > > > +public class ProxySoapActionTests extends TestCase { > > > > > > public ProxySoapActionTests(String name) { > > > super(name); > > > } > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(DispatchSoapActionTests.class)); > > > - } > > > - > > > public void testSendRequestWithSoapAction() { > > > System.out.println("----------------------------------"); > > > System.out.println("test: " + getName()); > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/databinding/BindingToProtocolTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/databinding/BindingToProtocolTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/databinding/BindingToProtocolTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/databinding/BindingToProtocolTests.java Thu Feb 8 11:08:26 2007 > > > @@ -21,16 +21,13 @@ > > > import javax.xml.namespace.QName; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > /** > > > * A suite of tests for reading the binding from a WSDL file and > > > * making sure we are configuring the Protocol correctly for > > > * messages based on that binding ID. > > > */ > > > -public class BindingToProtocolTests extends AbstractTestCase { > > > +public class BindingToProtocolTests extends TestCase { > > > > > > private static final String SOAP11_TEST_NS = "http://jaxws.axis2.apache.org/bindingtest/soap11"; > > > private static final String SOAP12_TEST_NS = "http://jaxws.axis2.apache.org/bindingtest/soap12"; > > > @@ -41,10 +38,6 @@ > > > super(name); > > > } > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(BindingToProtocolTests.class)); > > > - } > > > - > > > /** > > > * Test to see if we can read the SOAP 1.1 binding transport URL > > > * in a WSDL, as specified by JAX-WS section 10.4.1. > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/AnnotationDescriptionTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/AnnotationDescriptionTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/AnnotationDescriptionTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/AnnotationDescriptionTests.java Thu Feb 8 11:08:26 2007 > > > @@ -24,10 +24,7 @@ > > > import javax.xml.ws.Service; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.spi.ServiceDelegate; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > /** > > > * Directly test the Description classes built via annotations without a WSDL file. > > > @@ -36,13 +33,9 @@ > > > * - A generated service (annotations) > > > * - An SEI > > > */ > > > -public class AnnotationDescriptionTests extends AbstractTestCase { > > > +public class AnnotationDescriptionTests extends TestCase { > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(AnnotationDescriptionTests.class)); > > > - } > > > - > > > - /* > > > + /* > > > * ======================================================================== > > > * ServiceDescription Tests > > > * ======================================================================== > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/GetDescFromBindingProviderTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/GetDescFromBindingProviderTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/GetDescFromBindingProviderTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/GetDescFromBindingProviderTests.java Thu Feb 8 11:08:26 2007 > > > @@ -26,12 +26,9 @@ > > > import javax.xml.ws.Service; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.description.AxisService; > > > import org.apache.axis2.jaxws.spi.BindingProvider; > > > import org.apache.axis2.jaxws.spi.ServiceDelegate; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > import org.apache.ws.axis2.tests.EchoPort; > > > > > > /** > > > @@ -40,14 +37,10 @@ > > > * gotten from the EndpointDesc. Note that the BindingProvider class is NOT > > > * the jaxws API one; it is the internal implementation BindingProvider class. > > > */ > > > -public class GetDescFromBindingProviderTests extends AbstractTestCase { > > > +public class GetDescFromBindingProviderTests extends TestCase { > > > > > > private static final String wsdlSOAPAddress = "http://localhost:8080/axis2/services/EchoService"; > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(GetDescFromBindingProviderTests.class)); > > > - } > > > - > > > public void testForProxy() { > > > String namespaceURI = "http://ws.apache.org/axis2/tests"; > > > String localPart = "EchoService"; > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/PortSelectionTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/PortSelectionTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/PortSelectionTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/PortSelectionTests.java Thu Feb 8 11:08:26 2007 > > > @@ -29,25 +29,18 @@ > > > import javax.xml.ws.WebServiceException; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.sample.addnumbers.AddNumbersPortType; > > > import org.apache.axis2.jaxws.spi.BindingProvider; > > > import org.apache.axis2.jaxws.spi.ServiceDelegate; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > import org.apache.ws.axis2.tests.EchoPort; > > > > > > /** > > > * > > > */ > > > -public class PortSelectionTests extends AbstractTestCase { > > > +public class PortSelectionTests extends TestCase { > > > private static String VALID_SERVICE_NAMESPACE = "http://org/test/addnumbers"; > > > private static String VALID_SERVICE_LOCALPART_3 = "AddNumbersService3"; > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(ServiceTests.class)); > > > - } > > > - > > > public void testServiceDescPortSelectionMethods() { > > > URL wsdlURL = DescriptionTestUtils2.getWSDLURL("WSDLMultiTests.wsdl"); > > > > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/ServiceTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/ServiceTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/ServiceTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/ServiceTests.java Thu Feb 8 11:08:26 2007 > > > @@ -29,13 +29,10 @@ > > > import javax.xml.ws.WebServiceException; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.sample.addnumbers.AddNumbersPortType; > > > import org.apache.axis2.jaxws.spi.ServiceDelegate; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > -public class ServiceTests extends AbstractTestCase { > > > +public class ServiceTests extends TestCase { > > > private static String VALID_SERVICE_NAMESPACE = "http://org/test/addnumbers"; > > > private static String VALID_SERVICE_LOCALPART_1 = "AddNumbersService1"; > > > private static String VALID_SERVICE_LOCALPART_2 = "AddNumbersService2"; > > > @@ -46,10 +43,6 @@ > > > private static String VALID_PORT_S2P2 = "AddNumbersPortS2P2"; > > > private static String VALID_PORT_S2P3 = "AddNumbersPortS2P3"; > > > private static String VALID_PORT_S2P4 = "AddNumbersPortS2P4"; > > > - > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(ServiceTests.class)); > > > - } > > > > > > public void testInvalidServiceNamespace() { > > > URL wsdlURL = DescriptionTestUtils2.getWSDLURL("WSDLMultiTests.wsdl"); > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/WSDLDescriptionTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/WSDLDescriptionTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/WSDLDescriptionTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/WSDLDescriptionTests.java Thu Feb 8 11:08:26 2007 > > > @@ -34,16 +34,13 @@ > > > import javax.xml.ws.WebServiceException; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.spi.ServiceDelegate; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > import org.apache.ws.axis2.tests.EchoPort; > > > > > > /** > > > * Directly test the Description classes built with a WSDL file. > > > */ > > > -public class WSDLDescriptionTests extends AbstractTestCase { > > > +public class WSDLDescriptionTests extends TestCase { > > > > > > private Service service; > > > private ServiceDelegate serviceDelegate; > > > @@ -54,10 +51,6 @@ > > > private QName validPortQName = new QName(VALID_NAMESPACE, VALID_PORT); > > > > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(WSDLTests.class)); > > > - } > > > - > > > protected void setUp() { > > > // Create a new service for each test to test various valid and invalid > > > // flows > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/WSDLTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/WSDLTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/WSDLTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/WSDLTests.java Thu Feb 8 11:08:26 2007 > > > @@ -25,10 +25,7 @@ > > > import javax.xml.ws.WebServiceException; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.spi.ServiceDelegate; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > /** > > > * Tests building a ServiceDescription using WSDL and the JAXWS Service API. > > > @@ -36,12 +33,8 @@ > > > * that should be used, this test will create Service objects and then use introspection > > > * to check the underlying ServiceDelegate which contains the ServiceDescription. > > > */ > > > -public class WSDLTests extends AbstractTestCase { > > > +public class WSDLTests extends TestCase { > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(WSDLTests.class)); > > > - } > > > - > > > public void testValidWSDLService() { > > > Service service = null; > > > ServiceDelegate serviceDelegate = null; > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/exception/ExceptionFactoryTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/exception/ExceptionFactoryTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/exception/ExceptionFactoryTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/exception/ExceptionFactoryTests.java Thu Feb 8 11:08:26 2007 > > > @@ -20,15 +20,12 @@ > > > import javax.xml.ws.WebServiceException; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.ExceptionFactory; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > /** > > > * Tests the ExceptionFactory > > > */ > > > -public class ExceptionFactoryTests extends AbstractTestCase { > > > +public class ExceptionFactoryTests extends TestCase { > > > private static final String sampleText = "Sample"; > > > > > > /** > > > @@ -38,10 +35,6 @@ > > > super(name); > > > } > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(ExceptionFactoryTests.class)); > > > - } > > > - > > > /** > > > * @teststrategy Tests creation of a WebServiceException > > > */ > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerChainProcessorTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerChainProcessorTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerChainProcessorTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerChainProcessorTests.java Thu Feb 8 11:08:26 2007 > > > @@ -25,11 +25,7 @@ > > > import javax.xml.ws.handler.soap.SOAPHandler; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.core.MessageContext; > > > -import org.apache.axis2.jaxws.description.ServiceTests; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > /* > > > * There are myriad scenarios to test here: > > > @@ -47,7 +43,7 @@ > > > * The testHandleFault_* methods test the HandlerChainProcessor.processFault() method > > > * > > > */ > > > -public class HandlerChainProcessorTests extends AbstractTestCase { > > > +public class HandlerChainProcessorTests extends TestCase { > > > > > > // String result is how we'll verify the right methods from > > > // the Handler implementations were called > > > @@ -67,10 +63,6 @@ > > > > > > ArrayList handlers = new ArrayList(); > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(HandlerChainProcessorTests.class)); > > > - } > > > - > > > @Override > > > protected void setUp() throws Exception { > > > // HandlerChainProcessor expects a sorted chain > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/i18n/JaxwsMessageBundleTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/i18n/JaxwsMessageBundleTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/i18n/JaxwsMessageBundleTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/i18n/JaxwsMessageBundleTests.java Thu Feb 8 11:08:26 2007 > > > @@ -17,15 +17,12 @@ > > > package org.apache.axis2.jaxws.i18n; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > /** > > > * Tests basic function of the Message Bundle > > > * > > > */ > > > -public class JaxwsMessageBundleTests extends AbstractTestCase { > > > +public class JaxwsMessageBundleTests extends TestCase { > > > > > > public JaxwsMessageBundleTests() { > > > super(); > > > @@ -35,10 +32,6 @@ > > > super(arg); > > > } > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(JaxwsMessageBundleTests.class)); > > > - } > > > - > > > /** > > > * @testStrategy: Test that the resource bundle > > > * is installed by obtaining a message > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTests.java Thu Feb 8 11:08:26 2007 > > > @@ -21,16 +21,13 @@ > > > import javax.xml.ws.WebServiceContext; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.context.WebServiceContextImpl; > > > import org.apache.axis2.jaxws.resourceinjection.sei.ResourceInjectionPortType; > > > import org.apache.axis2.jaxws.resourceinjection.sei.ResourceInjectionService; > > > import org.apache.axis2.jaxws.server.endpoint.injection.ResourceInjector; > > > import org.apache.axis2.jaxws.server.endpoint.injection.factory.ResourceInjectionFactory; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > -public class ResourceInjectionTests extends AbstractTestCase { > > > +public class ResourceInjectionTests extends TestCase { > > > > > > > > > private Object resource = new WebServiceContextImpl(); > > > @@ -38,10 +35,6 @@ > > > super(); > > > // TODO Auto-generated constructor stub > > > } > > > - > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(ResourceInjectionTests.class)); > > > - } > > > > > > public void testInjectionOnField(){ > > > Object serviceInstance = new ResourceInjectionTestImpl1(); > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/lifecycle/EndpointLifecycleTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/lifecycle/EndpointLifecycleTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/lifecycle/EndpointLifecycleTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/lifecycle/EndpointLifecycleTests.java Thu Feb 8 11:08:26 2007 > > > @@ -19,15 +19,12 @@ > > > package org.apache.axis2.jaxws.lifecycle; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.registry.FactoryRegistry; > > > import org.apache.axis2.jaxws.resourceinjection.ResourceInjectionPortTypeImpl; > > > import org.apache.axis2.jaxws.server.endpoint.lifecycle.EndpointLifecycleManager; > > > import org.apache.axis2.jaxws.server.endpoint.lifecycle.factory.EndpointLifecycleManagerFactory; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > -public class EndpointLifecycleTests extends AbstractTestCase { > > > +public class EndpointLifecycleTests extends TestCase { > > > Object endpointInstance = new ResourceInjectionPortTypeImpl(); > > > Object badObject = new Object(); > > > public EndpointLifecycleTests() { > > > @@ -43,10 +40,6 @@ > > > // TODO Auto-generated constructor stub > > > } > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(EndpointLifecycleTests.class)); > > > - } > > > - > > > public void testPostConstruct(){ > > > System.out.println("------------------------------"); > > > System.out.println("Test : "+getName()); > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java Thu Feb 8 11:08:26 2007 > > > @@ -39,8 +39,6 @@ > > > import javax.xml.transform.stream.StreamSource; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axiom.om.OMElement; > > > import org.apache.axiom.om.OMOutputFormat; > > > import org.apache.axiom.om.impl.builder.StAXOMBuilder; > > > @@ -54,7 +52,6 @@ > > > import org.apache.axis2.jaxws.message.factory.XMLStringBlockFactory; > > > import org.apache.axis2.jaxws.message.util.Reader2Writer; > > > import org.apache.axis2.jaxws.registry.FactoryRegistry; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > import org.w3c.dom.Document; > > > import org.w3c.dom.Node; > > > import org.xml.sax.InputSource; > > > @@ -66,7 +63,7 @@ > > > * Tests to create and validate blocks. > > > * These are not client/server tests. > > > */ > > > -public class BlockTests extends AbstractTestCase { > > > +public class BlockTests extends TestCase { > > > > > > // String test variables > > > private static final String sampleText = > > > @@ -90,10 +87,6 @@ > > > super(arg0); > > > } > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(BlockTests.class)); > > > - } > > > - > > > /** > > > * Create a Block representing an XMLString and simulate a > > > * normal Dispatch flow > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/FaultTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/FaultTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/FaultTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/FaultTests.java Thu Feb 8 11:08:26 2007 > > > @@ -23,20 +23,17 @@ > > > import javax.xml.stream.XMLStreamReader; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axiom.om.OMElement; > > > import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder; > > > import org.apache.axis2.jaxws.message.factory.MessageFactory; > > > import org.apache.axis2.jaxws.registry.FactoryRegistry; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > /** > > > * MessageTests > > > * Tests to create and validate Message processing > > > * These are not client/server tests. > > > */ > > > -public class FaultTests extends AbstractTestCase { > > > +public class FaultTests extends TestCase { > > > > > > private static final String faultString = "Internal server error from WAS"; > > > > > > @@ -97,10 +94,6 @@ > > > super(arg0); > > > } > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(FaultTests.class)); > > > - } > > > - > > > /** > > > * This test effectively tests XMLFault construction from > > > * > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/MessageTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/MessageTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/MessageTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/MessageTests.java Thu Feb 8 11:08:26 2007 > > > @@ -26,8 +26,6 @@ > > > import javax.xml.stream.XMLStreamReader; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axiom.om.OMElement; > > > import org.apache.axiom.om.OMOutputFormat; > > > import org.apache.axiom.om.impl.llom.OMSourcedElementImpl; > > > @@ -39,7 +37,6 @@ > > > import org.apache.axis2.jaxws.message.factory.XMLStringBlockFactory; > > > import org.apache.axis2.jaxws.message.util.SAAJConverter; > > > import org.apache.axis2.jaxws.registry.FactoryRegistry; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > import test.EchoStringResponse; > > > import test.ObjectFactory; > > > > > > @@ -49,7 +46,7 @@ > > > * These are not client/server tests. Instead the tests simulate the processing of a Message during > > > * client/server processing. > > > */ > > > -public class MessageTests extends AbstractTestCase { > > > +public class MessageTests extends TestCase { > > > > > > // String test variables > > > private static final String soap11env = "http://schemas.xmlsoap.org/soap/envelope/"; > > > @@ -131,12 +128,8 @@ > > > public MessageTests(String arg0) { > > > super(arg0); > > > } > > > - > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(MessageTests.class)); > > > - } > > > - > > > - /** > > > + > > > + /** > > > * Create a Block representing an XMLString and simulate a > > > * normal Dispatch flow. > > > * In addition the test makes sure that the XMLString block is not > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/SAAJConverterTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/SAAJConverterTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/SAAJConverterTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/SAAJConverterTests.java Thu Feb 8 11:08:26 2007 > > > @@ -29,8 +29,6 @@ > > > import javax.xml.stream.XMLStreamReader; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axiom.om.OMAbstractFactory; > > > import org.apache.axiom.om.OMElement; > > > import org.apache.axiom.om.OMFactory; > > > @@ -39,7 +37,6 @@ > > > import org.apache.axis2.jaxws.message.factory.SAAJConverterFactory; > > > import org.apache.axis2.jaxws.message.util.SAAJConverter; > > > import org.apache.axis2.jaxws.registry.FactoryRegistry; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > /** > > > * SAAJConverterTests > > > @@ -49,7 +46,7 @@ > > > * the converter. > > > * > > > */ > > > -public class SAAJConverterTests extends AbstractTestCase { > > > +public class SAAJConverterTests extends TestCase { > > > > > > private static final String sampleText = > > > "" + > > > @@ -72,10 +69,6 @@ > > > public SAAJConverterTests(String arg0) { > > > super(arg0); > > > } > > > - > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(SAAJConverterTests.class)); > > > - } > > > > > > /** > > > * @testStrategy Tests conversions between SAAJ and OM SOAPEnvelopes > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/SOAP12Tests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/SOAP12Tests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/SOAP12Tests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/SOAP12Tests.java Thu Feb 8 11:08:26 2007 > > > @@ -22,8 +22,6 @@ > > > import javax.xml.stream.XMLStreamReader; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axiom.om.OMElement; > > > import org.apache.axiom.om.OMNamespace; > > > import org.apache.axiom.soap.SOAPEnvelope; > > > @@ -32,14 +30,13 @@ > > > import org.apache.axis2.jaxws.message.factory.XMLStringBlockFactory; > > > import org.apache.axis2.jaxws.message.util.Reader2Writer; > > > import org.apache.axis2.jaxws.registry.FactoryRegistry; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > /** > > > * This suite is used to test the creation of messages based on SOAP 1.2 > > > * with both inbound and outbound simulations. > > > * > > > */ > > > -public class SOAP12Tests extends AbstractTestCase { > > > +public class SOAP12Tests extends TestCase { > > > > > > private static final String sampleText = > > > "test string"; > > > @@ -65,10 +62,6 @@ > > > super(name); > > > } > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(SOAP12Tests.class)); > > > - } > > > - > > > /** > > > * Simulate creating a SOAP 1.2 message when the business object > > > * provided is just the payload. > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/XMLStreamReaderSplitterTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/XMLStreamReaderSplitterTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/XMLStreamReaderSplitterTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/XMLStreamReaderSplitterTests.java Thu Feb 8 11:08:26 2007 > > > @@ -27,16 +27,13 @@ > > > import javax.xml.stream.XMLStreamWriter; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.message.util.Reader2Writer; > > > import org.apache.axis2.jaxws.message.util.XMLStreamReaderSplitter; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > /** > > > * Tests XMLStreamReaderSplitter > > > */ > > > -public class XMLStreamReaderSplitterTests extends AbstractTestCase { > > > +public class XMLStreamReaderSplitterTests extends TestCase { > > > > > > // String test variables > > > private static final String sampleText = > > > @@ -67,10 +64,6 @@ > > > super(arg0); > > > } > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(XMLStreamReaderSplitterTests.class)); > > > - } > > > - > > > /** > > > * Test XMLStreamReaderSplitter > > > * @throws Exception > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/nonanonymous/complextype/NonAnonymousComplexTypeTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/nonanonymous/complextype/NonAnonymousComplexTypeTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/nonanonymous/complextype/NonAnonymousComplexTypeTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/nonanonymous/complextype/NonAnonymousComplexTypeTests.java Thu Feb 8 11:08:26 2007 > > > @@ -6,13 +6,10 @@ > > > import javax.xml.ws.WebServiceException; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.nonanonymous.complextype.sei.EchoMessagePortType; > > > import org.apache.axis2.jaxws.nonanonymous.complextype.sei.EchoMessageService; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > -public class NonAnonymousComplexTypeTests extends AbstractTestCase { > > > +public class NonAnonymousComplexTypeTests extends TestCase { > > > > > > /** > > > * > > > @@ -29,11 +26,6 @@ > > > super(arg0); > > > // TODO Auto-generated constructor stub > > > } > > > - > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(NonAnonymousComplexTypeTests.class)); > > > - } > > > - > > > public void testSimpleProxy() { > > > System.out.println("------------------------------"); > > > System.out.println("Test : "+getName()); > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java Thu Feb 8 11:08:26 2007 > > > @@ -12,24 +12,17 @@ > > > import javax.wsdl.WSDLException; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.polymorphic.shape.sei.PolymorphicShapePortType; > > > import org.apache.axis2.jaxws.polymorphic.shape.sei.PolymorphicShapeService; > > > import org.apache.axis2.jaxws.util.WSDL4JWrapper; > > > import org.apache.axis2.jaxws.util.WSDLWrapper; > > > import org.apache.axis2.jaxws.wsdl.SchemaReaderException; > > > import org.apache.axis2.jaxws.wsdl.impl.SchemaReaderImpl; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > import org.test.shape.Shape; > > > import org.test.shape.Square; > > > import org.test.shape.threed.ThreeDSquare; > > > > > > -public class PolymorphicTests extends AbstractTestCase { > > > - > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(PolymorphicTests.class)); > > > - } > > > +public class PolymorphicTests extends TestCase { > > > > > > public void testFormalAndActualTypeInDifferentPackages(){ > > > System.out.println("------------------------------"); > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/JAXBProviderTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/JAXBProviderTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/JAXBProviderTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/JAXBProviderTests.java Thu Feb 8 11:08:26 2007 > > > @@ -34,8 +34,6 @@ > > > import org.test.mtom.ObjectFactory; > > > import org.test.mtom.SendImage; > > > import org.test.mtom.SendImageResponse; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > > > > /** > > > * The intended purpose of this testcase is to test the MTOM functions in Axis2. > > > @@ -64,10 +62,6 @@ > > > private QName serviceName = new QName("http://ws.apache.org/axis2", "JAXBProviderService"); > > > DataSource stringDS, imageDS; > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(JAXBProviderTests.class)); > > > - } > > > - > > > protected void setUp() throws Exception { > > > super.setUp(); > > > > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/ProviderTestCase.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/ProviderTestCase.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/ProviderTestCase.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/ProviderTestCase.java Thu Feb 8 11:08:26 2007 > > > @@ -21,9 +21,8 @@ > > > import javax.xml.namespace.QName; > > > > > > import junit.framework.TestCase; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > -public abstract class ProviderTestCase extends AbstractTestCase { > > > +public abstract class ProviderTestCase extends TestCase { > > > > > > public QName portName = new QName("http://ws.apache.org/axis2", "SimpleProviderServiceSOAP11port0"); > > > public String providerResourceDir = "test-resources"+File.separator+"provider"; > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java Thu Feb 8 11:08:26 2007 > > > @@ -38,8 +38,6 @@ > > > import javax.xml.ws.soap.SOAPFaultException; > > > > > > import org.apache.axis2.jaxws.provider.soapmsg.SoapMessageProvider; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > > > > /** > > > * Tests Dispatch client and a Provider service. > > > @@ -83,11 +81,7 @@ > > > SoapMessageProvider.XML_WSE_REQUEST + > > > ""; > > > > > > - > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(SoapMessageProviderTests.class)); > > > - } > > > - > > > + > > > protected void setUp() throws Exception { > > > super.setUp(); > > > } > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SourceMessageProviderTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SourceMessageProviderTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SourceMessageProviderTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SourceMessageProviderTests.java Thu Feb 8 11:08:26 2007 > > > @@ -16,9 +16,6 @@ > > > */ > > > package org.apache.axis2.jaxws.provider; > > > > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > - > > > import java.io.File; > > > import java.io.FileInputStream; > > > import java.io.InputStream; > > > @@ -35,9 +32,6 @@ > > > private QName serviceName = new QName("http://ws.apache.org/axis2", "SourceMessageProviderService"); > > > private String xmlDir = "xml"; > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(SourceMessageProviderTests.class)); > > > - } > > > > > > protected void setUp() throws Exception { > > > super.setUp(); > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SourceProviderTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SourceProviderTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SourceProviderTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SourceProviderTests.java Thu Feb 8 11:08:26 2007 > > > @@ -16,9 +16,6 @@ > > > */ > > > package org.apache.axis2.jaxws.provider; > > > > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > - > > > import java.io.ByteArrayInputStream; > > > import java.io.File; > > > import java.io.FileInputStream; > > > @@ -44,9 +41,6 @@ > > > private QName serviceName = new QName("http://ws.apache.org/axis2", "SourceProviderService"); > > > private String xmlDir = "xml"; > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(SourceProviderTests.class)); > > > - } > > > > > > protected void setUp() throws Exception { > > > super.setUp(); > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/StringMessageProviderTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/StringMessageProviderTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/StringMessageProviderTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/StringMessageProviderTests.java Thu Feb 8 11:08:26 2007 > > > @@ -16,9 +16,6 @@ > > > */ > > > package org.apache.axis2.jaxws.provider; > > > > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > - > > > import javax.xml.namespace.QName; > > > import javax.xml.ws.Dispatch; > > > import javax.xml.ws.Service; > > > @@ -28,10 +25,6 @@ > > > String endpointUrl = "http://localhost:8080/axis2/services/StringMessageProviderService"; > > > String xmlString = "test input"; > > > private QName serviceName = new QName("http://ws.apache.org/axis2", "StringMessageProviderService"); > > > - > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(StringMessageProviderTests.class)); > > > - } > > > > > > protected void setUp() throws Exception { > > > super.setUp(); > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/StringProviderTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/StringProviderTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/StringProviderTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/StringProviderTests.java Thu Feb 8 11:08:26 2007 > > > @@ -16,9 +16,6 @@ > > > */ > > > package org.apache.axis2.jaxws.provider; > > > > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > - > > > import javax.xml.namespace.QName; > > > import javax.xml.soap.SOAPFault; > > > import javax.xml.ws.BindingProvider; > > > @@ -45,10 +42,6 @@ > > > super(name); > > > } > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(StringProviderTests.class)); > > > - } > > > - > > > private Dispatch getDispatch() { > > > Service svc = Service.create(serviceName); > > > svc.addPort(portName, null, endpointUrl); > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java Thu Feb 8 11:08:26 2007 > > > @@ -18,22 +18,24 @@ > > > */ > > > package org.apache.axis2.jaxws.proxy; > > > > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > -import org.apache.axis2.jaxws.proxy.gorilla_dlw.sei.GorillaInterface; > > > - > > > -import javax.xml.namespace.QName; > > > -import javax.xml.ws.BindingProvider; > > > -import javax.xml.ws.Dispatch; > > > -import javax.xml.ws.Service; > > > import java.io.File; > > > import java.net.MalformedURLException; > > > import java.net.URL; > > > import java.util.ArrayList; > > > import java.util.List; > > > > > > -public class GorillaDLWProxyTests extends AbstractTestCase { > > > +import javax.xml.bind.JAXBContext; > > > +import javax.xml.bind.JAXBElement; > > > +import javax.xml.bind.Marshaller; > > > +import javax.xml.namespace.QName; > > > +import javax.xml.ws.BindingProvider; > > > +import javax.xml.ws.Dispatch; > > > +import javax.xml.ws.Service; > > > + > > > +import junit.framework.TestCase; > > > +import org.apache.axis2.jaxws.proxy.gorilla_dlw.sei.GorillaInterface; > > > + > > > +public class GorillaDLWProxyTests extends TestCase { > > > > > > private QName serviceName = new QName( > > > "http://org.apache.axis2.jaxws.proxy.gorilla_dlw", "GorillaService"); > > > @@ -42,10 +44,6 @@ > > > "GorillaPort"); > > > private String wsdlLocation = System.getProperty("basedir",".")+"/"+"test/org/apache/axis2/jaxws/proxy/gorilla_dlw/META-INF/gorilla_dlw.wsdl"; > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(GorillaDLWProxyTests.class)); > > > - } > > > - > > > /** > > > * Utility method to get the proxy > > > * @return GorillaInterface proxy > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java Thu Feb 8 11:08:26 2007 > > > @@ -28,11 +28,8 @@ > > > import javax.xml.ws.Service; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.proxy.doclitnonwrapped.sei.DocLitnonWrappedProxy; > > > import org.apache.axis2.jaxws.proxy.doclitnonwrapped.sei.ProxyDocLitUnwrappedService; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > import org.test.proxy.doclitnonwrapped.Invoke; > > > import org.test.proxy.doclitnonwrapped.ObjectFactory; > > > import org.test.proxy.doclitnonwrapped.ReturnType; > > > @@ -41,7 +38,7 @@ > > > * This test cases will use proxy NON wrapped wsdl to invoke methods > > > * on a deployed Server Endpoint. > > > */ > > > -public class ProxyNonWrappedTests extends AbstractTestCase { > > > +public class ProxyNonWrappedTests extends TestCase { > > > > > > QName serviceName = new QName("http://doclitnonwrapped.proxy.test.org", "ProxyDocLitUnwrappedService"); > > > private String axisEndpoint = "http://localhost:8080/axis2/services/ProxyDocLitUnwrappedService"; > > > @@ -60,10 +57,6 @@ > > > // TODO Auto-generated constructor stub > > > } > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(ProxyNonWrappedTests.class)); > > > - } > > > - > > > public void testInvoke(){ > > > System.out.println("-----------------------------------"); > > > System.out.println("test: " + getName()); > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyTests.java Thu Feb 8 11:08:26 2007 > > > @@ -29,14 +29,11 @@ > > > import javax.xml.ws.Service; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.proxy.doclitwrapped.sei.DocLitWrappedProxy; > > > import org.apache.axis2.jaxws.proxy.doclitwrapped.sei.ProxyDocLitWrappedService; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > import org.test.proxy.doclitwrapped.ReturnType; > > > > > > -public class ProxyTests extends AbstractTestCase { > > > +public class ProxyTests extends TestCase { > > > private QName serviceName = new QName( > > > "http://doclitwrapped.proxy.test.org", "ProxyDocLitWrappedService"); > > > private String axisEndpoint = "http://localhost:8080/axis2/services/ProxyDocLitWrappedService"; > > > @@ -45,10 +42,6 @@ > > > private String wsdlLocation = System.getProperty("basedir",".")+"/"+"test/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl"; > > > private boolean runningOnAxis = true; > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(ProxyTests.class)); > > > - } > > > - > > > public void testMultipleServiceCalls(){ > > > try{ > > > if(!runningOnAxis){ > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java Thu Feb 8 11:08:26 2007 > > > @@ -34,15 +34,12 @@ > > > import javax.xml.ws.WebServiceException; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.proxy.rpclit.RPCLitImpl; > > > import org.apache.axis2.jaxws.proxy.rpclit.sei.RPCLit; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > import org.test.proxy.rpclit.ComplexAll; > > > import org.test.proxy.rpclit.Enum; > > > > > > -public class RPCProxyTests extends AbstractTestCase { > > > +public class RPCProxyTests extends TestCase { > > > > > > private QName serviceName = new QName( > > > "http://org.apache.axis2.jaxws.proxy.rpclit", "RPCLitService"); > > > @@ -51,10 +48,6 @@ > > > "RPCLit"); > > > private String wsdlLocation = System.getProperty("basedir",".")+"/"+"test/org/apache/axis2/jaxws/proxy/rpclit/META-INF/RPCLit.wsdl"; > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(RPCProxyTests.class)); > > > - } > > > - > > > /** > > > * Utility method to get the proxy > > > * @return RPCLit proxy > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java Thu Feb 8 11:08:26 2007 > > > @@ -22,18 +22,15 @@ > > > import javax.xml.ws.WebServiceException; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.proxy.soap12.Echo; > > > import org.apache.axis2.jaxws.proxy.soap12.SOAP12EchoService; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > /** > > > * A suite of tests to test dynamic proxy clients sending SOAP 1.2 > > > * requests. The endpoint can accept different keys to determine > > > * what it should send back. > > > */ > > > -public class SOAP12ProxyTests extends AbstractTestCase { > > > +public class SOAP12ProxyTests extends TestCase { > > > > > > private static final String SEND_SOAP11_RESPONSE = "RESPONSE-SOAP11"; > > > private static final String SEND_SOAP12_RESPONSE = "RESPONSE-SOAP12"; > > > @@ -42,10 +39,6 @@ > > > super(name); > > > } > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(SOAP12ProxyTests.class)); > > > - } > > > - > > > /** > > > * Send a SOAP 1.2 request and expect a SOAP 1.2 response. > > > */ > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersTests.java Thu Feb 8 11:08:26 2007 > > > @@ -21,20 +21,13 @@ > > > import javax.xml.ws.BindingProvider; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.sample.addnumbers.AddNumbersPortType; > > > import org.apache.axis2.jaxws.sample.addnumbers.AddNumbersService; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > -public class AddNumbersTests extends AbstractTestCase { > > > +public class AddNumbersTests extends TestCase { > > > > > > String axisEndpoint = "http://localhost:8080/axis2/services/AddNumbersService"; > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(AddNumbersTests.class)); > > > - } > > > - > > > public void testAddNumbers() { > > > try{ > > > System.out.println("----------------------------------"); > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddressBookTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddressBookTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddressBookTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddressBookTests.java Thu Feb 8 11:08:26 2007 > > > @@ -25,20 +25,17 @@ > > > import javax.xml.ws.soap.SOAPBinding; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.sample.addressbook.AddEntry; > > > import org.apache.axis2.jaxws.sample.addressbook.AddEntryResponse; > > > import org.apache.axis2.jaxws.sample.addressbook.AddressBook; > > > import org.apache.axis2.jaxws.sample.addressbook.AddressBookEntry; > > > import org.apache.axis2.jaxws.sample.addressbook.ObjectFactory; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > /** > > > * This tests the AddressBook same service that exists under > > > * org.apache.axis2.jaxws.sample.addressbook.* > > > */ > > > -public class AddressBookTests extends AbstractTestCase { > > > +public class AddressBookTests extends TestCase { > > > > > > private static final String NAMESPACE = "http://org/apache/axis2/jaxws/sample/addressbook"; > > > private static final QName QNAME_SERVICE = new QName( > > > @@ -47,10 +44,6 @@ > > > NAMESPACE, "AddressBook"); > > > private static final String URL_ENDPOINT = "http://localhost:8080/axis2/services/AddressBookService"; > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(AddressBookTests.class)); > > > - } > > > - > > > /** > > > * Test the endpoint by invoking it with a JAX-WS Dispatch. > > > */ > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/BareTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/BareTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/BareTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/BareTests.java Thu Feb 8 11:08:26 2007 > > > @@ -6,19 +6,12 @@ > > > import javax.xml.ws.BindingProvider; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.sample.doclitbare.sei.BareDocLitService; > > > import org.apache.axis2.jaxws.sample.doclitbare.sei.DocLitBarePortType; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > -public class BareTests extends AbstractTestCase { > > > - > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(BareTests.class)); > > > - } > > > - > > > - public void testTwoWaySync(){ > > > +public class BareTests extends TestCase { > > > + > > > + public void testTwoWaySync(){ > > > System.out.println("------------------------------"); > > > System.out.println("Test : "+getName()); > > > > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java Thu Feb 8 11:08:26 2007 > > > @@ -10,8 +10,6 @@ > > > import javax.xml.ws.soap.SOAPFaultException; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.sample.faultsservice.BaseFault_Exception; > > > import org.apache.axis2.jaxws.sample.faultsservice.ComplexFault_Exception; > > > import org.apache.axis2.jaxws.sample.faultsservice.DerivedFault1_Exception; > > > @@ -20,20 +18,15 @@ > > > import org.apache.axis2.jaxws.sample.faultsservice.FaultsServicePortType; > > > import org.apache.axis2.jaxws.sample.faultsservice.InvalidTickerFault_Exception; > > > import org.apache.axis2.jaxws.sample.faultsservice.SimpleFault; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > import org.test.polymorphicfaults.BaseFault; > > > import org.test.polymorphicfaults.ComplexFault; > > > import org.test.polymorphicfaults.DerivedFault1; > > > import org.test.polymorphicfaults.DerivedFault2; > > > > > > -public class FaultsServiceTests extends AbstractTestCase { > > > +public class FaultsServiceTests extends TestCase { > > > > > > String axisEndpoint = "http://localhost:8080/axis2/services/FaultsService"; > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(FaultsServiceTests.class)); > > > - } > > > - > > > /** > > > * Utility method to get the proxy > > > * @return proxy > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultyWebServiceTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultyWebServiceTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultyWebServiceTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultyWebServiceTests.java Thu Feb 8 11:08:26 2007 > > > @@ -14,24 +14,16 @@ > > > import javax.xml.ws.soap.SOAPFaultException; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.sample.faults.FaultyWebServiceFault_Exception; > > > import org.apache.axis2.jaxws.sample.faults.FaultyWebServicePortType; > > > import org.apache.axis2.jaxws.sample.faults.FaultyWebServiceService; > > > import org.apache.axis2.jaxws.sample.wrap.sei.DocLitWrap; > > > import org.apache.axis2.jaxws.sample.wrap.sei.DocLitWrapService; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > > > > import org.test.faults.FaultyWebServiceResponse; > > > > > > -public class FaultyWebServiceTests extends AbstractTestCase { > > > +public class FaultyWebServiceTests extends TestCase { > > > String axisEndpoint = "http://localhost:8080/axis2/services/FaultyWebServiceService"; > > > - > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(FaultyWebServiceTests.class)); > > > - } > > > - > > > public void testFaultyWebService(){ > > > FaultyWebServiceFault_Exception exception = null; > > > try{ > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleByteArrayTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleByteArrayTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleByteArrayTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleByteArrayTests.java Thu Feb 8 11:08:26 2007 > > > @@ -11,28 +11,21 @@ > > > import javax.xml.ws.soap.SOAPBinding; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > > > > import org.apache.axis2.jaxws.sample.mtom1.ImageDepot; > > > import org.apache.axis2.jaxws.sample.mtom1.ObjectFactory; > > > import org.apache.axis2.jaxws.sample.mtom1.Invoke; > > > import org.apache.axis2.jaxws.sample.mtom1.SendImageResponse; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > import org.w3._2005._05.xmlmime.Base64Binary; > > > > > > import com.sun.xml.bind.v2.runtime.unmarshaller.Base64Data; > > > > > > -public class MtomSampleByteArrayTests extends AbstractTestCase { > > > +public class MtomSampleByteArrayTests extends TestCase { > > > > > > private static final QName QNAME_SERVICE = new QName("urn://mtom1.sample.jaxws.axis2.apache.org", "SendImageService"); > > > private static final QName QNAME_PORT = new QName("urn://mtom1.sample.jaxws.axis2.apache.org", "sendImageSoap"); > > > private static final String URL_ENDPOINT = "http://localhost:8080/axis2/services/SendImageService"; > > > private static final String IMAGE_DIR = System.getProperty("basedir",".")+File.separator+"test-resources"+File.separator+"image"; > > > - > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(MtomSampleByteArrayTests.class)); > > > - } > > > > > > /* > > > * Enable attachment Optimization through the SOAPBinding method > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java Thu Feb 8 11:08:26 2007 > > > @@ -17,26 +17,19 @@ > > > import javax.xml.ws.soap.SOAPBinding; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.provider.DataSourceImpl; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > import org.test.mtom.ImageDepot; > > > import org.test.mtom.ObjectFactory; > > > import org.test.mtom.SendImage; > > > import org.test.mtom.SendImageResponse; > > > > > > -public class MtomSampleTests extends AbstractTestCase { > > > +public class MtomSampleTests extends TestCase { > > > > > > private static final QName QNAME_SERVICE = new QName("urn://mtom.test.org", "MtomSampleService"); > > > private static final QName QNAME_PORT = new QName("urn://mtom.test.org", "MtomSample"); > > > private static final String URL_ENDPOINT = "http://localhost:8080/axis2/services/MtomSampleService"; > > > private static final String IMAGE_DIR = System.getProperty("basedir",".")+"/"+"test-resources"+File.separator+"image"; > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(MtomSampleTests.class)); > > > - } > > > - > > > /* > > > * Enable attachment Optimization through the SOAPBinding method > > > * -- setMTOMEnabled([true|false]) > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/NonWrapTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/NonWrapTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/NonWrapTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/NonWrapTests.java Thu Feb 8 11:08:26 2007 > > > @@ -8,17 +8,14 @@ > > > import javax.xml.ws.Holder; > > > > > > import junit.framework.TestCase; > > > -import junit.framework.Test; > > > -import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.sample.nonwrap.sei.DocLitNonWrapPortType; > > > import org.apache.axis2.jaxws.sample.nonwrap.sei.DocLitNonWrapService; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > import org.test.sample.nonwrap.ObjectFactory; > > > import org.test.sample.nonwrap.ReturnType; > > > import org.test.sample.nonwrap.TwoWay; > > > import org.test.sample.nonwrap.TwoWayHolder; > > > > > > -public class NonWrapTests extends AbstractTestCase { > > > +public class NonWrapTests extends TestCase { > > > > > > > > > public NonWrapTests() { > > > @@ -34,10 +31,6 @@ > > > // TODO Auto-generated constructor stub > > > } > > > > > > - public static Test suite() { > > > - return getTestSetup(new TestSuite(NonWrapTests.class)); > > > - } > > > - > > > public void testTwoWaySync(){ > > > System.out.println("------------------------------"); > > > System.out.println("Test : "+getName()); > > > > > > Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/ParallelAsyncTests.java > > > URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/ParallelAsyncTests.java?view=diff&rev=505003&r1=505002&r2=505003 > > > ============================================================================== > > > --- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/ParallelAsyncTests.java (original) > > > +++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/ParallelAsyncTests.java Thu Feb 8 11:08:26 2007 > > > @@ -12,7 +12,6 @@ > > > import junit.framework.TestSuite; > > > import org.apache.axis2.jaxws.sample.parallelasync.server.AsyncPort; > > > import org.apache.axis2.jaxws.sample.parallelasync.server.AsyncService; > > > -import org.apache.axis2.jaxws.framework.AbstractTestCase; > > > import org.apache.log4j.BasicConfigurator; > > > import org.test.parallelasync.CustomAsyncResponse; > > > import org.test.parallelasync.SleepResponse; > > > @@ -23,7 +22,7 @@ > > > * > > > * ExecutionException tests are covered in jaxws.dispatch and jaxws.proxy > > > */ > > > -public class ParallelAsyncTests extends AbstractTestCase { > > > +public class ParallelAsyncTests extends TestCase { > > > > > > private static final String DOCLITWR_ASYNC_ENDPOINT = > > > "http://localhost:8080/axis2/services/AsyncService"; > > > @@ -34,7 +33,9 @@ > > > } > > > > > > public static Test suite() { > > > - return getTestSetup(new TestSuite(ParallelAsyncTests.class)); > > > + TestSuite suite = new TestSuite(ParallelAsyncTests.class); > > > + return suite; > > > + > > > } > > > > > > public void setUp() { > > > > > > > > > > > > --------------------------------------------------------------------- > > > To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org > > > For additional commands, e-mail: axis-cvs-help@ws.apache.org > > > > > > > > > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: axis-dev-unsubscribe@ws.apache.org > For additional commands, e-mail: axis-dev-help@ws.apache.org > > -- Davanum Srinivas :: http://wso2.org/ :: Oxygen for Web Services Developers --------------------------------------------------------------------- To unsubscribe, e-mail: axis-dev-unsubscribe@ws.apache.org For additional commands, e-mail: axis-dev-help@ws.apache.org