Author: veithen
Date: Wed Dec 27 12:08:59 2017
New Revision: 1819336
URL: http://svn.apache.org/viewvc?rev=1819336&view=rev
Log:
Migrate more JAX-WS integration tests to the Axis2Server rule.
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/AddNumbersTests.java
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/AsyncExecutorTests.java
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/DLWMinArrayTests.java
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/DLWMinTests.java
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/ResourceInjectionTests.java
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/WrapTests.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java?rev=1819336&r1=1819335&r2=1819336&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java
Wed Dec 27 12:08:59 2017
@@ -19,14 +19,13 @@
package org.apache.axis2.jaxws.proxy;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.framework.AbstractTestCase;
import org.apache.axis2.jaxws.message.databinding.JAXBUtilsMonitor;
import org.apache.axis2.jaxws.proxy.gorilla_dlw.sei.GorillaInterface;
+import org.apache.axis2.testutils.Axis2Server;
+import org.junit.ClassRule;
import org.junit.Ignore;
+import org.junit.Test;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.Duration;
@@ -36,6 +35,11 @@ import javax.xml.ws.BindingProvider;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
@@ -45,31 +49,29 @@ import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
-public class GorillaDLWProxyTests extends AbstractTestCase {
+public class GorillaDLWProxyTests {
+ @ClassRule
+ public static final Axis2Server server = new Axis2Server("target/repo");
private QName serviceName = new QName(
"http://org.apache.axis2.jaxws.proxy.gorilla_dlw";,
"GorillaService");
- private String axisEndpoint =
"http://localhost:6060/axis2/services/GorillaService.GorillaProxyImplPort";;
private QName portName = new
QName("http://org.apache.axis2.jaxws.proxy.rpclit";,
"GorillaPort");
private String wsdlLocation =
System.getProperty("basedir",".")+"/"+"src/test/java/org/apache/axis2/jaxws/proxy/gorilla_dlw/META-INF/gorilla_dlw.wsdl";
- public static Test suite() {
- return getTestSetup(new TestSuite(GorillaDLWProxyTests.class));
- }
-
/**
* Utility method to get the proxy
* @return GorillaInterface proxy
* @throws MalformedURLException
*/
- public GorillaInterface getProxy() throws MalformedURLException {
+ public GorillaInterface getProxy() throws Exception {
File wsdl= new File(wsdlLocation);
URL wsdlUrl = wsdl.toURI().toURL();
Service service = Service.create(null, serviceName);
Object proxy =service.getPort(portName, GorillaInterface.class);
BindingProvider p = (BindingProvider)proxy;
-
p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,axisEndpoint);
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ server.getEndpoint("GorillaService.GorillaProxyImplPort"));
return (GorillaInterface)proxy;
}
@@ -79,11 +81,11 @@ public class GorillaDLWProxyTests extend
* @return
* @throws MalformedURLException
*/
- public Dispatch<String> getDispatch() throws MalformedURLException {
+ public Dispatch<String> getDispatch() throws Exception {
File wsdl= new File(wsdlLocation);
URL wsdlUrl = wsdl.toURI().toURL();
Service service = Service.create(null, serviceName);
- service.addPort(portName, null, axisEndpoint);
+ service.addPort(portName, null,
server.getEndpoint("GorillaService.GorillaProxyImplPort"));
Dispatch<String> dispatch = service.createDispatch(portName,
String.class, Service.Mode.PAYLOAD);
return dispatch;
}
@@ -93,6 +95,7 @@ public class GorillaDLWProxyTests extend
* If this test fails, it usually means that there are connection
* problems or deploy problems.
*/
+ @Test
public void testEchoString() throws Exception {
try{
GorillaInterface proxy = getProxy();
@@ -118,6 +121,7 @@ public class GorillaDLWProxyTests extend
/**
* Tests that we can echo a null
*/
+ @Test
public void testEchoStringNull() throws Exception {
try{
GorillaInterface proxy = getProxy();
@@ -139,6 +143,7 @@ public class GorillaDLWProxyTests extend
* Test whether the @XmlSeeAlso that was added to the SEI
* is used to construct the JAXBContext
*/
+ @Test
public void testXmlSeeAlso() throws Exception {
try{
// Set up the JAXBUtils monitor
@@ -197,6 +202,7 @@ public class GorillaDLWProxyTests extend
/**
* Testing of StringList (xsd:list of string)
*/
+ @Test
public void testEchoStringList() throws Exception {
// Run the test multiple times to verify correct behavior
_testEchoStringList();
@@ -256,6 +262,7 @@ public class GorillaDLWProxyTests extend
* Testing of StringList (xsd:list of string)
* SEI is mapped to String[] instead of List<String>
*/
+ @Test
public void testEchoStringListAlt() throws Exception {
// Run the test multiple times to verify correct behavior
@@ -317,7 +324,9 @@ public class GorillaDLWProxyTests extend
// recognizes the property as an indexed property. Instead it considers it
as a simple
// property with type String[] (because XJC also generates the
corresponding getters and
// setters).
- public void ignored_testEchoIndexedStringArray() throws Exception {
+ @Ignore
+ @Test
+ public void testEchoIndexedStringArray() throws Exception {
// Run the test multiple times to verify correct behavior
_testEchoIndexedStringArray();
_testEchoIndexedStringArray();
@@ -377,6 +386,7 @@ public class GorillaDLWProxyTests extend
* Test of String Array (string maxOccurs=unbounded)
* @throws Exception
*/
+ @Test
public void testEchoStringArray() throws Exception {
// Run the test multiple times to verify correct behavior
@@ -438,6 +448,7 @@ public class GorillaDLWProxyTests extend
* Test of String Array (string maxOccurs=unbounded) which is mapped to
String[]
* @throws Exception
*/
+ @Test
public void testEchoStringArrayAlt() throws Exception {
// Run the test multiple times to verify correct behavior
@@ -489,6 +500,7 @@ public class GorillaDLWProxyTests extend
}
}
+ @Test
public void testEchoDate() throws Exception{
try{
System.out.println("TestEchoDate");
@@ -507,6 +519,7 @@ public class GorillaDLWProxyTests extend
}
}
+ @Test
public void testPolymorphicDate() throws Exception{
try{
GorillaInterface proxy = getProxy();
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java?rev=1819336&r1=1819335&r2=1819336&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java
Wed Dec 27 12:08:59 2017
@@ -19,36 +19,33 @@
package org.apache.axis2.jaxws.rpclit.enumtype.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.framework.AbstractTestCase;
import org.apache.axis2.jaxws.rpclit.enumtype.sei.PortType;
import org.apache.axis2.jaxws.rpclit.enumtype.sei.Service;
+import org.apache.axis2.testutils.Axis2Server;
+import org.junit.ClassRule;
+import org.junit.Test;
import org.test.rpclit.schema.ElementString;
+import static org.junit.Assert.fail;
+
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Holder;
+public class RPCLitEnumTests {
+ @ClassRule
+ public static final Axis2Server server = new Axis2Server("target/repo");
-public class RPCLitEnumTests extends AbstractTestCase {
-
- String axisEndpoint =
"http://localhost:6060/axis2/services/RPCLitEnumService.PortTypeImplPort";;
-
- public static Test suite() {
- return getTestSetup(new TestSuite(RPCLitEnumTests.class));
- }
-
+ @Test
public void testEnumSimpleType(){
TestLogger.logger.debug("------------------------------");
- TestLogger.logger.debug("Test : " + getName());
try{
Service service = new Service();
PortType portType = service.getPort();
BindingProvider p = (BindingProvider) portType;
-
p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
axisEndpoint);
+
p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ server.getEndpoint("RPCLitEnumService.PortTypeImplPort"));
Holder<ElementString> pString = new
Holder<ElementString>(ElementString.A);
portType.echoString(pString);
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java?rev=1819336&r1=1819335&r2=1819336&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java
Wed Dec 27 12:08:59 2017
@@ -19,31 +19,32 @@
package org.apache.axis2.jaxws.rpclit.stringarray.tests;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.axis2.jaxws.framework.AbstractTestCase;
import org.apache.axis2.jaxws.rpclit.stringarray.sei.Echo;
import org.apache.axis2.jaxws.rpclit.stringarray.sei.RPCLitStringArrayService;
+import org.apache.axis2.testutils.Axis2Server;
+import org.junit.ClassRule;
+import org.junit.Test;
import org.test.rpclit.stringarray.StringArray;
import javax.xml.ws.BindingProvider;
-import java.util.Arrays;
-public class RPCLitStringArrayTests extends AbstractTestCase {
+import static org.junit.Assert.assertEquals;
- public static Test suite() {
- return getTestSetup(new TestSuite(RPCLitStringArrayTests.class));
- }
+import java.util.Arrays;
+
+public class RPCLitStringArrayTests {
+ @ClassRule
+ public static final Axis2Server server = new Axis2Server("target/repo");
+ @Test
public void testStringArrayType() throws Exception {
System.out.println("------------------------------");
- System.out.println("Test : " + getName());
RPCLitStringArrayService service = new RPCLitStringArrayService();
Echo portType = service.getEchoPort();
BindingProvider p = (BindingProvider) portType;
p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
-
"http://localhost:6060/axis2/services/RPCLitStringArrayService.EchoImplPort";);
+
server.getEndpoint("RPCLitStringArrayService.EchoImplPort"));
String[] strArray= {"str1", "str2", "str3", "str4 5"};
StringArray array = new StringArray();
@@ -69,15 +70,15 @@ public class RPCLitStringArrayTests exte
System.out.print("---------------------------------");
}
+ @Test
public void testStringArrayTypeNoSEI() throws Exception {
System.out.println("------------------------------");
- System.out.println("Test : " + getName());
RPCLitStringArrayService service = new RPCLitStringArrayService();
Echo portType = service.getEchoPort();
BindingProvider p = (BindingProvider) portType;
p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
-
"http://localhost:6060/axis2/services/RPCLitStringArrayEchoNoSEIService.EchoNoSEIPort";);
+
server.getEndpoint("RPCLitStringArrayEchoNoSEIService.EchoNoSEIPort"));
String[] strArray= {"str1", "str2", "str3", "str4 5"};
StringArray array = new StringArray();
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/AddNumbersTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/AddNumbersTests.java?rev=1819336&r1=1819335&r2=1819336&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/AddNumbersTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/AddNumbersTests.java
Wed Dec 27 12:08:59 2017
@@ -19,34 +19,39 @@
package org.apache.axis2.jaxws.sample;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.framework.AbstractTestCase;
import org.apache.axis2.jaxws.sample.addnumbers.AddNumbersPortType;
import org.apache.axis2.jaxws.sample.addnumbers.AddNumbersService;
+import org.apache.axis2.testutils.Axis2Server;
+import org.junit.ClassRule;
+import org.junit.Test;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.handler.MessageContext;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.util.Map;
-public class AddNumbersTests extends AbstractTestCase {
-
- String axisEndpoint =
"http://localhost:6060/axis2/services/AddNumbersService.AddNumbersPortTypeImplPort";;
+public class AddNumbersTests {
+ @ClassRule
+ public static final Axis2Server server = new Axis2Server("target/repo");
- public static Test suite() {
- return getTestSetup(new TestSuite(AddressBookTests.class));
+ private static String getEndpoint() throws Exception {
+ return
server.getEndpoint("AddNumbersService.AddNumbersPortTypeImplPort");
}
-
+
+ @Test
public void testAddNumbers() throws Exception {
TestLogger.logger.debug("----------------------------------");
- TestLogger.logger.debug("test: " + getName());
AddNumbersService service = new AddNumbersService();
AddNumbersPortType proxy = service.getAddNumbersPort();
BindingProvider p = (BindingProvider) proxy;
- p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
axisEndpoint);
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
getEndpoint());
int total = proxy.addNumbers(10, 10);
TestLogger.logger.debug("Total =" + total);
@@ -74,17 +79,17 @@ public class AddNumbersTests extends Abs
assertTrue("http response headers", headers != null &&
!headers.isEmpty());
}
+ @Test
public void testOneWay() {
try {
TestLogger.logger.debug("----------------------------------");
- TestLogger.logger.debug("test: " + getName());
AddNumbersService service = new AddNumbersService();
AddNumbersPortType proxy = service.getAddNumbersPort();
BindingProvider bp = (BindingProvider) proxy;
bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- axisEndpoint);
+ getEndpoint());
proxy.oneWayInt(11);
// Try it one more time
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/AsyncExecutorTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/AsyncExecutorTests.java?rev=1819336&r1=1819335&r2=1819336&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/AsyncExecutorTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/AsyncExecutorTests.java
Wed Dec 27 12:08:59 2017
@@ -19,19 +19,25 @@
package org.apache.axis2.jaxws.sample;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.framework.AbstractTestCase;
import org.apache.axis2.jaxws.sample.parallelasync.common.CallbackHandler;
import org.apache.axis2.jaxws.sample.parallelasync.server.AsyncPort;
import org.apache.axis2.jaxws.sample.parallelasync.server.AsyncService;
+import org.apache.axis2.testutils.Axis2Server;
+import org.junit.ClassRule;
+import org.junit.Test;
import org.test.parallelasync.CustomAsyncResponse;
import org.test.parallelasync.SleepResponse;
-import org.test.parallelasync.WakeUpResponse;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Response;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.util.Map;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
@@ -45,27 +51,21 @@ import java.util.concurrent.Future;
* @see ParallelAsyncTests
*
*/
-public class AsyncExecutorTests extends AbstractTestCase {
-
- private static final String DOCLITWR_ASYNC_ENDPOINT =
-
"http://localhost:6060/axis2/services/AsyncService.DocLitWrappedPortImplPort";;
+public class AsyncExecutorTests {
+ @ClassRule
+ public static final Axis2Server server = new Axis2Server("target/repo");
// used for logging
private String myClassName = "AsyncExecutorTests";
- public static Test suite() {
- return getTestSetup(new TestSuite(AsyncExecutorTests.class));
- }
-
/**
* @testStrategy Check that the web service is up and running
* before running any other tests
*/
+ @Test
public void testService_isAlive() throws Exception {
final String MESSAGE = "testServiceAlive";
- String title = myClassName + " : " + getName() + " : ";
-
AsyncPort port = getPort((Executor)null);
String req1base = "sleepAsync";
@@ -79,7 +79,7 @@ public class AsyncExecutorTests extends
request1 = req1base + "_" + i;
request2 = req2base + "_" + i;
- TestLogger.logger.debug(title + "iteration [" + i + "] using
request1 [" + request1 +
+ TestLogger.logger.debug("Iteration [" + i + "] using request1 [" +
request1 +
"] request2 [" + request2 + "]");
// submit request #1 to the server-side web service that
@@ -113,7 +113,7 @@ public class AsyncExecutorTests extends
req2_result = resp2.get().getResponse();
} catch (Exception e) {
TestLogger.logger.debug(
- title + "iteration [" + i + "] using request1 [" +
request1 +
+ "Iteration [" + i + "] using request1 [" + request1 +
"] request2 [" + request2 + "] : got
exception [" +
e.getClass().getName() + "] [" +
e.getMessage() + "] ");
e.printStackTrace();
@@ -162,11 +162,11 @@ public class AsyncExecutorTests extends
if (sleepResp != null) {
req_cb_result = sleepResp.getMessage();
TestLogger.logger.debug(
- title + " request [" + request1 + "] : result [" +
req_cb_result + "] ");
+ "Request [" + request1 + "] : result [" +
req_cb_result + "] ");
}
} catch (Exception ex) {
- TestLogger.logger.debug(title + " request [" + request1 + "] :
got exception [" +
+ TestLogger.logger.debug("Request [" + request1 + "] : got
exception [" +
ex.getClass().getName() + "] [" + ex.getMessage() + "] ");
ex.printStackTrace();
fail(ex.toString());
@@ -181,6 +181,7 @@ public class AsyncExecutorTests extends
* immediately and not affect the request being sent to the service and
the response
* being received by an executor
*/
+ @Test
public void testMultithreadedCallback() {
TestThreadMonitor monitor = startupTestThreads();
@@ -233,13 +234,14 @@ public class AsyncExecutorTests extends
return service;
}
- private AsyncPort getPort(AsyncService service) {
+ private AsyncPort getPort(AsyncService service) throws Exception {
AsyncPort port = service.getAsyncPort();
assertNotNull("Port is null", port);
Map<String, Object> rc = ((BindingProvider) port).getRequestContext();
- rc.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
DOCLITWR_ASYNC_ENDPOINT);
+ rc.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ server.getEndpoint("AsyncService.DocLitWrappedPortImplPort"));
return port;
}
@@ -248,7 +250,7 @@ public class AsyncExecutorTests extends
* Auxiliary method used for obtaining a proxy pre-configured with a
* specific Executor
*/
- private AsyncPort getPort(Executor ex) {
+ private AsyncPort getPort(Executor ex) throws Exception {
AsyncService service = getService(ex);
AsyncPort port = service.getAsyncPort();
@@ -256,7 +258,7 @@ public class AsyncExecutorTests extends
Map<String, Object> rc = ((BindingProvider) port).getRequestContext();
rc.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- DOCLITWR_ASYNC_ENDPOINT);
+ server.getEndpoint("AsyncService.DocLitWrappedPortImplPort"));
return port;
}
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/DLWMinArrayTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/DLWMinArrayTests.java?rev=1819336&r1=1819335&r2=1819336&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/DLWMinArrayTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/DLWMinArrayTests.java
Wed Dec 27 12:08:59 2017
@@ -19,16 +19,16 @@
package org.apache.axis2.jaxws.sample;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.framework.AbstractTestCase;
import org.apache.axis2.jaxws.sample.dlwminArrays.IGenericService;
import org.apache.axis2.jaxws.sample.dlwminArrays.WSUser;
-
+import org.apache.axis2.testutils.Axis2Server;
+import org.junit.ClassRule;
+import org.junit.Test;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
@@ -42,23 +42,20 @@ import javax.xml.ws.Service;
* "Minimal" indicates that no wrapper beans are associated with the JAX-WS
method.
* In most enterprise scenarios, wrapper beans are packaged with the JAX-WS
application.
*/
-public class DLWMinArrayTests extends AbstractTestCase {
+public class DLWMinArrayTests {
+ @ClassRule
+ public static final Axis2Server server = new Axis2Server("target/repo");
private static final String NAMESPACE =
"http://apache.org/axis2/jaxws/sample/dlwminArrays";;
private static final QName QNAME_SERVICE = new QName(
NAMESPACE, "GenericService");
private static final QName QNAME_PORT = new QName(
NAMESPACE, "GenericServicePort");
- private static final String URL_ENDPOINT =
"http://localhost:6060/axis2/services/GenericService.GenericServicePort";;
private static String FIRST = "first";
private static String SECOND = "second";
- public static Test suite() {
- return getTestSetup(new TestSuite(DLWMinArrayTests.class));
- }
-
- private IGenericService getProxy(String action) {
+ private IGenericService getProxy(String action) throws Exception {
Service service = Service.create(QNAME_SERVICE);
IGenericService proxy = service.getPort(QNAME_PORT,
IGenericService.class);
BindingProvider p = (BindingProvider) proxy;
@@ -67,13 +64,15 @@ public class DLWMinArrayTests extends Ab
p.getRequestContext().put(
BindingProvider.SOAPACTION_URI_PROPERTY, action);
p.getRequestContext().put(
- BindingProvider.ENDPOINT_ADDRESS_PROPERTY, URL_ENDPOINT);
+ BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ server.getEndpoint("GenericService.GenericServicePort"));
return proxy;
}
/**
* Test sayHello method
*/
+ @Test
public void testHello() throws Exception {
IGenericService proxy = getProxy("sayHello");
@@ -90,6 +89,7 @@ public class DLWMinArrayTests extends Ab
/**
* Test method that returns a String[]
*/
+ @Test
public void testGetSimpleArray() throws Exception {
IGenericService proxy = getProxy("getSimpleArray");
@@ -112,6 +112,7 @@ public class DLWMinArrayTests extends Ab
/**
* Test method that returns a List<String>
*/
+ @Test
public void testGetSimpleList() throws Exception {
IGenericService proxy = getProxy("getSimpleList");
@@ -133,6 +134,7 @@ public class DLWMinArrayTests extends Ab
/**
* Test method that returns a bean array (WSUser[])
*/
+ @Test
public void testGetComplexArray() throws Exception {
IGenericService proxy = getProxy("getComplexArray");
@@ -154,6 +156,7 @@ public class DLWMinArrayTests extends Ab
/**
* Test method that returns a List of beans (List<WSUser>)
*/
+ @Test
public void testGetComplexList() throws Exception {
IGenericService proxy = getProxy("getComplexList");
@@ -176,6 +179,7 @@ public class DLWMinArrayTests extends Ab
* Test method that echos a List of beans (List<WSUser>)
* Two items are echo'd.
*/
+ @Test
public void testEchoComplexList2() throws Exception {
IGenericService proxy = getProxy("echoComplexList");
@@ -206,6 +210,7 @@ public class DLWMinArrayTests extends Ab
* Test method that echos a List of beans (List<WSUser>)
* One item is echo'd.
*/
+ @Test
public void testEchoComplexList1() throws Exception {
IGenericService proxy = getProxy("echoComplexList");
@@ -232,6 +237,7 @@ public class DLWMinArrayTests extends Ab
* Test method that echos a List of beans (List<WSUser>)
* The list contains no items.
*/
+ @Test
public void testEchoComplexList0() throws Exception {
IGenericService proxy = getProxy("echoComplexList");
@@ -253,6 +259,7 @@ public class DLWMinArrayTests extends Ab
* Test method that echos a List of beans (List<WSUser>)
* The list contains no items.
*/
+ @Test
public void testEchoComplexListNull() throws Exception {
IGenericService proxy = getProxy("echoComplexList");
@@ -294,6 +301,7 @@ public class DLWMinArrayTests extends Ab
* 2 WSUsers are echo'd
* 2 Strings are echo'd
*/
+ @Test
public void testEcho22() throws Exception {
IGenericService proxy = getProxy("echo");
@@ -340,6 +348,7 @@ public class DLWMinArrayTests extends Ab
* 1 WSUsers is echo'd
* 1 Strings is echo'd
*/
+ @Test
public void testEcho11() throws Exception {
IGenericService proxy = getProxy("echo");
@@ -379,6 +388,7 @@ public class DLWMinArrayTests extends Ab
* 1 WSUsers is echo'd
* 0 Strings are echo'd
*/
+ @Test
public void testEcho10() throws Exception {
IGenericService proxy = getProxy("echo");
@@ -414,6 +424,7 @@ public class DLWMinArrayTests extends Ab
* 0 WSUsers are echo'd
* 1 Strings is echo'd
*/
+ @Test
public void testEcho01() throws Exception {
IGenericService proxy = getProxy("echo");
@@ -447,6 +458,7 @@ public class DLWMinArrayTests extends Ab
* 0 WSUsers are echo'd
* 0 Strings are echo'd
*/
+ @Test
public void testEcho00() throws Exception {
IGenericService proxy = getProxy("echo");
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/DLWMinTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/DLWMinTests.java?rev=1819336&r1=1819335&r2=1819336&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/DLWMinTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/DLWMinTests.java
Wed Dec 27 12:08:59 2017
@@ -19,15 +19,18 @@
package org.apache.axis2.jaxws.sample;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.framework.AbstractTestCase;
import org.apache.axis2.jaxws.sample.dlwmin.sei.Greeter;
import org.apache.axis2.jaxws.sample.dlwmin.sei.TestException;
import org.apache.axis2.jaxws.sample.dlwmin.sei.TestException2;
import org.apache.axis2.jaxws.sample.dlwmin.sei.TestException3;
import org.apache.axis2.jaxws.sample.dlwmin.types.TestBean;
+import org.apache.axis2.testutils.Axis2Server;
+import org.junit.ClassRule;
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
@@ -42,20 +45,17 @@ import javax.xml.ws.WebServiceException;
* "Minimal" indicates that no wrapper beans are associated with the JAX-WS
method.
* In most enterprise scenarios, wrapper beans are packaged with the JAX-WS
application.
*/
-public class DLWMinTests extends AbstractTestCase {
+public class DLWMinTests {
+ @ClassRule
+ public static final Axis2Server server = new Axis2Server("target/repo");
private static final String NAMESPACE =
"http://apache.org/axis2/jaxws/sample/dlwmin";;
private static final QName QNAME_SERVICE = new QName(
NAMESPACE, "GreeterService");
private static final QName QNAME_PORT = new QName(
NAMESPACE, "GreeterPort");
- private static final String URL_ENDPOINT =
"http://localhost:6060/axis2/services/GreeterService.GreeterImplPort";;
- public static Test suite() {
- return getTestSetup(new TestSuite(DLWMinTests.class));
- }
-
- private Greeter getProxy(String action) {
+ private Greeter getProxy(String action) throws Exception {
Service service = Service.create(QNAME_SERVICE);
Greeter proxy = service.getPort(QNAME_PORT, Greeter.class);
BindingProvider p = (BindingProvider) proxy;
@@ -64,14 +64,15 @@ public class DLWMinTests extends Abstrac
p.getRequestContext().put(
BindingProvider.SOAPACTION_URI_PROPERTY, action);
p.getRequestContext().put(
- BindingProvider.ENDPOINT_ADDRESS_PROPERTY, URL_ENDPOINT);
+ BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ server.getEndpoint("GreeterService.GreeterImplPort"));
return proxy;
}
- private Dispatch<String> getDispatch(String action) {
+ private Dispatch<String> getDispatch(String action) throws Exception {
// Get a dispatch
Service svc = Service.create(QNAME_SERVICE);
- svc.addPort(QNAME_PORT, null, URL_ENDPOINT);
+ svc.addPort(QNAME_PORT, null,
server.getEndpoint("GreeterService.GreeterImplPort"));
Dispatch<String> dispatch = svc.createDispatch(QNAME_PORT,
String.class, Service.Mode.PAYLOAD);
BindingProvider p = (BindingProvider) dispatch;
@@ -86,7 +87,8 @@ public class DLWMinTests extends Abstrac
* Test simple greetMe method
* with style doc/lit wrapped without the presence of wrapper classes.
*/
- public void testGreetMe() {
+ @Test
+ public void testGreetMe() throws Exception {
Greeter proxy = getProxy("greetMe");
@@ -104,7 +106,8 @@ public class DLWMinTests extends Abstrac
* with style doc/lit wrapped without the presence of wrapper classes.
* Passing a null input and receiving a null return
*/
- public void testGreetMe_Null() {
+ @Test
+ public void testGreetMe_Null() throws Exception {
Greeter proxy = getProxy("greetMe");
@@ -122,7 +125,8 @@ public class DLWMinTests extends Abstrac
* Test simple greetMe method with dispatch
* with style doc/lit wrapped without the presence of wrapper classes.
*/
- public void testGreetMe_Dispatch() {
+ @Test
+ public void testGreetMe_Dispatch() throws Exception {
Dispatch<String> dispatch = getDispatch("greetMe");
@@ -155,7 +159,8 @@ public class DLWMinTests extends Abstrac
* Test simpleTest method
* with style doc/lit wrapped without the presence of wrapper classes.
*/
- public void testSimpleTest() {
+ @Test
+ public void testSimpleTest() throws Exception {
Greeter proxy = getProxy("simpleTest");
@@ -181,7 +186,8 @@ public class DLWMinTests extends Abstrac
* Test simpleTest method
* with style doc/lit wrapped without the presence of wrapper classes.
*/
- public void testSimpleTestNoName() {
+ @Test
+ public void testSimpleTestNoName() throws Exception {
Greeter proxy = getProxy("simpleTest");
@@ -205,7 +211,8 @@ public class DLWMinTests extends Abstrac
* Test simpleTest method with dispatch
* with style doc/lit wrapped without the presence of wrapper classes.
*/
- public void testSimple_Dispatch() {
+ @Test
+ public void testSimple_Dispatch() throws Exception {
Dispatch<String> dispatch = getDispatch("simpleTest");
@@ -237,7 +244,8 @@ public class DLWMinTests extends Abstrac
* Test simpleTest method with dispatch
* with style doc/lit wrapped without the presence of wrapper classes.
*/
- public void testSimpleNoName_Dispatch() {
+ @Test
+ public void testSimpleNoName_Dispatch() throws Exception {
Dispatch<String> dispatch = getDispatch("simpleTest");
@@ -269,7 +277,8 @@ public class DLWMinTests extends Abstrac
* Test simpleUnqualified method
* with style doc/lit wrapped without the presence of wrapper classes.
*/
- public void testUnqualified() {
+ @Test
+ public void testUnqualified() throws Exception {
Greeter proxy = getProxy("testUnqualified");
@@ -286,7 +295,8 @@ public class DLWMinTests extends Abstrac
* Test simpleUnqualified method with dispatch
* with style doc/lit wrapped without the presence of wrapper classes.
*/
- public void testUnqualified_Dispatch() {
+ @Test
+ public void testUnqualified_Dispatch() throws Exception {
Dispatch<String> dispatch = getDispatch("testUnqualified");
@@ -317,6 +327,7 @@ public class DLWMinTests extends Abstrac
/**
* Test echo with complexType
*/
+ @Test
public void testProcess_Echo() throws Exception {
Greeter proxy = getProxy("process");
@@ -340,6 +351,7 @@ public class DLWMinTests extends Abstrac
/**
* Test throwing checked exception w/o a JAXB Bean
*/
+ @Test
public void testProcess_CheckException() throws Exception {
Greeter proxy = getProxy("process");
@@ -378,6 +390,7 @@ public class DLWMinTests extends Abstrac
/**
* Test throwing checked exception that has a JAXB Bean
*/
+ @Test
public void testProcess_CheckException2() throws Exception {
Greeter proxy = getProxy("process");
@@ -410,6 +423,7 @@ public class DLWMinTests extends Abstrac
/**
* Test throwing checked exception that is a compliant JAXWS exception
*/
+ @Test
public void testProcess_CheckException3() throws Exception {
Greeter proxy = getProxy("process");
@@ -442,6 +456,7 @@ public class DLWMinTests extends Abstrac
/**
* Test throwing WebServiceException
*/
+ @Test
public void testProcess_WebServiceException() throws Exception {
Greeter proxy = getProxy("process");
@@ -472,6 +487,7 @@ public class DLWMinTests extends Abstrac
/**
* Test throwing NPE
*/
+ @Test
public void testProcess_NPE() throws Exception {
Greeter proxy = getProxy("process");
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/ResourceInjectionTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/ResourceInjectionTests.java?rev=1819336&r1=1819335&r2=1819336&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/ResourceInjectionTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/ResourceInjectionTests.java
Wed Dec 27 12:08:59 2017
@@ -19,27 +19,27 @@
package org.apache.axis2.jaxws.sample;
-import javax.xml.ws.BindingProvider;
+import static org.junit.Assert.assertTrue;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import javax.xml.ws.BindingProvider;
-import org.apache.axis2.jaxws.framework.AbstractTestCase;
import
org.apache.axis2.jaxws.sample.resourceinjection.sei.ResourceInjectionPortType;
import
org.apache.axis2.jaxws.sample.resourceinjection.sei.ResourceInjectionService;
+import org.apache.axis2.testutils.Axis2Server;
+import org.junit.ClassRule;
+import org.junit.Ignore;
+import org.junit.Test;
-public class ResourceInjectionTests extends AbstractTestCase {
- String axisEndpoint =
"http://localhost:6060/axis2/services/ResourceInjectionService.ResourceInjectionPortTypeImplPort";;
+public class ResourceInjectionTests {
+ @ClassRule
+ public static final Axis2Server server = new Axis2Server("target/repo");
- public static Test suite() {
- return getTestSetup(new TestSuite(ResourceInjectionTests.class));
- }
-
- public ResourceInjectionPortType getProxy() {
+ public ResourceInjectionPortType getProxy() throws Exception {
ResourceInjectionService service = new ResourceInjectionService();
ResourceInjectionPortType proxy = service.getResourceInjectionPort();
BindingProvider p = (BindingProvider) proxy;
- p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
axisEndpoint);
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+
server.getEndpoint("ResourceInjectionService.ResourceInjectionPortTypeImplPort"));
return proxy;
}
@@ -47,6 +47,7 @@ public class ResourceInjectionTests exte
* This test ensures that an endpoint with an inject WebServiceContext
* can successfully get and query the web service.
*/
+ @Test
public void testEchoWithResourceInjectionAndLifecycleMethods() throws
Exception {
ResourceInjectionPortType proxy = getProxy();
@@ -77,7 +78,9 @@ public class ResourceInjectionTests exte
*
* See:
jaxws/src/org/apache/axis2/jaxws/context/WebServiceContextImpl.java line 146
*/
- public void _testResourceInjectionEndpointReference() {
+ @Ignore
+ @Test
+ public void testResourceInjectionEndpointReference() throws Exception {
ResourceInjectionPortType proxy = getProxy();
String response = proxy.testInjection("epr");
assertTrue("The response was null", response != null);
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/WrapTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/WrapTests.java?rev=1819336&r1=1819335&r2=1819336&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/WrapTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/WrapTests.java
Wed Dec 27 12:08:59 2017
@@ -22,48 +22,47 @@
*/
package org.apache.axis2.jaxws.sample;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.axis2.datasource.jaxb.JAXBCustomBuilderMonitor;
import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.framework.AbstractTestCase;
import org.apache.axis2.jaxws.sample.wrap.sei.DocLitWrap;
import org.apache.axis2.jaxws.sample.wrap.sei.DocLitWrapService;
+import org.apache.axis2.testutils.Axis2Server;
+import org.junit.ClassRule;
+import org.junit.Test;
import org.test.sample.wrap.Header;
import org.test.sample.wrap.HeaderPart0;
import org.test.sample.wrap.HeaderPart1;
import org.test.sample.wrap.HeaderResponse;
+import static org.junit.Assert.assertTrue;
+
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Holder;
import javax.xml.ws.WebServiceException;
-public class WrapTests extends AbstractTestCase {
+public class WrapTests {
+ @ClassRule
+ public static final Axis2Server server = new Axis2Server("target/repo");
- String axisEndpoint =
"http://localhost:6060/axis2/services/DocLitWrapService.DocLitWrapImplPort";;
-
// String containing some characters that require XML encoding
private static String XMLCHARS = "<<<3>>>3>>>3";
- public static Test suite() {
- return getTestSetup(new TestSuite(WrapTests.class));
- }
-
/**
* Get theDocLitWrap Prxoy
* @return DocLitWrapProxy
*/
- private DocLitWrap getProxy() {
+ private DocLitWrap getProxy() throws Exception {
DocLitWrapService service = new DocLitWrapService();
DocLitWrap proxy = service.getDocLitWrapPort();
BindingProvider p = (BindingProvider) proxy;
- p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
axisEndpoint);
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ server.getEndpoint("DocLitWrapService.DocLitWrapImplPort"));
return proxy;
}
- public void testTwoWaySync(){
+ @Test
+ public void testTwoWaySync() throws Exception {
TestLogger.logger.debug("------------------------------");
- TestLogger.logger.debug("Test : " + getName());
String reqString = "Test twoWay Sync";
DocLitWrap proxy = getProxy();
@@ -73,9 +72,9 @@ public class WrapTests extends AbstractT
TestLogger.logger.debug("------------------------------");
}
- public void testOneWayVoidWithNoInputParams(){
+ @Test
+ public void testOneWayVoidWithNoInputParams() throws Exception {
TestLogger.logger.debug("------------------------------");
- TestLogger.logger.debug("Test : " + getName());
DocLitWrapService service = new DocLitWrapService();
DocLitWrap proxy = getProxy();
@@ -87,9 +86,9 @@ public class WrapTests extends AbstractT
TestLogger.logger.debug("------------------------------");
}
- public void testTwoWayHolder(){
+ @Test
+ public void testTwoWayHolder() throws Exception {
TestLogger.logger.debug("------------------------------");
- TestLogger.logger.debug("Test : " + getName());
String holderString = new String("Test twoWay Sync");
Integer holderInteger = new Integer(0);
@@ -107,9 +106,9 @@ public class WrapTests extends AbstractT
TestLogger.logger.debug("------------------------------");
}
- public void testTwoWayWithHeadersAndHolders(){
+ @Test
+ public void testTwoWayWithHeadersAndHolders() throws Exception {
TestLogger.logger.debug("------------------------------");
- TestLogger.logger.debug("Test : " + getName());
Header header = new Header();
header.setOut(0);
@@ -132,9 +131,9 @@ public class WrapTests extends AbstractT
TestLogger.logger.debug("------------------------------");
}
- public void testTwoWayHolderAsync(){
+ @Test
+ public void testTwoWayHolderAsync() throws Exception {
TestLogger.logger.debug("------------------------------");
- TestLogger.logger.debug("Test : " + getName());
String holderString = new String("Test twoWay Sync");
Integer holderInteger = new Integer(0);
@@ -155,9 +154,9 @@ public class WrapTests extends AbstractT
/**
* This is a test of a doc/lit echo test
*/
- public void testEchoString() {
+ @Test
+ public void testEchoString() throws Exception {
TestLogger.logger.debug("------------------------------");
- TestLogger.logger.debug("Test : " + getName());
String request = "hello world";
@@ -176,9 +175,9 @@ public class WrapTests extends AbstractT
* request in a header. This can only be reproduced via
* annotations and WSGEN. WSImport will not allow this.
*/
- public void testEchoStringWSGEN1() {
+ @Test
+ public void testEchoStringWSGEN1() throws Exception {
TestLogger.logger.debug("------------------------------");
- TestLogger.logger.debug("Test : " + getName());
String request = "hello world";
@@ -197,10 +196,9 @@ public class WrapTests extends AbstractT
* response in a header. This can only be reproduced via
* annotations and WSGEN. WSImport will not allow this.
*/
-
- public void testEchoStringWSGEN2() {
+ @Test
+ public void testEchoStringWSGEN2() throws Exception {
TestLogger.logger.debug("------------------------------");
- TestLogger.logger.debug("Test : " + getName());
String request = "hello world 2";
@@ -217,9 +215,9 @@ public class WrapTests extends AbstractT
/**
* This is a test of a doc/lit echo test with xml chars.
*/
- public void testEchoString_xmlchars() {
+ @Test
+ public void testEchoString_xmlchars() throws Exception {
TestLogger.logger.debug("------------------------------");
- TestLogger.logger.debug("Test : " + getName());
String request = XMLCHARS;
@@ -238,9 +236,9 @@ public class WrapTests extends AbstractT
* request in a header. This can only be reproduced via
* annotations and WSGEN. WSImport will not allow this.
*/
- public void testEchoStringWSGEN1_xmlchars() {
+ @Test
+ public void testEchoStringWSGEN1_xmlchars() throws Exception {
TestLogger.logger.debug("------------------------------");
- TestLogger.logger.debug("Test : " + getName());
String request = XMLCHARS;
@@ -259,10 +257,9 @@ public class WrapTests extends AbstractT
* response in a header. This can only be reproduced via
* annotations and WSGEN. WSImport will not allow this.
*/
-
- public void testEchoStringWSGEN2_xmlchars() {
+ @Test
+ public void testEchoStringWSGEN2_xmlchars() throws Exception {
TestLogger.logger.debug("------------------------------");
- TestLogger.logger.debug("Test : " + getName());
String request = XMLCHARS;
@@ -279,9 +276,9 @@ public class WrapTests extends AbstractT
* Test to validate whether a JAXBCustomBuilder is plugged in
* on the server.
*/
- public void testJAXBCB_Server1(){
+ @Test
+ public void testJAXBCB_Server1() throws Exception {
TestLogger.logger.debug("------------------------------");
- TestLogger.logger.debug("Test : " + getName());
String reqString = "JAXBCustomBuilderServer1";
DocLitWrap proxy = getProxy();
@@ -310,9 +307,9 @@ public class WrapTests extends AbstractT
* Test to validate whether a JAXBCustomBuilder is plugged in
* and used on the server.
*/
- public void testJAXBCB_Server2(){
+ @Test
+ public void testJAXBCB_Server2() throws Exception {
TestLogger.logger.debug("------------------------------");
- TestLogger.logger.debug("Test : " + getName());
String reqString = "JAXBCustomBuilderServer2";
DocLitWrap proxy = getProxy();
@@ -342,9 +339,9 @@ public class WrapTests extends AbstractT
* Test to validate whether a JAXBCustomBuilder is plugged and used
* on the client
*/
- public void testJAXBCB_Client(){
+ @Test
+ public void testJAXBCB_Client() throws Exception {
TestLogger.logger.debug("------------------------------");
- TestLogger.logger.debug("Test : " + getName());
try{
String reqString = "JAXBCustomBuilderClient";
DocLitWrap proxy = getProxy();
@@ -379,9 +376,9 @@ public class WrapTests extends AbstractT
* Test to validate whether a JAXBCustomBuilder is plugged and used
* on the client
*/
- public void testJAXBCB_Client_withHighFidelity(){
+ @Test
+ public void testJAXBCB_Client_withHighFidelity() throws Exception {
TestLogger.logger.debug("------------------------------");
- TestLogger.logger.debug("Test : " + getName());
try{
String reqString = "JAXBCustomBuilderClient";
DocLitWrap proxy = getProxy();
@@ -420,9 +417,9 @@ public class WrapTests extends AbstractT
* on the client. Also makes sure that the JAXBCustomBuilder
* falls back to normal processing when faults are thrown.
*/
- public void testJAXBCB_Fault(){
+ @Test
+ public void testJAXBCB_Fault() throws Exception {
TestLogger.logger.debug("------------------------------");
- TestLogger.logger.debug("Test : " + getName());
try{
String reqNormalString = "JAXBCustomBuilderClient";
String reqFaultString = "JAXBCustomBuilderFault";
