You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/03/08 18:15:05 UTC
svn commit: r516103 [7/11] - in /incubator/cxf/trunk: ./
common/common/src/test/java/org/apache/cxf/common/annotation/
common/common/src/test/java/org/apache/cxf/common/classloader/
common/common/src/test/java/org/apache/cxf/common/commands/ common/com...
Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java Thu Mar 8 09:14:44 2007
@@ -29,8 +29,6 @@
import org.w3c.dom.Element;
-import junit.framework.TestCase;
-
import org.apache.cxf.Bus;
import org.apache.cxf.service.model.BindingFaultInfo;
import org.apache.cxf.service.model.BindingMessageInfo;
@@ -44,13 +42,16 @@
import org.apache.neethi.Policy;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource;
/**
*
*/
-public class ExternalAttachmentProviderTest extends TestCase {
+public class ExternalAttachmentProviderTest extends Assert {
private static final QName TEST_ASSERTION_TYPE = new QName("http://a.b.c", "x");
@@ -62,12 +63,13 @@
private PolicyAttachment attachment;
private Collection<PolicyAttachment> attachments = new ArrayList<PolicyAttachment>();
-
+ @Before
public void setUp() {
eap = new ExternalAttachmentProvider();
control = EasyMock.createNiceControl();
}
+ @Test
public void testBasic() {
assertNull(eap.getLocation());
Resource uri = control.createMock(Resource.class);
@@ -76,6 +78,7 @@
}
+ @Test
public void testGetEffectiveFaultPolicy() {
BindingFaultInfo bfi = control.createMock(BindingFaultInfo.class);
setUpAttachment(bfi, false);
@@ -90,6 +93,7 @@
control.verify();
}
+ @Test
public void testGetEffectiveMessagePolicy() {
BindingMessageInfo bmi = control.createMock(BindingMessageInfo.class);
setUpAttachment(bmi, false);
@@ -104,6 +108,7 @@
control.verify();
}
+ @Test
public void testGetEffectiveOperationPolicy() {
BindingOperationInfo boi = control.createMock(BindingOperationInfo.class);
setUpAttachment(boi, false);
@@ -118,6 +123,7 @@
control.verify();
}
+ @Test
public void testGetEffectiveEndpointPolicy() {
EndpointInfo ei = control.createMock(EndpointInfo.class);
setUpAttachment(ei, false);
@@ -132,6 +138,7 @@
control.verify();
}
+ @Test
public void testGetEffectiveServicePolicy() {
ServiceInfo si = control.createMock(ServiceInfo.class);
setUpAttachment(si, false);
@@ -146,6 +153,7 @@
control.verify();
}
+ @Test
public void testReadDocumentNotExisting() throws MalformedURLException {
URL url = ExternalAttachmentProviderTest.class.getResource("resources/attachments1.xml");
String uri = url.toExternalForm();
@@ -159,6 +167,7 @@
}
}
+ @Test
public void testReadDocumentWithoutAttachmentElements() throws MalformedURLException {
URL url = ExternalAttachmentProviderTest.class.getResource("resources/attachments1.xml");
String uri = url.toExternalForm();
@@ -167,6 +176,7 @@
assertTrue(eap.getAttachments().isEmpty());
}
+ @Test
public void testReadDocumentAttachmentElementWithoutAppliesTo() throws MalformedURLException {
URL url = ExternalAttachmentProviderTest.class.getResource("resources/attachments2.xml");
String uri = url.toExternalForm();
@@ -175,6 +185,7 @@
assertTrue(eap.getAttachments().isEmpty());
}
+ @Test
public void testReadDocumentUnknownDomainExpression() throws MalformedURLException {
Bus bus = control.createMock(Bus.class);
eap = new ExternalAttachmentProvider(bus);
@@ -196,6 +207,7 @@
control.verify();
}
+ @Test
public void testReadDocumentEPRDomainExpression() throws MalformedURLException {
Bus bus = control.createMock(Bus.class);
eap = new ExternalAttachmentProvider(bus);
Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java Thu Mar 8 09:14:44 2007
@@ -22,8 +22,6 @@
import java.util.Collection;
import java.util.Collections;
-import junit.framework.TestCase;
-
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.service.model.BindingFaultInfo;
import org.apache.cxf.service.model.BindingMessageInfo;
@@ -33,18 +31,24 @@
import org.apache.neethi.Policy;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
/**
*
*/
-public class PolicyAttachmentTest extends TestCase {
+public class PolicyAttachmentTest extends Assert {
private IMocksControl control;
+
+ @Before
public void setUp() {
control = EasyMock.createNiceControl();
}
+ @Test
public void testBasic() {
PolicyAttachment pa = new PolicyAttachment();
assertNull(pa.getDomainExpressions());
@@ -59,6 +63,7 @@
assertSame(des, pa.getDomainExpressions());
}
+ @Test
public void testAppliesToService() {
ServiceInfo si1 = control.createMock(ServiceInfo.class);
ServiceInfo si2 = control.createMock(ServiceInfo.class);
@@ -75,6 +80,7 @@
control.verify();
}
+ @Test
public void testAppliesToEndpoint() {
EndpointInfo ei1 = control.createMock(EndpointInfo.class);
EndpointInfo ei2 = control.createMock(EndpointInfo.class);
@@ -91,6 +97,7 @@
control.verify();
}
+ @Test
public void testAppliesToOperation() {
BindingOperationInfo boi1 = control.createMock(BindingOperationInfo.class);
BindingOperationInfo boi2 = control.createMock(BindingOperationInfo.class);
@@ -107,6 +114,7 @@
control.verify();
}
+ @Test
public void testAppliesToMessage() {
BindingMessageInfo bmi1 = control.createMock(BindingMessageInfo.class);
BindingMessageInfo bmi2 = control.createMock(BindingMessageInfo.class);
@@ -123,6 +131,7 @@
control.verify();
}
+ @Test
public void testAppliesToFault() {
BindingFaultInfo bfi1 = control.createMock(BindingFaultInfo.class);
BindingFaultInfo bfi2 = control.createMock(BindingFaultInfo.class);
Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java Thu Mar 8 09:14:44 2007
@@ -30,26 +30,29 @@
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-import junit.framework.TestCase;
-
import org.apache.cxf.service.model.DescriptionInfo;
import org.apache.cxf.ws.policy.PolicyBuilder;
import org.apache.cxf.ws.policy.PolicyConstants;
import org.apache.neethi.Policy;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
/**
*
*/
-public class ReferenceResolverTest extends TestCase {
+public class ReferenceResolverTest extends Assert {
private IMocksControl control;
+ @Before
public void setUp() {
control = EasyMock.createNiceControl();
}
+ @Test
public void testLocalServiceModelReferenceResolver() {
DescriptionInfo di = control.createMock(DescriptionInfo.class);
PolicyBuilder builder = control.createMock(PolicyBuilder.class);
@@ -81,6 +84,7 @@
}
+ @Test
public void testLocalDocumentReferenceResolver() {
Document doc = control.createMock(Document.class);
PolicyBuilder builder = control.createMock(PolicyBuilder.class);
@@ -111,6 +115,7 @@
control.verify();
}
+ @Test
public void testRemoteReferenceResolver() {
URL url = ReferenceResolverTest.class.getResource("referring.wsdl");
Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java Thu Mar 8 09:14:44 2007
@@ -25,11 +25,6 @@
import javax.wsdl.WSDLException;
import javax.xml.namespace.QName;
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.cxf.Bus;
import org.apache.cxf.binding.BindingFactoryManager;
import org.apache.cxf.helpers.CastUtils;
@@ -55,11 +50,17 @@
import org.apache.neethi.util.PolicyComparator;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
/**
*
*/
-public class Wsdl11AttachmentPolicyProviderTest extends TestCase {
+public class Wsdl11AttachmentPolicyProviderTest extends Assert {
private static final String NAMESPACE_URI = "http://apache.org/cxf/calculator";
private static final QName OPERATION_NAME = new QName(NAMESPACE_URI, "add");
@@ -68,27 +69,9 @@
private Wsdl11AttachmentPolicyProvider app;
private String originalNamespace;
+
- public static Test suite() {
- TestSuite suite = new TestSuite(Wsdl11AttachmentPolicyProviderTest.class);
- TestSetup wrapper = new TestSetup(suite) {
-
- protected void setUp() {
- try {
- oneTimeSetUp();
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
-
- protected void tearDown() {
- oneTimeTearDown();
- }
- };
-
- return wrapper;
- }
-
+ @BeforeClass
public static void oneTimeSetUp() throws Exception {
IMocksControl control = EasyMock.createNiceControl();
@@ -124,12 +107,14 @@
}
+ @AfterClass
public static void oneTimeTearDown() {
endpoints = null;
services = null;
}
+ @Before
public void setUp() {
AssertionBuilderRegistry abr = new AssertionBuilderRegistryImpl();
AssertionBuilder ab = new XMLPrimitiveAssertionBuilder();
@@ -148,10 +133,13 @@
PolicyConstants.setNamespace(PolicyConstants.NAMESPACE_XMLSOAP_200409);
}
+
+ @After
public void tearDown() {
PolicyConstants.setNamespace(originalNamespace);
}
+ @Test
public void testElementPolicies() throws WSDLException {
Policy p;
@@ -190,6 +178,7 @@
assertTrue(app.getElementPolicy(ei).isEmpty());
}
+ @Test
public void testEffectiveServicePolicies() throws WSDLException {
Policy p;
@@ -232,6 +221,7 @@
assertTrue(PolicyComparator.compare(p, ep));
}
+ @Test
public void testEffectiveEndpointPolicies() {
Policy ep;
Policy p;
@@ -292,6 +282,7 @@
verifyAssertionsOnly(ep, 2);
}
+ @Test
public void testEffectiveBindingOperationPolicies() {
Policy ep;
@@ -323,6 +314,7 @@
verifyAssertionsOnly(ep, 3);
}
+ @Test
public void testEffectiveMessagePolicies() {
Policy ep;
@@ -362,6 +354,7 @@
verifyAssertionsOnly(ep, 3);
}
+ @Test
public void testResolveLocal() {
Policy ep;
@@ -380,6 +373,7 @@
}
}
+ @Test
public void testResolveExternal() {
// service has one extension of type PolicyReference, reference is external
Policy p = app.getElementPolicy(services[17]);
Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionTest.java Thu Mar 8 09:14:44 2007
@@ -26,8 +26,6 @@
import javax.xml.namespace.QName;
-import junit.framework.TestCase;
-
import org.apache.cxf.ws.policy.AssertionBuilderRegistry;
import org.apache.cxf.ws.policy.AssertionBuilderRegistryImpl;
import org.apache.cxf.ws.policy.PolicyBuilderImpl;
@@ -36,12 +34,16 @@
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyComponent;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
/**
*
*/
-public class NestedPrimitiveAssertionTest extends TestCase {
+public class NestedPrimitiveAssertionTest extends Assert {
private static final String TEST_NAMESPACE = "http://www.w3.org/2007/01/addressing/metadata";
private static final QName TEST_NAME1 = new QName(TEST_NAMESPACE, "Addressing");
@@ -52,6 +54,7 @@
private PolicyBuilderImpl builder;
+ @Before
public void setUp() {
AssertionBuilderRegistry abr = new AssertionBuilderRegistryImpl();
builder = new PolicyBuilderImpl();
@@ -74,10 +77,12 @@
PolicyConstants.setNamespace(PolicyConstants.NAMESPACE_XMLSOAP_200409);
}
+ @After
public void tearDown() {
PolicyConstants.setNamespace(originalNamespace);
}
+ @Test
public void testBuildNonNested() throws Exception {
String resource = "resources/compact1.xml";
InputStream is = NestedPrimitiveAssertionTest.class.getResourceAsStream(resource);
@@ -91,6 +96,7 @@
assertTrue(nested.isEmpty());
}
+ @Test
public void testBuildNested() throws Exception {
String resource = "resources/compact3.xml";
InputStream is = NestedPrimitiveAssertionTest.class.getResourceAsStream(resource);
@@ -118,6 +124,7 @@
*
* @throws Exception
*/
+ @Test
public void testNormalise() throws Exception {
int n = 6;
Modified: incubator/cxf/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/pom.xml?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/pom.xml (original)
+++ incubator/cxf/trunk/systests/pom.xml Thu Mar 8 09:14:44 2007
@@ -219,6 +219,22 @@
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java Thu Mar 8 09:14:44 2007
@@ -30,34 +30,32 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Holder;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.cxf.systest.common.ClientServerSetupBase;
-import org.apache.cxf.systest.common.ClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.hello_world_doc_lit_bare.PutLastTradedPricePortType;
import org.apache.hello_world_doc_lit_bare.SOAPService;
import org.apache.hello_world_doc_lit_bare.types.TradePriceData;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
-public class DOCBareClientServerTest extends ClientServerTestBase {
+public class DOCBareClientServerTest extends AbstractBusClientServerTestBase {
private final QName serviceName = new QName("http://apache.org/hello_world_doc_lit_bare",
"SOAPService");
private final QName portName = new QName("http://apache.org/hello_world_doc_lit_bare", "SoapPort");
+ @Before
public void setUp() {
System.setProperty("org.apache.cxf.bus.factory", "org.apache.cxf.bus.CXFBusFactory");
}
- public static Test suite() throws Exception {
- TestSuite suite = new TestSuite(DOCBareClientServerTest.class);
- return new ClientServerSetupBase(suite) {
- public void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
- }
- };
-
+
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("server did not launch correctly", launchServer(Server.class));
}
+ @Test
public void testBasicConnection() throws Exception {
URL wsdl = getClass().getResource("/wsdl/doc_lit_bare.wsdl");
assertNotNull("WSDL is null", wsdl);
@@ -85,6 +83,7 @@
}
+ @Test
public void testAnnotation() throws Exception {
Class<PutLastTradedPricePortType> claz = PutLastTradedPricePortType.class;
TradePriceData priceData = new TradePriceData();
@@ -105,19 +104,6 @@
}
}
- public static void main(String[] args) {
- junit.textui.TestRunner.run(DOCBareClientServerTest.class);
- }
-
- /*
- * public static void main(String[] args) { ClientServerTest cst = new
- * ClientServerTest(); if ("client".equals(args[0])) { try {
- * cst.testAsyncPollingCall(); } catch (Exception ex) {
- * ex.printStackTrace(); } System.err.println("Exiting...........");
- * System.exit(0); } else if ("server".equals(args[0])) { try { //
- * cst.setUp(); cst.onetimeSetUp(); } catch (Exception ex) {
- * ex.printStackTrace(); } } else { System.out.println("Invaid arg"); } }
- */
}
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/Server.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/Server.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/Server.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/Server.java Thu Mar 8 09:14:44 2007
@@ -27,9 +27,9 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Endpoint;
-import org.apache.cxf.systest.common.TestServerBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends TestServerBase {
+public class Server extends AbstractBusTestServerBase {
protected void run() {
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java Thu Mar 8 09:14:44 2007
@@ -19,8 +19,6 @@
package org.apache.cxf.systest.bus;
-import junit.framework.TestCase;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.binding.BindingFactoryManager;
@@ -33,9 +31,12 @@
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.workqueue.WorkQueueManager;
import org.apache.cxf.wsdl.WSDLManager;
+import org.junit.Assert;
+import org.junit.Test;
-public class SpringBusFactoryTest extends TestCase {
+public class SpringBusFactoryTest extends Assert {
+ @Test
public void testKnownExtensions() throws BusException {
Bus bus = new SpringBusFactory().createBus();
assertNotNull(bus);
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/callback/CallbackClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/callback/CallbackClientServerTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/callback/CallbackClientServerTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/callback/CallbackClientServerTest.java Thu Mar 8 09:14:44 2007
@@ -24,19 +24,17 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Endpoint;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.callback.SOAPService;
import org.apache.callback.ServerPortType;
-import org.apache.cxf.systest.common.ClientServerSetupBase;
-import org.apache.cxf.systest.common.ClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl.EndpointReferenceUtils;
+import org.junit.BeforeClass;
+import org.junit.Test;
-public class CallbackClientServerTest extends ClientServerTestBase {
+public class CallbackClientServerTest extends AbstractBusClientServerTestBase {
private static final QName SERVICE_NAME
= new QName("http://apache.org/callback", "SOAPService");
private static final QName SERVICE_NAME_CALLBACK
@@ -51,17 +49,13 @@
private static final QName PORT_TYPE_CALLBACK
= new QName("http://apache.org/callback", "CallbackPortType");
- public static Test suite() throws Exception {
- TestSuite suite = new TestSuite(CallbackClientServerTest.class);
- return new ClientServerSetupBase(suite) {
- public void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
- }
- };
-
-
+
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("server did not launch correctly", launchServer(Server.class));
}
+ @Test
public void testCallback() throws Exception {
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/callback/Server.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/callback/Server.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/callback/Server.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/callback/Server.java Thu Mar 8 09:14:44 2007
@@ -22,9 +22,9 @@
import javax.xml.ws.Endpoint;
-import org.apache.cxf.systest.common.TestServerBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends TestServerBase {
+public class Server extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new ServerImpl();
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java Thu Mar 8 09:14:44 2007
@@ -38,25 +38,24 @@
import org.xml.sax.InputSource;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.cxf.helpers.XMLUtils;
-import org.apache.cxf.systest.common.ClientServerSetupBase;
-import org.apache.cxf.systest.common.ClientServerTestBase;
-import org.apache.cxf.systest.common.TestServerBase;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.apache.hello_world_soap_http.SOAPService;
import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
+import org.junit.BeforeClass;
+import org.junit.Test;
-public class DispatchClientServerTest extends ClientServerTestBase {
+public class DispatchClientServerTest extends AbstractBusClientServerTestBase {
private final QName serviceName = new QName("http://apache.org/hello_world_soap_http",
"SOAPDispatchService");
private final QName portName = new QName("http://apache.org/hello_world_soap_http", "SoapDispatchPort");
- public static class Server extends TestServerBase {
+ public static class Server extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new GreeterImpl();
@@ -78,15 +77,12 @@
}
}
- public static Test suite() throws Exception {
- TestSuite suite = new TestSuite(DispatchClientServerTest.class);
- return new ClientServerSetupBase(suite) {
- public void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
- }
- };
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("server did not launch correctly", launchServer(Server.class));
}
+ @Test
public void testSOAPMessage() throws Exception {
URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
@@ -142,6 +138,7 @@
}
+ @Test
public void testDOMSourceMESSAGE() throws Exception {
/*URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
assertNotNull(wsdl);
@@ -204,6 +201,7 @@
assertEquals("Response should be : Hello TestSOAPInputMessage3", expected3, tdsh.getReplyBuffer());
}
+ @Test
public void testDOMSourcePAYLOAD() throws Exception {
/*URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
assertNotNull(wsdl);
@@ -263,6 +261,7 @@
assertEquals("Response should be : Hello TestSOAPInputMessage3", expected3, tdsh.getReplyBuffer());
}
+ @Test
public void testJAXBObjectPAYLOAD() throws Exception {
URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
assertNotNull(wsdl);
@@ -303,6 +302,7 @@
assertTrue("Expected string, " + expected, expected.equals(responseValue3));
}
+ @Test
public void testSAXSourceMESSAGE() throws Exception {
URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
@@ -358,6 +358,7 @@
assertTrue("Expected: " + expected, XMLUtils.toString(saxSourceResp3).contains(expected3));
}
+ @Test
public void testSAXSourcePAYLOAD() throws Exception {
URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
@@ -414,6 +415,7 @@
assertTrue("Expected: " + expected, XMLUtils.toString(saxSourceResp3).contains(expected3));
}
+ @Test
public void testStreamSourceMESSAGE() throws Exception {
URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
assertNotNull(wsdl);
@@ -460,6 +462,7 @@
assertTrue("Expected: " + expected, XMLUtils.toString(streamSourceResp3).contains(expected3));
}
+ @Test
public void testStreamSourcePAYLOAD() throws Exception {
URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchXMLClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchXMLClientServerTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchXMLClientServerTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchXMLClientServerTest.java Thu Mar 8 09:14:44 2007
@@ -33,23 +33,21 @@
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.cxf.helpers.XMLUtils;
-import org.apache.cxf.systest.common.ClientServerSetupBase;
-import org.apache.cxf.systest.common.ClientServerTestBase;
-import org.apache.cxf.systest.common.TestServerBase;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.hello_world_xml_http.wrapped.GreeterImpl;
import org.apache.hello_world_xml_http.wrapped.XMLService;
+import org.junit.BeforeClass;
+import org.junit.Test;
-public class DispatchXMLClientServerTest extends ClientServerTestBase {
+public class DispatchXMLClientServerTest extends AbstractBusClientServerTestBase {
private final QName serviceName = new QName("http://apache.org/hello_world_xml_http/wrapped",
"XMLService");
private final QName portName = new QName("http://apache.org/hello_world_xml_http/wrapped",
"XMLDispatchPort");
- public static class Server extends TestServerBase {
+ public static class Server extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new GreeterImpl();
@@ -71,15 +69,12 @@
}
}
- public static Test suite() throws Exception {
- TestSuite suite = new TestSuite(DispatchXMLClientServerTest.class);
- return new ClientServerSetupBase(suite) {
- public void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
- }
- };
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("server did not launch correctly", launchServer(Server.class));
}
+ @Test
public void testStreamSourceMESSAGE() throws Exception {
/*URL wsdl = getClass().getResource("/wsdl/hello_world_xml_wrapped.wsdl");
assertNotNull(wsdl);
@@ -105,6 +100,7 @@
assertEquals("Hello tli", doc.getFirstChild().getTextContent());
}
+ @Test
public void testDOMSourcePAYLOAD() throws Exception {
URL wsdl = getClass().getResource("/wsdl/hello_world_xml_wrapped.wsdl");
assertNotNull(wsdl);
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java Thu Mar 8 09:14:44 2007
@@ -38,25 +38,26 @@
import javax.xml.ws.handler.LogicalMessageContext;
import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.handler.PortInfo;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.cxf.BusException;
import org.apache.cxf.common.util.PackageUtils;
-import org.apache.cxf.systest.common.ClientServerSetupBase;
-import org.apache.cxf.systest.common.ClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.handler_test.HandlerTest;
import org.apache.handler_test.HandlerTestService;
import org.apache.handler_test.PingException;
import org.apache.handler_test.types.PingOneWay;
import org.apache.handler_test.types.PingResponse;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
-public class HandlerInvocationTest extends ClientServerTestBase {
+public class HandlerInvocationTest extends AbstractBusClientServerTestBase {
private final QName serviceName = new QName("http://apache.org/handler_test",
"HandlerTestService");
@@ -66,31 +67,26 @@
private HandlerTestService service;
private HandlerTest handlerTest;
- public static Test suite() throws Exception {
- TestSuite suite = new TestSuite(HandlerInvocationTest.class);
- return new ClientServerSetupBase(suite) {
- public void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
- }
- };
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("server did not launch correctly", launchServer(Server.class));
}
+ @Before
public void setUp() throws BusException {
try {
- super.setUp();
+ super.createBus();
wsdl = HandlerInvocationTest.class.getResource("/wsdl/handler_test.wsdl");
service = new HandlerTestService(wsdl, serviceName);
handlerTest = service.getPort(portName, HandlerTest.class);
- if (!"testHandlersInvoked".equals(getName())) {
- //addHandlersToChain((BindingProvider)handlerTest, new TestStreamHandler(false));
- }
} catch (Exception ex) {
ex.printStackTrace();
fail(ex.toString());
}
}
+ @Test
public void testLogicalHandlerOneWay() {
TestHandler<LogicalMessageContext> handler1 = new TestHandler<LogicalMessageContext>(false);
TestHandler<LogicalMessageContext> handler2 = new TestHandler<LogicalMessageContext>(false);
@@ -102,6 +98,7 @@
assertEquals(1, handler2.getHandleMessageInvoked());
}
+ @Test
public void testAddHandlerThroughHandlerResolverClientSide() {
TestHandler<LogicalMessageContext> handler1 = new TestHandler<LogicalMessageContext>(false);
TestHandler<LogicalMessageContext> handler2 = new TestHandler<LogicalMessageContext>(false);
@@ -118,7 +115,9 @@
assertEquals(1, handler2.getHandleMessageInvoked());
}
- public void xtestLogicalHandlerTwoWay() throws Exception {
+ @Test
+ @Ignore
+ public void testLogicalHandlerTwoWay() throws Exception {
TestHandler<LogicalMessageContext> handler1 = new TestHandler<LogicalMessageContext>(false);
TestHandler<LogicalMessageContext> handler2 = new TestHandler<LogicalMessageContext>(false);
addHandlersToChain((BindingProvider)handlerTest, handler1, handler2);
@@ -129,6 +128,7 @@
assertEquals(2, handler2.getHandleMessageInvoked());
}
+ @Test
public void testLogicalHandlerStopProcessingClientSide() throws Exception {
final String clientHandlerMessage = "handler2 client side";
@@ -171,9 +171,10 @@
//assertTrue("close must be called", handler2.isCloseInvoked());
}
+ @Test
+ @Ignore
public void testLogicalHandlerStopProcessingServerSide() throws PingException {
//TODO: Following are commented out due to CXF-332
- /*
String[] expectedHandlers = {"soapHandler4", "soapHandler3", "handler2",
"soapHandler3", "soapHandler4"};
@@ -194,10 +195,9 @@
for (String expected : expectedHandlers1) {
assertEquals(expected, resp.get(i++));
}
- */
}
- //TODO: commented out due to CXF-333
+ @Test
public void testLogicalHandlerThrowsProtocolExceptionClientSide() throws Exception {
final String clientHandlerMessage = "handler1 client side";
@@ -225,7 +225,9 @@
}
//TODO: commented out due to CXF-333
- public void xtestLogicalHandlerThrowsProtocolExceptionServerSide() throws PingException {
+ @Test
+ @Ignore
+ public void testLogicalHandlerThrowsProtocolExceptionServerSide() throws PingException {
try {
handlerTest.pingWithArgs("handler2 inbound throw javax.xml.ws.ProtocolException");
fail("did not get expected exception");
@@ -234,7 +236,9 @@
}
}
- public void xtestLogicalHandlerHandlerFault() {
+ @Test
+ @Ignore
+ public void testLogicalHandlerHandlerFault() {
TestHandler<LogicalMessageContext> handler1 = new TestHandler<LogicalMessageContext>(false);
TestHandler<LogicalMessageContext> handler2 = new TestHandler<LogicalMessageContext>(false);
@@ -254,6 +258,7 @@
}
//TODO: Commented out due to CXF-334
+ @Test
public void testHandlersInvoked() throws Exception {
TestHandler<LogicalMessageContext> handler1 = new TestHandler<LogicalMessageContext>(false);
TestHandler<LogicalMessageContext> handler2 = new TestHandler<LogicalMessageContext>(false);
@@ -298,7 +303,8 @@
}
-/*
+ @Test
+ @Ignore
public void testDescription() throws PingException {
TestHandler<LogicalMessageContext> handler = new TestHandler<LogicalMessageContext>(false) {
public boolean handleMessage(LogicalMessageContext ctx) {
@@ -316,29 +322,21 @@
return true;
}
};
- TestStreamHandler streamHandler = new TestStreamHandler(false) {
- public boolean handleMessage(StreamMessageContext ctx) {
- super.handleMessage(ctx);
- assertTrue("wsdl description not found or invalid",
- isValidWsdlDescription(ctx.get(MessageContext.WSDL_DESCRIPTION)));
- return false;
- }
- };
+
- addHandlersToChain((BindingProvider)handlerTest, handler, soapHandler, streamHandler);
+ addHandlersToChain((BindingProvider)handlerTest, handler, soapHandler);
List<String> resp = handlerTest.ping();
assertNotNull(resp);
assertEquals("handler was not invoked", 2, handler.getHandleMessageInvoked());
assertEquals("handle message was not invoked", 2, soapHandler.getHandleMessageInvoked());
- assertEquals("handler was not invoked", 1, streamHandler.getHandleMessageInvoked());
assertTrue("close must be called", handler.isCloseInvoked());
assertTrue("close must be called", soapHandler.isCloseInvoked());
- assertTrue("close must be called", streamHandler.isCloseInvoked());
}
- */
+
+ @Test
public void testHandlersInvokedForDispatch() throws Exception {
Dispatch<SOAPMessage> disp = service.createDispatch(portName,
@@ -430,11 +428,9 @@
}
- /*
private boolean isValidWsdlDescription(Object wsdlDescription) {
return (wsdlDescription != null)
&& ((wsdlDescription instanceof java.net.URI)
|| (wsdlDescription instanceof java.net.URL));
}
- */
}
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java Thu Mar 8 09:14:44 2007
@@ -31,34 +31,30 @@
import javax.xml.ws.Service;
import javax.xml.ws.handler.Handler;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.resource.ResourceManager;
-import org.apache.cxf.systest.common.ClientServerSetupBase;
-import org.apache.cxf.systest.common.ClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.handlers.AddNumbers;
import org.apache.handlers.AddNumbersService;
import org.apache.handlers.types.AddNumbersResponse;
import org.apache.handlers.types.ObjectFactory;
+import org.junit.BeforeClass;
+import org.junit.Test;
-public class HandlerInvocationUsingAddNumbersTest extends ClientServerTestBase {
+public class HandlerInvocationUsingAddNumbersTest extends AbstractBusClientServerTestBase {
static QName serviceName = new QName("http://apache.org/handlers", "AddNumbersService");
static QName portName = new QName("http://apache.org/handlers", "AddNumbersPort");
- public static Test suite() throws Exception {
- TestSuite suite = new TestSuite(HandlerInvocationUsingAddNumbersTest.class);
- return new ClientServerSetupBase(suite) {
- public void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(HandlerServer.class));
- }
- };
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("server did not launch correctly", launchServer(HandlerServer.class));
}
+ @Test
public void testAddHandlerProgrammaticallyClientSide() throws Exception {
URL wsdl = getClass().getResource("/wsdl/addNumbers.wsdl");
@@ -74,6 +70,7 @@
assertEquals(11, result1);
}
+ @Test
public void testAddHandlerByAnnotationClientSide() throws Exception {
URL wsdl = getClass().getResource("/wsdl/addNumbers.wsdl");
@@ -86,6 +83,7 @@
assertEquals(11, result1);
}
+ @Test
public void testInvokeFromDispatchWithJAXBPayload() throws Exception {
URL wsdl = getClass().getResource("/wsdl/addNumbers.wsdl");
assertNotNull(wsdl);
@@ -111,6 +109,7 @@
assertEquals(200, value.getReturn());
}
+ @Test
public void testHandlerPostConstruct() throws Exception {
URL wsdl = getClass().getResource("/wsdl/addNumbers.wsdl");
@@ -123,6 +122,7 @@
assertTrue(h.isPostConstructInvoked());
}
+ @Test
public void testHandlerInjectingResource() throws Exception {
//When CXF is deployed in a servlet container, ServletContextResourceResolver is used to resolve
//Servlet context resources.
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerServer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerServer.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerServer.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerServer.java Thu Mar 8 09:14:44 2007
@@ -20,9 +20,9 @@
import javax.xml.ws.Endpoint;
-import org.apache.cxf.systest.common.TestServerBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class HandlerServer extends TestServerBase {
+public class HandlerServer extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new AddNumbersImpl();
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/Server.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/Server.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/Server.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/Server.java Thu Mar 8 09:14:44 2007
@@ -24,9 +24,9 @@
import javax.xml.ws.Endpoint;
// import javax.xml.ws.handler.Handler;
-import org.apache.cxf.systest.common.TestServerBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends TestServerBase {
+public class Server extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new HandlerTestImpl();
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TrivialSOAPHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TrivialSOAPHandlerTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TrivialSOAPHandlerTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TrivialSOAPHandlerTest.java Thu Mar 8 09:14:44 2007
@@ -23,22 +23,21 @@
import javax.xml.ws.Endpoint;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.cxf.greeter_control.Greeter;
import org.apache.cxf.greeter_control.GreeterService;
-import org.apache.cxf.systest.common.ClientServerSetupBase;
-import org.apache.cxf.systest.common.TestServerBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
+import org.junit.BeforeClass;
+import org.junit.Test;
/**
* Tests the use of a SOAPHandler which does not use the underlying SOAP message but simply
* returns true instead.
*/
-public class TrivialSOAPHandlerTest extends TestCase {
+public class TrivialSOAPHandlerTest extends AbstractClientServerTestBase {
- public static class Server extends TestServerBase {
+ public static class Server extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new TrivialSOAPHandlerAnnotatedGreeterImpl();
@@ -60,16 +59,14 @@
}
}
- public static Test suite() throws Exception {
- TestSuite suite = new TestSuite(TrivialSOAPHandlerTest.class);
- return new ClientServerSetupBase(suite) {
- public void startServers() throws Exception {
- assertTrue("server did not launch correctly",
- launchServer(Server.class));
- }
- };
+
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("server did not launch correctly",
+ launchServer(Server.class));
}
+ @Test
public void testInvocation() throws Exception {
GreeterService service = new GreeterService();
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseNoWsdlTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseNoWsdlTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseNoWsdlTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseNoWsdlTest.java Thu Mar 8 09:14:44 2007
@@ -21,26 +21,24 @@
import java.lang.reflect.UndeclaredThrowableException;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.cxf.greeter_control.Greeter;
import org.apache.cxf.greeter_control.GreeterService;
-import org.apache.cxf.systest.common.ClientServerSetupBase;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
-public class ClientServerGreeterBaseNoWsdlTest extends TestCase {
+public class ClientServerGreeterBaseNoWsdlTest extends AbstractBusClientServerTestBase {
- public static Test suite() throws Exception {
- TestSuite suite = new TestSuite(ClientServerGreeterBaseNoWsdlTest.class);
- return new ClientServerSetupBase(suite) {
- public void startServers() throws Exception {
- assertTrue("server did not launch correctly",
- launchServer(ServerGreeterBaseNoWsdl.class));
- }
- };
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("server did not launch correctly",
+ launchServer(ServerGreeterBaseNoWsdl.class));
}
+ @Test
+ @Ignore
public void testInvocation() throws Exception {
GreeterService service = new GreeterService();
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseTest.java Thu Mar 8 09:14:44 2007
@@ -21,26 +21,22 @@
import java.lang.reflect.UndeclaredThrowableException;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.cxf.greeter_control.Greeter;
import org.apache.cxf.greeter_control.GreeterService;
-import org.apache.cxf.systest.common.ClientServerSetupBase;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.junit.BeforeClass;
+import org.junit.Test;
-public class ClientServerGreeterBaseTest extends TestCase {
+public class ClientServerGreeterBaseTest extends AbstractBusClientServerTestBase {
- public static Test suite() throws Exception {
- TestSuite suite = new TestSuite(ClientServerGreeterBaseTest.class);
- return new ClientServerSetupBase(suite) {
- public void startServers() throws Exception {
- assertTrue("server did not launch correctly",
- launchServer(ServerGreeterBase.class));
- }
- };
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("server did not launch correctly",
+ launchServer(ServerGreeterBase.class));
}
+ @Test
public void testInvocation() throws Exception {
GreeterService service = new GreeterService();
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java Thu Mar 8 09:14:44 2007
@@ -21,26 +21,24 @@
import java.lang.reflect.UndeclaredThrowableException;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.cxf.greeter_control.Greeter;
import org.apache.cxf.greeter_control.GreeterService;
-import org.apache.cxf.systest.common.ClientServerSetupBase;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
-public class ClientServerGreeterNoWsdlTest extends TestCase {
+public class ClientServerGreeterNoWsdlTest extends AbstractBusClientServerTestBase {
- public static Test suite() throws Exception {
- TestSuite suite = new TestSuite(ClientServerGreeterNoWsdlTest.class);
- return new ClientServerSetupBase(suite) {
- public void startServers() throws Exception {
- assertTrue("server did not launch correctly",
- launchServer(ServerGreeterNoWsdl.class));
- }
- };
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("server did not launch correctly",
+ launchServer(ServerGreeterNoWsdl.class));
}
+ @Test
+ @Ignore
public void testInvocation() throws Exception {
GreeterService service = new GreeterService();
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java Thu Mar 8 09:14:44 2007
@@ -24,9 +24,6 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Holder;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.cxf.anonymous_complex_type.AnonymousComplexType;
import org.apache.cxf.anonymous_complex_type.AnonymousComplexTypeService;
import org.apache.cxf.anonymous_complex_type.SplitName;
@@ -37,23 +34,21 @@
import org.apache.cxf.ordered_param_holder.ComplexStruct;
import org.apache.cxf.ordered_param_holder.OrderedParamHolder;
import org.apache.cxf.ordered_param_holder.OrderedParamHolder_Service;
-import org.apache.cxf.systest.common.ClientServerSetupBase;
-import org.apache.cxf.systest.common.ClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.junit.BeforeClass;
+import org.junit.Test;
-public class ClientServerMiscTest extends ClientServerTestBase {
+public class ClientServerMiscTest extends AbstractBusClientServerTestBase {
private final QName portName = new QName("http://cxf.apache.org/anonymous_complex_type/",
"anonymous_complex_typeSOAP");
- public static Test suite() throws Exception {
- TestSuite suite = new TestSuite(ClientServerMiscTest.class);
- return new ClientServerSetupBase(suite) {
- public void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(ServerMisc.class));
- }
- };
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("server did not launch correctly", launchServer(ServerMisc.class));
}
+ @Test
public void testAnonymousComplexType() throws Exception {
AnonymousComplexTypeService actService = new AnonymousComplexTypeService();
@@ -70,6 +65,7 @@
}
}
+ @Test
public void testRefAnonymousComplexType() throws Exception {
AnonymousComplexTypeService actService = new AnonymousComplexTypeService();
@@ -88,6 +84,7 @@
}
}
+ @Test
public void testMinOccursAndNillableJAXBElement() throws Exception {
JaxbElementTest_Service service = new JaxbElementTest_Service();
@@ -109,6 +106,7 @@
}
}
+ @Test
public void testOrderedParamHolder() throws Exception {
OrderedParamHolder_Service service = new OrderedParamHolder_Service();
OrderedParamHolder port = service.getOrderedParamHolderSOAP();
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMixedStyleTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMixedStyleTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMixedStyleTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMixedStyleTest.java Thu Mar 8 09:14:44 2007
@@ -23,30 +23,26 @@
import javax.xml.namespace.QName;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.apache.cxf.systest.common.ClientServerSetupBase;
+import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
import org.apache.hello_world_mixedstyle.Greeter;
import org.apache.hello_world_mixedstyle.SOAPService;
import org.apache.hello_world_mixedstyle.types.GreetMe1;
import org.apache.hello_world_mixedstyle.types.GreetMeResponse;
+import org.junit.BeforeClass;
+import org.junit.Test;
-public class ClientServerMixedStyleTest extends TestCase {
+public class ClientServerMixedStyleTest extends AbstractClientServerTestBase {
private final QName portName = new QName("http://apache.org/hello_world_mixedstyle", "SoapPort");
-
- public static Test suite() throws Exception {
- TestSuite suite = new TestSuite(ClientServerMixedStyleTest.class);
- return new ClientServerSetupBase(suite) {
- public void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(ServerMixedStyle.class));
- }
- };
+
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("server did not launch correctly", launchServer(ServerMixedStyle.class));
}
+ @Test
public void testMixedStyle() throws Exception {
SOAPService service = new SOAPService();
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java Thu Mar 8 09:14:44 2007
@@ -24,23 +24,21 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Endpoint;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.apache.cxf.systest.common.ClientServerSetupBase;
-import org.apache.cxf.systest.common.TestServerBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
import org.apache.hello_world_rpclit.GreeterRPCLit;
import org.apache.hello_world_rpclit.SOAPServiceRPCLit;
import org.apache.hello_world_rpclit.types.MyComplexStruct;
import org.apache.hello_world_soap_http.RPCLitGreeterImpl;
+import org.junit.BeforeClass;
+import org.junit.Test;
-public class ClientServerRPCLitTest extends TestCase {
+public class ClientServerRPCLitTest extends AbstractClientServerTestBase {
private final QName portName = new QName("http://apache.org/hello_world_rpclit", "SoapPortRPCLit");
- public static class Server extends TestServerBase {
+ public static class Server extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new RPCLitGreeterImpl();
@@ -61,15 +59,12 @@
}
}
- public static Test suite() throws Exception {
- TestSuite suite = new TestSuite(ClientServerRPCLitTest.class);
- return new ClientServerSetupBase(suite) {
- public void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
- }
- };
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("server did not launch correctly", launchServer(Server.class));
}
+ @Test
public void testBasicConnection() throws Exception {
SOAPServiceRPCLit service = new SOAPServiceRPCLit();
@@ -94,6 +89,7 @@
}
}
+ @Test
public void testComplexType() throws Exception {
SOAPServiceRPCLit service = new SOAPServiceRPCLit();
assertNotNull(service);
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java Thu Mar 8 09:14:44 2007
@@ -42,9 +42,6 @@
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
//import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.Soap11;
//import org.apache.cxf.bus.spring.SpringBusFactory;
@@ -52,8 +49,7 @@
import org.apache.cxf.helpers.XPathUtils;
//import org.apache.cxf.jaxws.ServiceImpl;
import org.apache.cxf.message.Message;
-import org.apache.cxf.systest.common.ClientServerSetupBase;
-import org.apache.cxf.systest.common.ClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.hello_world_soap_http.BadRecordLitFault;
import org.apache.hello_world_soap_http.DocLitBare;
import org.apache.hello_world_soap_http.Greeter;
@@ -62,8 +58,11 @@
import org.apache.hello_world_soap_http.SOAPServiceDocLitBare;
import org.apache.hello_world_soap_http.types.BareDocumentResponse;
import org.apache.hello_world_soap_http.types.GreetMeLaterResponse;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
-public class ClientServerTest extends ClientServerTestBase {
+public class ClientServerTest extends AbstractBusClientServerTestBase {
private final QName serviceName = new QName("http://apache.org/hello_world_soap_http",
"SOAPService");
@@ -77,22 +76,17 @@
private final QName portName1 = new QName("http://apache.org/hello_world_soap_http",
"SoapPort2");
- public static Test suite() throws Exception {
- TestSuite suite = new TestSuite(ClientServerTest.class);
- return new ClientServerSetupBase(suite) {
- public void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
- }
- public void setUp() throws Exception {
- // set up configuration to enable schema validation
- URL url = getClass().getResource("fault-stack-trace.xml");
- assertNotNull("cannot find test resource", url);
- configFileName = url.toString();
- super.setUp();
- }
- };
+ @BeforeClass
+ public static void startServers() throws Exception {
+ // set up configuration to enable schema validation
+ URL url = ClientServerTest.class.getResource("fault-stack-trace.xml");
+ assertNotNull("cannot find test resource", url);
+ defaultConfigFileName = url.toString();
+
+ assertTrue("server did not launch correctly", launchServer(Server.class));
}
+ @Test
public void testBasicConnection() throws Exception {
SOAPService service = new SOAPService();
@@ -116,6 +110,7 @@
assertEquals(200, responseCode.intValue());
}
+ @Test
public void testNillable() throws Exception {
SOAPService service = new SOAPService();
assertNotNull(service);
@@ -133,6 +128,7 @@
}
+ @Test
public void testAddPort() throws Exception {
Service service = Service.create(serviceName);
service.addPort(fakePortName, "http://schemas.xmlsoap.org/soap/",
@@ -150,6 +146,7 @@
}
}
+ @Test
public void testGetPortOnePara() throws Exception {
Service service = Service.create(serviceName);
@@ -167,6 +164,7 @@
}
}
+ @Test
public void testDocLitBareConnection() throws Exception {
SOAPServiceDocLitBare service = new SOAPServiceDocLitBare();
@@ -184,6 +182,7 @@
}
}
+ @Test
public void testBasicConnectionAndOneway() throws Exception {
URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
assertNotNull(wsdl);
@@ -217,7 +216,9 @@
}
- public void xtestBasicConnection2() throws Exception {
+ @Test
+ @Ignore
+ public void testBasicConnection2() throws Exception {
URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
assertNotNull(wsdl);
@@ -250,6 +251,7 @@
}
}
+ @Test
public void testAsyncPollingCall() throws Exception {
URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
assertNotNull(wsdl);
@@ -292,7 +294,8 @@
assertTrue("Response is not available.", r1.isDone());
assertTrue("Response is not available.", r2.isDone());
}
-
+
+ @Test
public void testAsyncSynchronousPolling() throws Exception {
URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
assertNotNull(wsdl);
@@ -382,6 +385,7 @@
}
}
+ @Test
public void testAsyncCallWithHandler() throws Exception {
URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
assertNotNull(wsdl);
@@ -418,6 +422,8 @@
assertEquals(1, MyHandler.invocationCount);
}
+
+ @Test
public void testAsyncCallWithHandlerAndMultipleClients() throws Exception {
URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
assertNotNull(wsdl);
@@ -484,6 +490,7 @@
+ @Test
public void testFaults() throws Exception {
URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
assertNotNull(wsdl);
@@ -523,6 +530,8 @@
}
}
+
+ @Test
public void testFaultStackTrace() throws Exception {
System.setProperty("cxf.config.file.url",
getClass().getResource("fault-stack-trace.xml").toString());
@@ -543,6 +552,7 @@
}
}
+ @Test
public void testGetSayHi() throws Exception {
HttpURLConnection httpConnection =
getHttpConnection("http://localhost:9000/SoapContext/SoapPort/sayHi");
@@ -573,6 +583,7 @@
assertEquals("Bonjour", response);
}
+ @Test
public void testGetGreetMe() throws Exception {
HttpURLConnection httpConnection =
getHttpConnection("http://localhost:9000/SoapContext/SoapPort/greetMe/requestType/cxf");
@@ -601,6 +612,7 @@
assertEquals("Hello cxf", response);
}
+ @Test
public void testGetWSDL() throws Exception {
String url = "http://localhost:9000/SoapContext/SoapPort?wsdl";
HttpURLConnection httpConnection = getHttpConnection(url);
@@ -620,6 +632,7 @@
}
+ @Test
public void testGetGreetMeFromQuery() throws Exception {
String url = "http://localhost:9000/SoapContext/SoapPort/greetMe?requestType="
+ URLEncoder.encode("cxf (was CeltixFire)", "UTF-8");
@@ -650,6 +663,7 @@
assertEquals("Hello cxf (was CeltixFire)", response);
}
+ @Test
public void testBasicAuth() throws Exception {
Service service = Service.create(serviceName);
service.addPort(fakePortName, "http://schemas.xmlsoap.org/soap/",
@@ -667,9 +681,4 @@
}
}
- public static void main(String[] args) {
- junit.textui.TestRunner.run(ClientServerTest.class);
- }
-
-
}
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java Thu Mar 8 09:14:44 2007
@@ -33,14 +33,10 @@
import org.w3c.dom.Document;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.cxf.helpers.XMLUtils;
import org.apache.cxf.helpers.XPathUtils;
import org.apache.cxf.message.Message;
-import org.apache.cxf.systest.common.ClientServerSetupBase;
-import org.apache.cxf.systest.common.ClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.headers.HeaderTester;
import org.apache.headers.XMLHeaderService;
import org.apache.headers.types.InHeader;
@@ -57,8 +53,10 @@
import org.apache.hello_world_xml_http.mixed.types.SayHiResponse;
import org.apache.hello_world_xml_http.wrapped.GreeterFaultImpl;
import org.apache.hello_world_xml_http.wrapped.PingMeFault;
+import org.junit.BeforeClass;
+import org.junit.Test;
-public class ClientServerXMLTest extends ClientServerTestBase {
+public class ClientServerXMLTest extends AbstractBusClientServerTestBase {
private final QName barePortName = new QName("http://apache.org/hello_world_xml_http/bare", "XMLPort");
@@ -75,15 +73,12 @@
private final QName wrapFakePortName = new QName("http://apache.org/hello_world_xml_http/wrapped",
"FakePort");
- public static Test suite() throws Exception {
- TestSuite suite = new TestSuite(ClientServerXMLTest.class);
- return new ClientServerSetupBase(suite) {
- public void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(ServerXMLBinding.class));
- }
- };
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("server did not launch correctly", launchServer(ServerXMLBinding.class));
}
+ @Test
public void testBareBasicConnection() throws Exception {
XMLService service = new XMLService();
@@ -123,6 +118,7 @@
}
}
+ @Test
public void testBareGetGreetMe() throws Exception {
HttpURLConnection httpConnection =
getHttpConnection("http://localhost:9031/XMLService/XMLPort/greetMe/requestType/cxf");
@@ -146,6 +142,7 @@
assertEquals("Hello cxf", response);
}
+ @Test
public void testWrapBasicConnection() throws Exception {
org.apache.hello_world_xml_http.wrapped.XMLService service =
@@ -175,6 +172,7 @@
}
}
+ @Test
public void testMixedConnection() throws Exception {
org.apache.hello_world_xml_http.mixed.XMLService service =
@@ -206,6 +204,7 @@
}
}
+ @Test
public void testAddPort() throws Exception {
Service service = Service.create(wrapServiceName);
@@ -241,6 +240,7 @@
assertEquals(200, responseCode.intValue());
}
+ @Test
public void testXMLFault() throws Exception {
org.apache.hello_world_xml_http.wrapped.XMLService service =
new org.apache.hello_world_xml_http.wrapped.XMLService(
@@ -252,8 +252,8 @@
greeter.pingMe();
fail("did not catch expected PingMeFault exception");
} catch (PingMeFault ex) {
- assertEquals("minor value", 1, ex.getFaultInfo().getMinor());
- assertEquals("major value", 2, ex.getFaultInfo().getMajor());
+ assertEquals("minor value", 1, (int)ex.getFaultInfo().getMinor());
+ assertEquals("major value", 2, (int)ex.getFaultInfo().getMajor());
BindingProvider bp = (BindingProvider) greeter;
Map<String, Object> responseContext = bp.getResponseContext();
@@ -273,6 +273,7 @@
}
}
+ @Test
public void testXMLBindingOfSoapHeaderWSDL() throws Exception {
XMLHeaderService service = new XMLHeaderService();
HeaderTester port = service.getXMLPort9000();
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java Thu Mar 8 09:14:44 2007
@@ -26,29 +26,22 @@
import javax.xml.ws.Endpoint;
import javax.xml.ws.Holder;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-
-import org.apache.cxf.systest.common.ClientServerSetupBase;
-import org.apache.cxf.systest.common.ClientServerTestBase;
-import org.apache.cxf.systest.common.TestServerBase;
-
-
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.locator.LocatorService;
import org.apache.locator.LocatorService_Service;
import org.apache.locator.query.QuerySelectType;
import org.apache.locator_test.LocatorServiceImpl;
+import org.junit.BeforeClass;
+import org.junit.Test;
-public class LocatorClientServerTest extends ClientServerTestBase {
+public class LocatorClientServerTest extends AbstractBusClientServerTestBase {
static final Logger LOG = Logger.getLogger(LocatorClientServerTest.class.getName());
private final QName serviceName = new QName("http://apache.org/locator", "LocatorService");
- public static class MyServer extends TestServerBase {
+ public static class MyServer extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new LocatorServiceImpl();
@@ -70,16 +63,12 @@
}
}
- public static Test suite() throws Exception {
- TestSuite suite = new TestSuite(LocatorClientServerTest.class);
- return new ClientServerSetupBase(suite) {
- public void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(MyServer.class));
- }
- };
-
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("server did not launch correctly", launchServer(MyServer.class));
}
+ @Test
public void testLocatorService() throws Exception {
URL wsdl = getClass().getResource("/wsdl/locator.wsdl");
assertNotNull(wsdl);
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java Thu Mar 8 09:14:44 2007
@@ -25,7 +25,6 @@
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
import javax.xml.namespace.QName;
-import junit.framework.TestCase;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
@@ -35,11 +34,11 @@
import org.apache.hello_world.Greeter;
import org.apache.hello_world.services.SOAPService;
-import org.apache.ws.commons.schema.XmlSchemaException;
-
import org.apache.xml.resolver.Catalog;
+import org.junit.Assert;
+import org.junit.Test;
-public class OASISCatalogTest extends TestCase {
+public class OASISCatalogTest extends Assert {
private final QName serviceName =
new QName("http://apache.org/hello_world/services",
@@ -49,6 +48,7 @@
new QName("http://apache.org/hello_world/services",
"SoapPort");
+ @Test
public void testClientWithDefaultCatalog() throws Exception {
URL wsdl = getClass().getResource("/wsdl/catalog/hello_world_services.wsdl");
assertNotNull(wsdl);
@@ -60,6 +60,7 @@
assertNotNull(greeter);
}
+ @Test
public void testClientWithoutCatalog() throws Exception {
URL wsdl = getClass().getResource("/wsdl/catalog/hello_world_services.wsdl");
assertNotNull(wsdl);
@@ -75,7 +76,7 @@
try {
service.getPort(portName, Greeter.class);
fail("Test did not fail as expected");
- } catch (XmlSchemaException e) {
+ } catch (Exception e) {
// ignore
}
@@ -90,6 +91,7 @@
assertNotNull(greeter);
}
+ @Test
public void testWSDLLocatorWithDefaultCatalog() throws Exception {
URL wsdl =
getClass().getResource("/wsdl/catalog/hello_world_services.wsdl");
@@ -105,6 +107,7 @@
wsdlReader.readWSDL(wsdlLocator);
}
+ @Test
public void testWSDLLocatorWithoutCatalog() throws Exception {
URL wsdl =
getClass().getResource("/wsdl/catalog/hello_world_services.wsdl");
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Server.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Server.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Server.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Server.java Thu Mar 8 09:14:44 2007
@@ -23,11 +23,11 @@
import javax.xml.ws.Endpoint;
-import org.apache.cxf.systest.common.TestServerBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.hello_world_soap_http.DocLitBareGreeterImpl;
import org.apache.hello_world_soap_http.GreeterImpl;
-public class Server extends TestServerBase {
+public class Server extends AbstractBusTestServerBase {
protected void run() {
URL url = getClass().getResource("fault-stack-trace.xml");
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterBase.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterBase.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterBase.java Thu Mar 8 09:14:44 2007
@@ -22,9 +22,9 @@
import javax.xml.ws.Endpoint;
import org.apache.cxf.greeter_control.GreeterImplBase;
-import org.apache.cxf.systest.common.TestServerBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class ServerGreeterBase extends TestServerBase {
+public class ServerGreeterBase extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new GreeterImplBase();
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterBaseNoWsdl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterBaseNoWsdl.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterBaseNoWsdl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterBaseNoWsdl.java Thu Mar 8 09:14:44 2007
@@ -22,9 +22,9 @@
import javax.xml.ws.Endpoint;
import org.apache.cxf.greeter_control.GreeterImplBaseNoWsdl;
-import org.apache.cxf.systest.common.TestServerBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class ServerGreeterBaseNoWsdl extends TestServerBase {
+public class ServerGreeterBaseNoWsdl extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new GreeterImplBaseNoWsdl();
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterNoWsdl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterNoWsdl.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterNoWsdl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterNoWsdl.java Thu Mar 8 09:14:44 2007
@@ -22,9 +22,9 @@
import javax.xml.ws.Endpoint;
import org.apache.cxf.greeter_control.GreeterImplNoWsdl;
-import org.apache.cxf.systest.common.TestServerBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class ServerGreeterNoWsdl extends TestServerBase {
+public class ServerGreeterNoWsdl extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new GreeterImplNoWsdl();
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java Thu Mar 8 09:14:44 2007
@@ -24,10 +24,10 @@
import org.apache.cxf.anonymous_complex_type.AnonymousComplexTypeImpl;
import org.apache.cxf.jaxb_element_test.JaxbElementTestImpl;
import org.apache.cxf.ordered_param_holder.OrderedParamHolderImpl;
-import org.apache.cxf.systest.common.TestServerBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class ServerMisc extends TestServerBase {
+public class ServerMisc extends AbstractBusTestServerBase {
protected void run() {
Object implementor1 = new AnonymousComplexTypeImpl();
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerMixedStyle.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerMixedStyle.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerMixedStyle.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerMixedStyle.java Thu Mar 8 09:14:44 2007
@@ -21,11 +21,11 @@
import javax.xml.ws.Endpoint;
-import org.apache.cxf.systest.common.TestServerBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.hello_world_mixedstyle.GreeterImplMixedStyle;
-public class ServerMixedStyle extends TestServerBase {
+public class ServerMixedStyle extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new GreeterImplMixedStyle();
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerXMLBinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerXMLBinding.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerXMLBinding.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerXMLBinding.java Thu Mar 8 09:14:44 2007
@@ -21,13 +21,13 @@
import javax.xml.ws.Endpoint;
-import org.apache.cxf.systest.common.TestServerBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.headers.HeaderTesterImpl;
import org.apache.hello_world_xml_http.bare.GreeterImpl;
import org.apache.hello_world_xml_http.wrapped.GreeterFaultImpl;
-public class ServerXMLBinding extends TestServerBase {
+public class ServerXMLBinding extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new GreeterImpl();