You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by kw...@apache.org on 2008/05/20 01:53:54 UTC
svn commit: r658047 - in /incubator/tuscany/java/sca/vtest/wsbinding: ./
service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/
Author: kwilliams
Date: Mon May 19 16:53:53 2008
New Revision: 658047
URL: http://svn.apache.org/viewvc?rev=658047&view=rev
Log:
More refactoring
Modified:
incubator/tuscany/java/sca/vtest/wsbinding/pom.xml
incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java
incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java
incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java
incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java
incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java
Modified: incubator/tuscany/java/sca/vtest/wsbinding/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/wsbinding/pom.xml?rev=658047&r1=658046&r2=658047&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/wsbinding/pom.xml (original)
+++ incubator/tuscany/java/sca/vtest/wsbinding/pom.xml Mon May 19 16:53:53 2008
@@ -41,6 +41,15 @@
<artifactId>tuscany-binding-ws-axis2</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>vtest-utilities</artifactId>
+ <version>2.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+
</dependencies>
<profiles>
Modified: incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java?rev=658047&r1=658046&r2=658047&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java Mon May 19 16:53:53 2008
@@ -20,25 +20,24 @@
import junit.framework.Assert;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
/**
- * Tests EndpointReference element specified in service binding.ws as per Web Services Binding Specification v1.00 - Sec 2.1
- * - Lines 61 to 65.
+ * Tests EndpointReference element specified in service binding.ws as per Web
+ * Services Binding Specification v1.00 - Sec 2.1 - Lines 61 to 65.
*/
public class EndpointReferenceTestCase {
- protected static SCADomain domain;
protected static String compositeName = "endpointreference.composite";
@BeforeClass
public static void init() throws Exception {
try {
System.out.println("Setting up");
- domain = SCADomain.newInstance(compositeName);
+ ServiceFinder.init(compositeName);
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -47,23 +46,22 @@
/**
* Lines 61-65
* <p>
- * /binding.ws/wsa:EndpointReference optional WS-Addressing [6] EndpointReference
- * that specifies the endpoint for the service or reference. When this element is present along
- * with the wsdlElement attribute on the parent element, the wsdlElement attribute value MUST
- * be of the Binding form as specified above, i.e. <WSDL-namespace-
+ * /binding.ws/wsa:EndpointReference optional WS-Addressing [6]
+ * EndpointReference that specifies the endpoint for the service or
+ * reference. When this element is present along with the wsdlElement
+ * attribute on the parent element, the wsdlElement attribute value MUST be
+ * of the Binding form as specified above, i.e. <WSDL-namespace-
* URI>#wsdl.binding(<binding-name>).
*/
@Test
public void testWsdlBinding() throws Exception {
- AClientService aClient = domain.getService(AClientService.class, "AClientComponent");
+ AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent");
Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
}
-
+
@AfterClass
public static void destroy() throws Exception {
System.out.println("Cleaning up");
- if (domain != null) {
- domain.close();
- }
+ ServiceFinder.cleanup();
}
}
Modified: incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java?rev=658047&r1=658046&r2=658047&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java (original)
+++ incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java Mon May 19 16:53:53 2008
@@ -20,25 +20,24 @@
import junit.framework.Assert;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
/**
- * Tests "Endpoint URI resolution" for service binding.ws as per Web Services Binding Specification v1.00 - Sec 2.1.1
- * - Lines 70 to 85.
+ * Tests "Endpoint URI resolution" for service binding.ws as per Web Services
+ * Binding Specification v1.00 - Sec 2.1.1 - Lines 70 to 85.
*/
public class EndpointUriResolutionTestCase {
- protected static SCADomain domain;
protected static String compositeName = "endpoint-uri-resolution.composite";
@BeforeClass
public static void init() throws Exception {
try {
System.out.println("Setting up");
- domain = SCADomain.newInstance(compositeName);
+ ServiceFinder.init(compositeName);
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -47,163 +46,162 @@
/**
* Lines 71-78
* <p>
- * The rules for resolving the URI at which an SCA service is hosted, or SCA reference targets,
- * when used with binding.ws (in precedence order) are:
- * 1. The URIs in the endpoint(s) of the referenced WSDL
- * or
- * The URI specified by the wsa:Address element of the wsa:EndpointReference,
- * 2. The explicitly stated URI in the "uri" attribute of the binding.ws element, which may be
- * relative,
- * 3. The implicit URI as defined by the Assembly specification
+ * The rules for resolving the URI at which an SCA service is hosted, or SCA
+ * reference targets, when used with binding.ws (in precedence order) are:
+ * 1. The URIs in the endpoint(s) of the referenced WSDL or The URI
+ * specified by the wsa:Address element of the wsa:EndpointReference, 2. The
+ * explicitly stated URI in the "uri" attribute of the binding.ws element,
+ * which may be relative, 3. The implicit URI as defined by the Assembly
+ * specification
* <p>
* This method tests that URI in the endpoint takes precedence.
*/
@Test
public void testUriInEndpoint() throws Exception {
- AClientService aClient = domain.getService(AClientService.class, "AClientComponent1");
+ AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent1");
Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
}
-
+
/**
* Lines 71-78
* <p>
- * The rules for resolving the URI at which an SCA service is hosted, or SCA reference targets,
- * when used with binding.ws (in precedence order) are:
- * 1. The URIs in the endpoint(s) of the referenced WSDL
- * or
- * The URI specified by the wsa:Address element of the wsa:EndpointReference,
- * 2. The explicitly stated URI in the "uri" attribute of the binding.ws element, which may be
- * relative,
- * 3. The implicit URI as defined by the Assembly specification
+ * The rules for resolving the URI at which an SCA service is hosted, or SCA
+ * reference targets, when used with binding.ws (in precedence order) are:
+ * 1. The URIs in the endpoint(s) of the referenced WSDL or The URI
+ * specified by the wsa:Address element of the wsa:EndpointReference, 2. The
+ * explicitly stated URI in the "uri" attribute of the binding.ws element,
+ * which may be relative, 3. The implicit URI as defined by the Assembly
+ * specification
* <p>
* This method tests that URI in the EndpointReference takes precedence.
*/
@Test
public void testUriInEndpointReference() throws Exception {
- AClientService aClient = domain.getService(AClientService.class, "AClientComponent2");
+ AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent2");
Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
}
-
+
/**
* Lines 71-78
* <p>
- * The rules for resolving the URI at which an SCA service is hosted, or SCA reference targets,
- * when used with binding.ws (in precedence order) are:
- * 1. The URIs in the endpoint(s) of the referenced WSDL
- * or
- * The URI specified by the wsa:Address element of the wsa:EndpointReference,
- * 2. The explicitly stated URI in the "uri" attribute of the binding.ws element, which may be
- * relative,
- * 3. The implicit URI as defined by the Assembly specification
+ * The rules for resolving the URI at which an SCA service is hosted, or SCA
+ * reference targets, when used with binding.ws (in precedence order) are:
+ * 1. The URIs in the endpoint(s) of the referenced WSDL or The URI
+ * specified by the wsa:Address element of the wsa:EndpointReference, 2. The
+ * explicitly stated URI in the "uri" attribute of the binding.ws element,
+ * which may be relative, 3. The implicit URI as defined by the Assembly
+ * specification
* <p>
- * This method tests that explicitly stated URI in the "uri" attribute of binding.ws takes precedence.
+ * This method tests that explicitly stated URI in the "uri" attribute of
+ * binding.ws takes precedence.
*/
@Test
public void testUriInBindingWs() throws Exception {
- AClientService aClient = domain.getService(AClientService.class, "AClientComponent3");
+ AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent3");
Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
}
-
+
/**
* Lines 71-78
* <p>
- * The rules for resolving the URI at which an SCA service is hosted, or SCA reference targets,
- * when used with binding.ws (in precedence order) are:
- * 1. The URIs in the endpoint(s) of the referenced WSDL
- * or
- * The URI specified by the wsa:Address element of the wsa:EndpointReference,
- * 2. The explicitly stated URI in the "uri" attribute of the binding.ws element, which may be
- * relative,
- * 3. The implicit URI as defined by the Assembly specification
+ * The rules for resolving the URI at which an SCA service is hosted, or SCA
+ * reference targets, when used with binding.ws (in precedence order) are:
+ * 1. The URIs in the endpoint(s) of the referenced WSDL or The URI
+ * specified by the wsa:Address element of the wsa:EndpointReference, 2. The
+ * explicitly stated URI in the "uri" attribute of the binding.ws element,
+ * which may be relative, 3. The implicit URI as defined by the Assembly
+ * specification
* <p>
* This method tests that implicit URI is used.
*/
@Test
public void testImplicitUri() throws Exception {
- AClientService aClient = domain.getService(AClientService.class, "AClientComponent4");
+ AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent4");
Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
}
-
+
/**
* Lines 71-78
* <p>
- * The rules for resolving the URI at which an SCA service is hosted, or SCA reference targets,
- * when used with binding.ws (in precedence order) are:
- * 1. The URIs in the endpoint(s) of the referenced WSDL
- * or
- * The URI specified by the wsa:Address element of the wsa:EndpointReference,
- * 2. The explicitly stated URI in the "uri" attribute of the binding.ws element, which may be
- * relative,
- * 3. The implicit URI as defined by the Assembly specification
+ * The rules for resolving the URI at which an SCA service is hosted, or SCA
+ * reference targets, when used with binding.ws (in precedence order) are:
+ * 1. The URIs in the endpoint(s) of the referenced WSDL or The URI
+ * specified by the wsa:Address element of the wsa:EndpointReference, 2. The
+ * explicitly stated URI in the "uri" attribute of the binding.ws element,
+ * which may be relative, 3. The implicit URI as defined by the Assembly
+ * specification
* <p>
- * This method tests that explicitly stated URI in the "uri" attribute of the binding.ws is used
- * in the absence of a wsdlElement.
+ * This method tests that explicitly stated URI in the "uri" attribute of
+ * the binding.ws is used in the absence of a wsdlElement.
*/
@Test
public void testNoWsdlElement() throws Exception {
- AClientService aClient = domain.getService(AClientService.class, "AClientComponent5");
+ AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent5");
Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
}
-
+
/**
* Lines 79-83
* <p>
- * The URI in the WSDL endpoint or in the wsa:Address of an EPR may be a relative URI, in which
- * case it is relative to the URI defined in (2) or (3). The wsa:Address element can be the empty
- * relative URI, in which case it uses the URI defined in (2) or (3) directly. This allows the EPR
- * writer to specify reference parameters, metadata and other EPR contents while allowing the URI
- * to be chosen by the deployer.
- * <p>
- * This method tests that the relative URI specified in WSDL endpoint is used along with the explicit
- * URI specified in the "uri" attribute of binding.ws element.
+ * The URI in the WSDL endpoint or in the wsa:Address of an EPR may be a
+ * relative URI, in which case it is relative to the URI defined in (2) or
+ * (3). The wsa:Address element can be the empty relative URI, in which case
+ * it uses the URI defined in (2) or (3) directly. This allows the EPR
+ * writer to specify reference parameters, metadata and other EPR contents
+ * while allowing the URI to be chosen by the deployer.
+ * <p>
+ * This method tests that the relative URI specified in WSDL endpoint is
+ * used along with the explicit URI specified in the "uri" attribute of
+ * binding.ws element.
*/
@Test
public void testRelativeUriInWsdl() throws Exception {
- AClientService aClient = domain.getService(AClientService.class, "AClientComponent6");
+ AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent6");
Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
}
/**
* Lines 79-83
* <p>
- * The URI in the WSDL endpoint or in the wsa:Address of an EPR may be a relative URI, in which
- * case it is relative to the URI defined in (2) or (3). The wsa:Address element can be the empty
- * relative URI, in which case it uses the URI defined in (2) or (3) directly. This allows the EPR
- * writer to specify reference parameters, metadata and other EPR contents while allowing the URI
- * to be chosen by the deployer.
- * <p>
- * This method tests that the relative URI specified in wsa:Address is used along with the explicit
- * URI specified in the "uri" attribute of binding.ws element.
+ * The URI in the WSDL endpoint or in the wsa:Address of an EPR may be a
+ * relative URI, in which case it is relative to the URI defined in (2) or
+ * (3). The wsa:Address element can be the empty relative URI, in which case
+ * it uses the URI defined in (2) or (3) directly. This allows the EPR
+ * writer to specify reference parameters, metadata and other EPR contents
+ * while allowing the URI to be chosen by the deployer.
+ * <p>
+ * This method tests that the relative URI specified in wsa:Address is used
+ * along with the explicit URI specified in the "uri" attribute of
+ * binding.ws element.
*/
@Test
public void testRelativeUriInAddress() throws Exception {
- AClientService aClient = domain.getService(AClientService.class, "AClientComponent7");
+ AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent7");
Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
}
/**
* Lines 79-83
* <p>
- * The URI in the WSDL endpoint or in the wsa:Address of an EPR may be a relative URI, in which
- * case it is relative to the URI defined in (2) or (3). The wsa:Address element can be the empty
- * relative URI, in which case it uses the URI defined in (2) or (3) directly. This allows the EPR
- * writer to specify reference parameters, metadata and other EPR contents while allowing the URI
- * to be chosen by the deployer.
+ * The URI in the WSDL endpoint or in the wsa:Address of an EPR may be a
+ * relative URI, in which case it is relative to the URI defined in (2) or
+ * (3). The wsa:Address element can be the empty relative URI, in which case
+ * it uses the URI defined in (2) or (3) directly. This allows the EPR
+ * writer to specify reference parameters, metadata and other EPR contents
+ * while allowing the URI to be chosen by the deployer.
* <p>
- * This method tests that when wsa:Address is empty, the explicit
- * URI specified in the "uri" attribute of binding.ws element is used.
+ * This method tests that when wsa:Address is empty, the explicit URI
+ * specified in the "uri" attribute of binding.ws element is used.
*/
@Test
public void testEmptyAddressElement() throws Exception {
- AClientService aClient = domain.getService(AClientService.class, "AClientComponent8");
+ AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent8");
Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
}
@AfterClass
public static void destroy() throws Exception {
System.out.println("Cleaning up");
- if (domain != null) {
- domain.close();
- }
+ ServiceFinder.cleanup();
}
}
Modified: incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java?rev=658047&r1=658046&r2=658047&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java (original)
+++ incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java Mon May 19 16:53:53 2008
@@ -20,7 +20,7 @@
import junit.framework.Assert;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -31,14 +31,13 @@
*/
public class WsdlBindingTestCase {
- protected static SCADomain domain;
protected static String compositeName = "wsdlbinding.composite";
@BeforeClass
public static void init() throws Exception {
try {
System.out.println("Setting up");
- domain = SCADomain.newInstance(compositeName);
+ ServiceFinder.init(compositeName);
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -55,17 +54,15 @@
*/
@Test
public void testWsdlBinding() throws Exception {
- AClientService aClientBnd11 = domain.getService(AClientService.class, "AClientBnd11Component");
+ AClientService aClientBnd11 = ServiceFinder.getService(AClientService.class, "AClientBnd11Component");
Assert.assertEquals("Hello Pandu", aClientBnd11.getGreetingsForward("Pandu"));
- AClientService aClientBnd12 = domain.getService(AClientService.class, "AClientBnd12Component");
+ AClientService aClientBnd12 = ServiceFinder.getService(AClientService.class, "AClientBnd12Component");
Assert.assertEquals("Hello Pandu", aClientBnd12.getGreetingsForward("Pandu"));
}
@AfterClass
public static void destroy() throws Exception {
System.out.println("Cleaning up");
- if (domain != null) {
- domain.close();
- }
+ ServiceFinder.cleanup();
}
}
Modified: incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java?rev=658047&r1=658046&r2=658047&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java (original)
+++ incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java Mon May 19 16:53:53 2008
@@ -20,26 +20,25 @@
import junit.framework.Assert;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
/**
- * Tests wsdlElement specified on service binding.ws as per Web Services Binding Specification v1.00 - Sec 2.1
- * - Lines 35 to 54.
+ * Tests wsdlElement specified on service binding.ws as per Web Services Binding
+ * Specification v1.00 - Sec 2.1 - Lines 35 to 54.
*/
public class WsdlEndpointTestCase {
- protected static SCADomain domain;
protected static String compositeName = "wsdlendpoint.composite";
@BeforeClass
public static void init() throws Exception {
try {
System.out.println("Setting up");
- domain = SCADomain.newInstance(compositeName);
+ ServiceFinder.init(compositeName);
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -48,23 +47,20 @@
/**
* Lines 46-49
* <p>
- * Endpoint (WSDL 2.0):
- * <WSDL-namespace-URI>#wsdl.endpoint(<service-name>/<endpoint-name>)
- * In this case, the identified endpoint in the WSDL 2.0 Service must have an equivalent
- * PortType with the SCA service or reference.
+ * Endpoint (WSDL 2.0): <WSDL-namespace-URI>#wsdl.endpoint(<service-name>/<endpoint-name>)
+ * In this case, the identified endpoint in the WSDL 2.0 Service must have
+ * an equivalent PortType with the SCA service or reference.
*/
@Test
@Ignore("WSDL2.0 Support")
public void testWsdlEndpoint() throws Exception {
- AClientService aClient = domain.getService(AClientService.class, "AClientComponent");
+ AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent");
Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
}
-
+
@AfterClass
public static void destroy() throws Exception {
System.out.println("Cleaning up");
- if (domain != null) {
- domain.close();
- }
+ ServiceFinder.cleanup();
}
}
Modified: incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java?rev=658047&r1=658046&r2=658047&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java (original)
+++ incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java Mon May 19 16:53:53 2008
@@ -20,25 +20,24 @@
import junit.framework.Assert;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
/**
- * Tests wsdlElement specified on service binding.ws as per Web Services Binding Specification v1.00 - Sec 2.1
- * - Lines 35 to 54.
+ * Tests wsdlElement specified on service binding.ws as per Web Services Binding
+ * Specification v1.00 - Sec 2.1 - Lines 35 to 54.
*/
public class WsdlPortTestCase {
- protected static SCADomain domain;
protected static String compositeName = "wsdlport.composite";
@BeforeClass
public static void init() throws Exception {
try {
System.out.println("Setting up");
- domain = SCADomain.newInstance(compositeName);
+ ServiceFinder.init(compositeName);
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -47,24 +46,21 @@
/**
* Lines 42-45
* <p>
- * Port (WSDL 1.1):
- * <WSDL-namespace-URI>#wsdl.port(<service-name>/<port-name>)
- * In this case, the identified port in the WSDL 1.1 Service must have an equivalent
- * PortType with the SCA service or reference.
+ * Port (WSDL 1.1): <WSDL-namespace-URI>#wsdl.port(<service-name>/<port-name>)
+ * In this case, the identified port in the WSDL 1.1 Service must have an
+ * equivalent PortType with the SCA service or reference.
*/
@Test
public void testWsdlPort() throws Exception {
- AClientService aClientP11 = domain.getService(AClientService.class, "AClientP11Component");
+ AClientService aClientP11 = ServiceFinder.getService(AClientService.class, "AClientP11Component");
Assert.assertEquals("Hello Pandu", aClientP11.getGreetingsForward("Pandu"));
- AClientService aClientP12 = domain.getService(AClientService.class, "AClientP12Component");
+ AClientService aClientP12 = ServiceFinder.getService(AClientService.class, "AClientP12Component");
Assert.assertEquals("Hello Pandu", aClientP12.getGreetingsForward("Pandu"));
}
-
+
@AfterClass
public static void destroy() throws Exception {
System.out.println("Cleaning up");
- if (domain != null) {
- domain.close();
- }
+ ServiceFinder.cleanup();
}
}
Modified: incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java?rev=658047&r1=658046&r2=658047&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java Mon May 19 16:53:53 2008
@@ -20,26 +20,25 @@
import junit.framework.Assert;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
/**
- * Tests wsdlElement specified on service binding.ws as per Web Services Binding Specification v1.00 - Sec 2.1
- * - Lines 35 to 54.
+ * Tests wsdlElement specified on service binding.ws as per Web Services Binding
+ * Specification v1.00 - Sec 2.1 - Lines 35 to 54.
*/
public class WsdlServiceTestCase {
- protected static SCADomain domain;
protected static String compositeName = "wsdlservice.composite";
@BeforeClass
public static void init() throws Exception {
try {
System.out.println("Setting up");
- domain = SCADomain.newInstance(compositeName);
+ ServiceFinder.init(compositeName);
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -48,25 +47,23 @@
/**
* Lines 38-41
* <p>
- * Service:
- * <WSDL-namespace-URI>#wsdl.service(<service-name>)
- * In this case, all the endpoints in the WSDL Service that have equivalent PortTypes with
- * the SCA service or reference must be available to the SCA service or reference.
+ * Service: <WSDL-namespace-URI>#wsdl.service(<service-name>) In this case,
+ * all the endpoints in the WSDL Service that have equivalent PortTypes with
+ * the SCA service or reference must be available to the SCA service or
+ * reference.
*/
@Test
@Ignore("TUSCANY-2298")
public void testWsdlService() throws Exception {
- AClientService aClientS11 = domain.getService(AClientService.class, "AClientS11Component");
+ AClientService aClientS11 = ServiceFinder.getService(AClientService.class, "AClientS11Component");
Assert.assertEquals("Hello Pandu", aClientS11.getGreetingsForward("Pandu"));
- AClientService aClientS12 = domain.getService(AClientService.class, "AClientS12Component");
+ AClientService aClientS12 = ServiceFinder.getService(AClientService.class, "AClientS12Component");
Assert.assertEquals("Hello Pandu", aClientS12.getGreetingsForward("Pandu"));
}
@AfterClass
public static void destroy() throws Exception {
System.out.println("Cleaning up");
- if (domain != null) {
- domain.close();
- }
+ ServiceFinder.cleanup();
}
}