JBossWS SVN: r19183 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-22 10:56:53 -0500 (Mon, 22 Dec 2014)
New Revision: 19183
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarTestCase.java
Log:
arquillian conversion calendar test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarTestCase.java 2014-12-22 15:43:10 UTC (rev 19182)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarTestCase.java 2014-12-22 15:56:53 UTC (rev 19183)
@@ -36,7 +36,15 @@
import javax.xml.ws.Service;
import javax.xml.ws.Service.Mode;
-import junit.framework.Test;
+import org.junit.runner.RunWith;
+import org.junit.Test;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.Filter;
@@ -51,35 +59,32 @@
* @author alessio.soldano(a)jboss.com
* @since 22-Apr-2014
*/
+(a)RunWith(Arquillian.class)
public class CalendarTestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-calendar/EndpointService";
+ @ArquillianResource
+ private URL baseURL;
- public static BaseDeployment<?>[] createDeployments() {
- List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
- list.add(new JBossWSTestHelper.WarDeployment("jaxws-calendar.war") { {
+ @Deployment(testable = false)
+ public static WebArchive createDeployments() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-calendar.war");
archive
- .addManifest()
- .addPackages(false, new Filter<ArchivePath>() {
- @Override
- public boolean include(ArchivePath path)
- {
- return !path.get().contains("TestCase");
- }
- }, "org.jboss.test.ws.jaxws.calendar");
- }
- });
- return list.toArray(new BaseDeployment<?>[list.size()]);
+ .addManifest()
+ .addPackages(false, new Filter<ArchivePath>() {
+ @Override
+ public boolean include(ArchivePath path)
+ {
+ return !path.get().contains("TestCase");
+ }
+ }, "org.jboss.test.ws.jaxws.calendar");
+ return archive;
}
- public static Test suite()
- {
- return new JBossWSTestSetup(CalendarTestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
- }
-
+ @Test
+ @RunAsClient
public void testCalendar() throws Exception
{
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ URL wsdlURL = new URL(baseURL + "/EndpointService?wsdl");
QName qname = new QName("http://org.jboss.ws/jaxws/calendar", "EndpointService");
Service service = Service.create(wsdlURL, qname);
CalendarEndpoint port = service.getPort(CalendarEndpoint.class);
@@ -90,9 +95,11 @@
assertEquals(calendar.getTimeInMillis(), response.getTimeInMillis());
}
+ @Test
+ @RunAsClient
public void testXMLGregorianCalendar() throws Exception
{
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ URL wsdlURL = new URL(baseURL + "/EndpointService?wsdl");
QName qname = new QName("http://org.jboss.ws/jaxws/calendar", "EndpointService");
Service service = Service.create(wsdlURL, qname);
CalendarEndpoint port = service.getPort(CalendarEndpoint.class);
@@ -103,9 +110,11 @@
Object response = port.echoXMLGregorianCalendar(calendar);
assertEquals("2002-04-05T00:00:00.000Z", response.toString());
}
-
+
+ @Test
+ @RunAsClient
public void testEmptyCalendar() throws Exception {
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ URL wsdlURL = new URL(baseURL + "/EndpointService?wsdl");
QName qname = new QName("http://org.jboss.ws/jaxws/calendar", "EndpointService");
Service service = Service.create(wsdlURL, qname);
11 years
JBossWS SVN: r19182 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-22 10:43:10 -0500 (Mon, 22 Dec 2014)
New Revision: 19182
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java
Log:
arquillian conversion jbws2241 test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2014-12-22 15:22:10 UTC (rev 19181)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2014-12-22 15:43:10 UTC (rev 19182)
@@ -31,7 +31,15 @@
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
-import junit.framework.Test;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
@@ -44,31 +52,28 @@
* @author alessio.soldano(a)jboss.com
* @since 29-Sep-2008
*/
+(a)RunWith(Arquillian.class)
public class JBWS2241TestCase extends JBossWSTest
{
- public static BaseDeployment<?>[] createDeployments() {
- List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
- list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws2241.jar") { {
+ @ArquillianResource
+ private URL baseURL;
+
+ @Deployment(testable = false)
+ public static JavaArchive createDeployments() {
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws2241.jar");
archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.jbws2241.EJB3Bean.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2241.EJB3RemoteInterface.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2241.EndpointInterface.class)
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2241/META-INF/jboss-ejb3.xml"), "jboss-ejb3.xml")
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2241/META-INF/jboss-webservices.xml"), "jboss-webservices.xml")
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2241/META-INF/jboss.xml"), "jboss.xml");
- }
- });
- return list.toArray(new BaseDeployment<?>[list.size()]);
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.jbws2241.EJB3Bean.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2241.EJB3RemoteInterface.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2241.EndpointInterface.class)
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2241/META-INF/jboss-ejb3.xml"), "jboss-ejb3.xml")
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2241/META-INF/jboss-webservices.xml"), "jboss-webservices.xml")
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2241/META-INF/jboss.xml"), "jboss.xml");
+ return archive;
}
- public static Test suite()
- {
- return new JBossWSTestSetup(JBWS2241TestCase.class, JBossWSTestHelper.writeToFile(createDeployments()), true);
- }
-
private EndpointInterface getPort(String user, String pwd) throws MalformedURLException {
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/contextRoot/urlPattern/test?wsdl");
+ URL wsdlURL = new URL(baseURL + "/contextRoot/urlPattern/test?wsdl");
QName serviceName = new QName("http://jbws2241.jaxws.ws.test.jboss.org/", "EJB3BeanService");
Service service = Service.create(wsdlURL, serviceName);
EndpointInterface port = service.getPort(EndpointInterface.class);
@@ -81,6 +86,8 @@
return port;
}
+ @Test
+ @RunAsClient
public void testInvocation() throws Exception
{
EndpointInterface port = getPort("kermit", "thefrog");
11 years
JBossWS SVN: r19181 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2278.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-22 10:22:10 -0500 (Mon, 22 Dec 2014)
New Revision: 19181
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2278/JBWS2278TestCase.java
Log:
arquillian conversion jbws2278 test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2278/JBWS2278TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2278/JBWS2278TestCase.java 2014-12-22 12:37:34 UTC (rev 19180)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2278/JBWS2278TestCase.java 2014-12-22 15:22:10 UTC (rev 19181)
@@ -33,7 +33,15 @@
import javax.xml.ws.Service;
import javax.xml.ws.handler.Handler;
-import junit.framework.Test;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.Filter;
@@ -49,40 +57,37 @@
* @since 30-Sep-2008
* @see https://jira.jboss.org/jira/browse/JBWS-2278
*/
+(a)RunWith(Arquillian.class)
public class JBWS2278TestCase extends JBossWSTest
{
private TestEndpoint port11;
private TestEndpoint port12;
- public static BaseDeployment<?>[] createDeployments() {
- List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
- list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2278.war") { {
+ @ArquillianResource
+ private URL baseURL;
+
+ @Deployment(testable = false)
+ public static WebArchive createDeployments() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws2278.war");
archive
- .addManifest()
- .addPackages(false, new Filter<ArchivePath> () {
- @Override
- public boolean include(ArchivePath path)
- {
- return !path.get().contains("TestCase");
- }}, "org.jboss.test.ws.jaxws.jbws2278")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2278/WEB-INF/jboss-web.xml"), "jboss-web.xml")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2278/WEB-INF/wsdl/Test.wsdl"), "wsdl/Test.wsdl")
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2278/WEB-INF/web.xml"));
- }
- });
- return list.toArray(new BaseDeployment<?>[list.size()]);
+ .addManifest()
+ .addPackages(false, new Filter<ArchivePath> () {
+ @Override
+ public boolean include(ArchivePath path)
+ {
+ return !path.get().contains("TestCase");
+ }}, "org.jboss.test.ws.jaxws.jbws2278")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2278/WEB-INF/jboss-web.xml"), "jboss-web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2278/WEB-INF/wsdl/Test.wsdl"), "wsdl/Test.wsdl")
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2278/WEB-INF/web.xml"));
+ return archive;
}
- public static Test suite() throws Exception
- {
- return new JBossWSTestSetup(JBWS2278TestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
- }
-
@Override
public void setUp() throws Exception
{
super.setUp();
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2278/soap11?wsdl");
+ URL wsdlURL = new URL(baseURL + "/soap11?wsdl");
QName serviceName = new QName("http://org.jboss.test.ws/jbws2278", "TestService");
Service service = Service.create(wsdlURL, serviceName);
@@ -100,17 +105,23 @@
((BindingProvider)port12).getBinding().setHandlerChain(handlerChain12);
}
+ @Test
+ @RunAsClient
public void testCallSoap11() throws Exception
{
+ setUp();
final String message = "Hello!!";
String response = port11.echo(message);
assertEquals(message, response);
}
+ @Test
+ @RunAsClient
public void testCheckedExceptionSoap11() throws Exception
{
try
{
+ setUp();
port11.echo(TestEndpointImpl.TEST_EXCEPTION);
fail("Expected TestException not thrown.");
}
@@ -120,10 +131,13 @@
}
}
+ @Test
+ @RunAsClient
public void testRuntimeExceptionSoap11()
{
try
{
+ setUp();
port11.echo(TestEndpointImpl.RUNTIME_EXCEPTION);
fail("Expected Exception not thrown.");
}
@@ -133,17 +147,23 @@
}
}
+ @Test
+ @RunAsClient
public void testCallSoap12() throws Exception
{
+ setUp();
final String message = "Hello!!";
String response = port12.echo(message);
assertEquals(message, response);
}
+ @Test
+ @RunAsClient
public void testCheckedExceptionSoap12() throws Exception
{
try
{
+ setUp();
port12.echo(TestEndpointImpl.TEST_EXCEPTION);
fail("Expected TestException not thrown.");
}
@@ -153,10 +173,13 @@
}
}
+ @Test
+ @RunAsClient
public void testRuntimeExceptionSoap12()
{
try
{
+ setUp();
port12.echo(TestEndpointImpl.RUNTIME_EXCEPTION);
fail("Expected Exception not thrown.");
}
11 years
JBossWS SVN: r19180 - stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-12-22 07:37:34 -0500 (Mon, 22 Dec 2014)
New Revision: 19180
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java
Log:
[JBWS-3861] Fixing filter
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2014-12-22 11:45:06 UTC (rev 19179)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2014-12-22 12:37:34 UTC (rev 19180)
@@ -160,6 +160,7 @@
l.add("127.0.0.1");
l.add("[::1]");
l.add("[0:0:0:0:0:0:0:1]");
+ l.add(getServerHost());
HostFilter hostFilter = new HostFilter(l,false); //destination
RecordFilter[] filters = new RecordFilter[] {operationFilter, hostFilter};
11 years
JBossWS SVN: r19179 - in stack/cxf/trunk/modules/testsuite/cxf-tests/src/test: java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-12-22 06:45:06 -0500 (Mon, 22 Dec 2014)
New Revision: 19179
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/session/SessionEndpointTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/DeploymentArchives.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/sts/SampleSTS.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsholderofkey/SampleSTSHolderOfKey.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl
Log:
[JBWS-3861] Fix a bunch of failures in cxf-tests
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/session/SessionEndpointTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/session/SessionEndpointTestCase.java 2014-12-22 02:39:43 UTC (rev 19178)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/session/SessionEndpointTestCase.java 2014-12-22 11:45:06 UTC (rev 19179)
@@ -85,10 +85,10 @@
SessionEndpoint proxy2 = this.createPort();
((BindingProvider) proxy).getRequestContext().put(BindingProvider.SESSION_MAINTAIN_PROPERTY, true);
((BindingProvider) proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- "http://localhost:8080/jaxws-samples-session/session");
+ "http://" + getServerHost() + ":8080/jaxws-samples-session/session");
((BindingProvider) proxy2).getRequestContext().put(BindingProvider.SESSION_MAINTAIN_PROPERTY, true);
((BindingProvider) proxy2).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- "http://localhost:8080/jaxws-samples-session/session");
+ "http://" + getServerHost() + ":8080/jaxws-samples-session/session");
proxy.setNumber(10);
assertEquals("Number is 10", proxy.getNumber());
proxy2.setNumber(20);
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/DeploymentArchives.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/DeploymentArchives.java 2014-12-22 02:39:43 UTC (rev 19178)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/DeploymentArchives.java 2014-12-22 11:45:06 UTC (rev 19179)
@@ -34,6 +34,7 @@
+ "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl annotations\n")) //cxf impl required to extend STS impl
.addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.sts.STSCallbackHandler.class)
.addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.sts.SampleSTS.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.WSTrustAppUtils.class)
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/jboss-web.xml"), "jboss-web.xml")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"), "wsdl/ws-trust-1.4-service.wsdl")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/stsstore.jks"), "classes/stsstore.jks")
@@ -114,6 +115,7 @@
+ "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl annotations\n")) //cxf impl required to extend STS impl
.addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.stsholderofkey.STSHolderOfKeyCallbackHandler.class)
.addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.stsholderofkey.SampleSTSHolderOfKey.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.WSTrustAppUtils.class)
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/jboss-web.xml"), "jboss-web.xml")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/holderofkey-ws-trust-1.4-service.wsdl"), "wsdl/holderofkey-ws-trust-1.4-service.wsdl")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/stsstore.jks"), "classes/stsstore.jks")
@@ -158,6 +160,7 @@
+ "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl annotations\n")) //cxf impl required to extend STS impl
.addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.stsbearer.STSBearerCallbackHandler.class)
.addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.stsbearer.SampleSTSBearer.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.WSTrustAppUtils.class)
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/jboss-web.xml"), "jboss-web.xml")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl"), "wsdl/bearer-ws-trust-1.4-service.wsdl")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/stsstore.jks"), "classes/stsstore.jks")
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/sts/SampleSTS.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/sts/SampleSTS.java 2014-12-22 02:39:43 UTC (rev 19178)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/sts/SampleSTS.java 2014-12-22 11:45:06 UTC (rev 19179)
@@ -40,6 +40,7 @@
import org.apache.cxf.sts.token.validator.SAMLTokenValidator;
import org.apache.cxf.sts.token.validator.UsernameTokenValidator;
import org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider;
+import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.WSTrustAppUtils;
@WebServiceProvider(serviceName = "SecurityTokenService",
portName = "UT_Port",
@@ -71,14 +72,17 @@
"http://localhost:(\\d)*/jaxws-samples-wsse-policy-trust/SecurityService",
"http://\\[::1\\]:(\\d)*/jaxws-samples-wsse-policy-trust/SecurityService",
"http://\\[0:0:0:0:0:0:0:1\\]:(\\d)*/jaxws-samples-wsse-policy-trust/SecurityService",
+ "http://" + WSTrustAppUtils.getServerHost() + ":(\\d)*/jaxws-samples-wsse-policy-trust/SecurityService",
"http://localhost:(\\d)*/jaxws-samples-wsse-policy-trust-actas/ActAsService",
"http://\\[::1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-actas/ActAsService",
"http://\\[0:0:0:0:0:0:0:1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-actas/ActAsService",
+ "http://" + WSTrustAppUtils.getServerHost() + ":(\\d)*/jaxws-samples-wsse-policy-trust-actas/ActAsService",
"http://localhost:(\\d)*/jaxws-samples-wsse-policy-trust-onbehalfof/OnBeha...",
"http://\\[::1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-onbehalfof/OnBehalfOfService",
- "http://\\[0:0:0:0:0:0:0:1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-onbehalfof/OnBehalfOfService"
+ "http://\\[0:0:0:0:0:0:0:1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-onbehalfof/OnBehalfOfService",
+ "http://" + WSTrustAppUtils.getServerHost() + ":(\\d)*/jaxws-samples-wsse-policy-trust-onbehalfof/OnBehalfOfService"
));
services.add(service);
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java 2014-12-22 02:39:43 UTC (rev 19178)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java 2014-12-22 11:45:06 UTC (rev 19179)
@@ -29,6 +29,7 @@
import org.apache.cxf.sts.service.StaticService;
import org.apache.cxf.sts.token.provider.SAMLTokenProvider;
import org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider;
+import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.WSTrustAppUtils;
import javax.xml.ws.WebServiceProvider;
import java.util.Arrays;
@@ -65,7 +66,8 @@
service.setEndpoints(Arrays.asList(
"https://localhost:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerSer...",
"https://\\[::1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService",
- "https://\\[0:0:0:0:0:0:0:1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService"
+ "https://\\[0:0:0:0:0:0:0:1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService",
+ "https://" + WSTrustAppUtils.getServerHost() + ":(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService"
));
services.add(service);
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsholderofkey/SampleSTSHolderOfKey.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsholderofkey/SampleSTSHolderOfKey.java 2014-12-22 02:39:43 UTC (rev 19178)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsholderofkey/SampleSTSHolderOfKey.java 2014-12-22 11:45:06 UTC (rev 19179)
@@ -29,6 +29,7 @@
import org.apache.cxf.sts.service.StaticService;
import org.apache.cxf.sts.token.provider.SAMLTokenProvider;
import org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider;
+import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.WSTrustAppUtils;
import javax.xml.ws.WebServiceProvider;
import java.util.Arrays;
@@ -68,7 +69,8 @@
service.setEndpoints(Arrays.asList(
"https://localhost:(\\d)*/jaxws-samples-wsse-policy-trust-holderofkey/Hold...",
"https://\\[::1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-holderofkey/HolderOfKeyService",
- "https://\\[0:0:0:0:0:0:0:1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-holderofkey/HolderOfKeyService"
+ "https://\\[0:0:0:0:0:0:0:1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-holderofkey/HolderOfKeyService",
+ "https://" + WSTrustAppUtils.getServerHost() + ":(\\d)*/jaxws-samples-wsse-policy-trust-holderofkey/HolderOfKeyService"
));
services.add(service);
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl 2014-12-22 02:39:43 UTC (rev 19178)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl 2014-12-22 11:45:06 UTC (rev 19179)
@@ -4,6 +4,6 @@
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:import namespace="http://test.jbws3792/"
- location="http://localhost:8080/jbws3792-external-wsdl/import.wsdl"/>
+ location="http://@jboss.bind.address@:8080/jbws3792-external-wsdl/import.wsdl"/>
</wsdl:definitions>
\ No newline at end of file
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl 2014-12-22 02:39:43 UTC (rev 19178)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl 2014-12-22 11:45:06 UTC (rev 19179)
@@ -6,7 +6,7 @@
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
>
<wsdl:import namespace="http://hello/test"
- location="http://localhost:8080/jbws3792-hello/HelloService?wsdl" />
+ location="http://@jboss.bind.address@:8080/jbws3792-hello/HelloService?wsdl" />
<wsdl:portType name="GreetingsService">
</wsdl:portType>
11 years
JBossWS SVN: r19178 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-21 21:39:43 -0500 (Sun, 21 Dec 2014)
New Revision: 19178
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/JBWS3753TestCase.java
Log:
arquillian conversion jbws3753 test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/JBWS3753TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/JBWS3753TestCase.java 2014-12-22 02:26:55 UTC (rev 19177)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/JBWS3753TestCase.java 2014-12-22 02:39:43 UTC (rev 19178)
@@ -29,8 +29,17 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
-import junit.framework.Test;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment;
@@ -41,11 +50,15 @@
*
* @author alessio.soldano(a)jboss.com
*/
+(a)RunWith(Arquillian.class)
public class JBWS3753TestCase extends JBossWSTest
{
- public static BaseDeployment<?>[] createDeployments() {
- List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
- list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3753.war") { {
+ @ArquillianResource
+ private URL baseURL;
+
+ @Deployment(testable = false)
+ public static WebArchive createDeployments() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws3753.war");
archive
.addManifest()
.addClass(org.jboss.test.ws.jaxws.jbws3753.ServiceAImpl.class)
@@ -53,32 +66,32 @@
.addClass(org.jboss.test.ws.jaxws.jbws3753.ServiceImpl.class)
.addClass(org.jboss.test.ws.jaxws.jbws3753.ServiceInterface.class)
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3753/WEB-INF/web.xml"));
- }
- });
- return list.toArray(new BaseDeployment<?>[list.size()]);
+ return archive;
}
- public static Test suite() {
- return new JBossWSTestSetup(JBWS3753TestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
- }
-
+ @Test
+ @RunAsClient
public void testService() throws Exception
{
- Service service = Service.create(new URL("http://" + getServerHost() + ":8080/jaxws-jbws3753/service?wsdl"), new QName("http://org.jboss.ws/jaxws/jbws3753/", "MyService"));
+ Service service = Service.create(new URL(baseURL + "/service?wsdl"), new QName("http://org.jboss.ws/jaxws/jbws3753/", "MyService"));
ServiceInterface port = service.getPort(ServiceInterface.class);
assertEquals("Hi John", port.greetMe("John"));
}
-
+
+ @Test
+ @RunAsClient
public void testServiceA() throws Exception
{
- Service service = Service.create(new URL("http://" + getServerHost() + ":8080/jaxws-jbws3753/serviceA?wsdl"), new QName("http://org.jboss.ws/jaxws/jbws3753/", "MyService"));
+ Service service = Service.create(new URL(baseURL + "/serviceA?wsdl"), new QName("http://org.jboss.ws/jaxws/jbws3753/", "MyService"));
ServiceInterface port = service.getPort(ServiceInterface.class);
assertEquals("(A) Hi John", port.greetMe("John"));
}
+ @Test
+ @RunAsClient
public void testServiceB() throws Exception
{
- Service service = Service.create(new URL("http://" + getServerHost() + ":8080/jaxws-jbws3753/serviceB?wsdl"), new QName("http://org.jboss.ws/jaxws/jbws3753/", "MyService"));
+ Service service = Service.create(new URL(baseURL + "/serviceB?wsdl"), new QName("http://org.jboss.ws/jaxws/jbws3753/", "MyService"));
ServiceInterface port = service.getPort(ServiceInterface.class);
assertEquals("(B) Hi John", port.greetMe("John"));
}
11 years
JBossWS SVN: r19177 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3552.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-21 21:26:55 -0500 (Sun, 21 Dec 2014)
New Revision: 19177
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java
Log:
arquillian conversion jbws3552 test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java 2014-12-22 01:45:38 UTC (rev 19176)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java 2014-12-22 02:26:55 UTC (rev 19177)
@@ -28,7 +28,15 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
-import junit.framework.Test;
+import org.junit.runner.RunWith;
+import org.junit.Test;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.Filter;
@@ -49,83 +57,99 @@
* </ul>
* @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
*/
+(a)RunWith(Arquillian.class)
public class JBWS3552TestCase extends JBossWSTest {
-
- public static BaseDeployment<?>[] createDeployments() {
- List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
- list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3552.war") { {
+
+ @ArquillianResource
+ private URL baseURL;
+
+ @Deployment(testable = false)
+ public static WebArchive createDeployments() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws3552.war");
archive
- .addManifest()
- .addPackages(false, new Filter<ArchivePath>() {
- @Override
- public boolean include(ArchivePath path)
- {
- return !path.get().contains("TestCase");
- }}, "org.jboss.test.ws.jaxws.jbws3552");
- }
- });
- return list.toArray(new BaseDeployment<?>[list.size()]);
+ .addManifest()
+ .addPackages(false, new Filter<ArchivePath>() {
+ @Override
+ public boolean include(ArchivePath path)
+ {
+ return !path.get().contains("TestCase");
+ }}, "org.jboss.test.ws.jaxws.jbws3552");
+ return archive;
}
-
- public static Test suite() {
- return new JBossWSTestSetup(JBWS3552TestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
- }
- private EndpointIface getProxy() throws Exception {
- final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3552/EndpointImpl?wsdl");
- final QName serviceName = new QName("http://jbws3552.jaxws.ws.test.jboss.org/", "EndpointImplService");
- final Service service = Service.create(wsdlURL, serviceName);
- return service.getPort(EndpointIface.class);
- }
+ private EndpointIface getProxy() throws Exception {
+ final URL wsdlURL = new URL(baseURL + "/EndpointImpl?wsdl");
+ final QName serviceName = new QName("http://jbws3552.jaxws.ws.test.jboss.org/", "EndpointImplService");
+ final Service service = Service.create(wsdlURL, serviceName);
+ return service.getPort(EndpointIface.class);
+ }
+ @Test
+ @RunAsClient
public void testEchoCA() throws Exception {
EndpointIface endpoint = getProxy();
AdaptedObjectCA aoCA = new AdaptedObjectCA(444, "object message", "object description", new ComplexObjectCA("a", "b"));
assertEquals("444,object message,object description,a b", endpoint.echoCA(aoCA).toString());
}
+ @Test
+ @RunAsClient
public void testEchoAbstractCA() throws Exception {
EndpointIface endpoint = getProxy();
AbstractObjectCA aoCA = new AdaptedObjectCA(444, "object message", "object description", new ComplexObjectCA("a", "b"));
assertEquals("444,object message,object description,a b", endpoint.echoAbstractCA(aoCA).toString());
}
+ @Test
+ @RunAsClient
public void testEchoFA() throws Exception {
EndpointIface endpoint = getProxy();
AdaptedObjectFA aoFA = new AdaptedObjectFA(444, "object message", "object description", new ComplexObjectFA("a", "b"));
assertEquals("444,object message,object description,a b", endpoint.echoFA(aoFA).toString());
}
+ @Test
+ @RunAsClient
public void testEchoAbstractFA() throws Exception {
EndpointIface endpoint = getProxy();
AbstractObjectFA aoFA = new AdaptedObjectFA(444, "object message", "object description", new ComplexObjectFA("a", "b"));
assertEquals("444,object message,object description,a b", endpoint.echoAbstractFA(aoFA).toString());
}
+ @Test
+ @RunAsClient
public void testEchoGA() throws Exception {
EndpointIface endpoint = getProxy();
AdaptedObjectGA aoGA = new AdaptedObjectGA(444, "object message", "object description", new ComplexObjectGA("a", "b"));
assertEquals("444,object message,object description,a b", endpoint.echoGA(aoGA).toString());
}
+ @Test
+ @RunAsClient
public void testEchoAbstractGA() throws Exception {
EndpointIface endpoint = getProxy();
AbstractObjectGA aoGA = new AdaptedObjectGA(444, "object message", "object description", new ComplexObjectGA("a", "b"));
assertEquals("444,object message,object description,a b", endpoint.echoAbstractGA(aoGA).toString());
}
+ @Test
+ @RunAsClient
public void testEchoMA() throws Exception {
EndpointIface endpoint = getProxy();
AdaptedObjectMA aoMA = new AdaptedObjectMA(444, "object message", "object description", new ComplexObjectMA("a", "b"));
assertEquals("444,object message,object description,a b", endpoint.echoMA(aoMA).toString());
}
+ @Test
+ @RunAsClient
public void testEchoAbstractMA() throws Exception {
EndpointIface endpoint = getProxy();
AbstractObjectMA aoMA = new AdaptedObjectMA(444, "object message", "object description", new ComplexObjectMA("a", "b"));
assertEquals("444,object message,object description,a b", endpoint.echoAbstractMA(aoMA).toString());
}
+ @Test
+ @RunAsClient
public void testExceptionCA() throws Exception {
if (true) {
System.out.println("FIXME: [CXF-4600] Exception inheritance not working over SOAP protocol");
@@ -140,6 +164,8 @@
}
}
+ @Test
+ @RunAsClient
public void testExtendedExceptionCA() throws Exception {
EndpointIface endpoint = getProxy();
try {
@@ -150,6 +176,8 @@
}
}
+ @Test
+ @RunAsClient
public void testExceptionFA() throws Exception {
if (true) {
System.out.println("FIXME: [CXF-4600] Exception inheritance not working over SOAP protocol");
@@ -164,6 +192,8 @@
}
}
+ @Test
+ @RunAsClient
public void testExtendedExceptionFA() throws Exception {
EndpointIface endpoint = getProxy();
try {
@@ -174,6 +204,8 @@
}
}
+ @Test
+ @RunAsClient
public void testExceptionGA() throws Exception {
if (true) {
System.out.println("FIXME: [CXF-4600] Exception inheritance not working over SOAP protocol");
@@ -188,6 +220,8 @@
}
}
+ @Test
+ @RunAsClient
public void testExtendedExceptionGA() throws Exception {
EndpointIface endpoint = getProxy();
try {
@@ -198,6 +232,8 @@
}
}
+ @Test
+ @RunAsClient
public void testExceptionMA() throws Exception {
if (true) {
System.out.println("FIXME: [CXF-4600] Exception inheritance not working over SOAP protocol");
@@ -212,6 +248,8 @@
}
}
+ @Test
+ @RunAsClient
public void testExtendedExceptionMA() throws Exception {
EndpointIface endpoint = getProxy();
try {
11 years
JBossWS SVN: r19176 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1904.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-21 20:45:38 -0500 (Sun, 21 Dec 2014)
New Revision: 19176
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java
Log:
arquillian conversion jbws1904 test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java 2014-12-22 01:29:05 UTC (rev 19175)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java 2014-12-22 01:45:38 UTC (rev 19176)
@@ -28,7 +28,15 @@
import javax.xml.namespace.QName;
-import junit.framework.Test;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.ws.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
@@ -47,29 +55,28 @@
* @author alessio.soldano(a)jboss.com
* @since 13-Dec-2007
*/
+(a)RunWith(Arquillian.class)
public class JBWS1904TestCase extends JBossWSTest
{
- public static BaseDeployment<?>[] createDeployments() {
- List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
- list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1904.jar") { {
+ @ArquillianResource
+ private URL baseURL;
+
+ @Deployment(testable = false)
+ public static JavaArchive createDeployments() {
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1904.jar");
archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.jbws1904.Endpoint.class)
- .addClass(org.jboss.test.ws.jaxws.jbws1904.EndpointImpl.class)
- .addClass(org.jboss.test.ws.jaxws.jbws1904.UserException.class);
- }
- });
- return list.toArray(new BaseDeployment<?>[list.size()]);
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.jbws1904.Endpoint.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws1904.EndpointImpl.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws1904.UserException.class);
+ return archive;
}
- public static Test suite()
- {
- return new JBossWSTestSetup(JBWS1904TestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
- }
-
+ @Test
+ @RunAsClient
public void testWSDLSchema() throws Exception
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1904?wsdl");
+ URL wsdlURL = new URL(baseURL + "/jaxws-jbws1904?wsdl");
Document doc = DOMUtils.getDocumentBuilder().parse(wsdlURL.toString());
NodeList schemas = ((Element)doc.getDocumentElement()
11 years
JBossWS SVN: r19175 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/complex.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-21 20:29:05 -0500 (Sun, 21 Dec 2014)
New Revision: 19175
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java
Log:
arquillian conversion complex test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2014-12-22 01:02:48 UTC (rev 19174)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2014-12-22 01:29:05 UTC (rev 19175)
@@ -22,6 +22,8 @@
package org.jboss.test.ws.jaxws.complex;
import java.io.File;
+import java.lang.Exception;
+import java.lang.System;
import java.net.URL;
import java.util.ArrayList;
import java.util.LinkedList;
@@ -33,7 +35,15 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
-import junit.framework.Test;
+import org.junit.runner.RunWith;
+import org.junit.Test;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.Filter;
@@ -48,42 +58,43 @@
* @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
* @author Thomas.Diesler(a)jboss.com
*/
+(a)RunWith(Arquillian.class)
public class ComplexTestCase extends JBossWSTest
{
- private Registration port;
+ @ArquillianResource
+ private URL baseURL;
- public static BaseDeployment<?>[] createDeployments() {
- List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
- list.add(new JBossWSTestHelper.WarDeployment("jaxws-complex.war") { {
+ @Deployment(testable = false)
+ public static WebArchive createDeployments() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-complex.war");
archive
- .addManifest()
- .addPackages(false, new Filter<ArchivePath>() {
- @Override
- public boolean include(ArchivePath path)
- {
- return !path.get().contains("TestCase");
- }
- }, "org.jboss.test.ws.jaxws.complex")
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/complex/WEB-INF/web.xml"));
- }
- });
- return list.toArray(new BaseDeployment<?>[list.size()]);
+ .addManifest()
+ .addPackages(false, new Filter<ArchivePath>() {
+ @Override
+ public boolean include(ArchivePath path)
+ {
+ return !path.get().contains("TestCase");
+ }
+ }, "org.jboss.test.ws.jaxws.complex")
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/complex/WEB-INF/web.xml"));
+ return archive;
}
- public static Test suite()
- {
- return new JBossWSTestSetup(ComplexTestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
+ private Registration getPort() {
+ Registration port = null;
+ try {
+ URL wsdlURL = JBossWSTestHelper.getResourceURL("jaxws/complex/META-INF/wsdl/RegistrationService.wsdl");
+ QName serviceName = new QName("http://complex.jaxws.ws.test.jboss.org/", "RegistrationService");
+ Service service = Service.create(wsdlURL, serviceName);
+ port = (Registration) service.getPort(Registration.class);
+ } catch (Exception e) {
+ System.out.println(e);
+ }
+ return port;
}
- protected void setUp() throws Exception
- {
- super.setUp();
- URL wsdlURL = getResourceURL("jaxws/complex/META-INF/wsdl/RegistrationService.wsdl");
- QName serviceName = new QName("http://complex.jaxws.ws.test.jboss.org/", "RegistrationService");
- Service service = Service.create(wsdlURL, serviceName);
- port = (Registration)service.getPort(Registration.class);
- }
-
+ @Test
+ @RunAsClient
public void testRegistration() throws Exception
{
Customer customer = getFredJackson();
@@ -91,7 +102,7 @@
customer.getReferredCustomers().add(getAlCapone());
XMLGregorianCalendar cal = getCalendar();
-
+ Registration port = getPort();
port.register(customer, cal);
customer = getAlCapone();
@@ -106,29 +117,37 @@
}
}
+ @Test
+ @RunAsClient
public void testInvoiceRegistration() throws Exception
{
InvoiceCustomer customer = getInvoiceFredJackson();
customer.getReferredCustomers().add(getJohnDoe());
customer.getReferredCustomers().add(getAlCapone());
-
+ Registration port = getPort();
assertTrue(port.registerForInvoice(customer));
}
+ @Test
+ @RunAsClient
public void testOtherPackage() throws Exception
{
+ Registration port = getPort();
Statistics stats = port.getStatistics(getFredJackson());
System.out.println(stats.getActivationTime());
assertEquals(10, stats.getHits());
}
+ @Test
+ @RunAsClient
public void testBulkRegistration() throws Exception
{
List<Customer> customers = new ArrayList<Customer>();
customers.add(getFredJackson());
customers.add(getJohnDoe());
+ Registration port = getPort();
List<Long> result = port.bulkRegister(customers, getCalendar());
assertEquals(123, result.get(0).longValue());
11 years
JBossWS SVN: r19174 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-21 20:02:48 -0500 (Sun, 21 Dec 2014)
New Revision: 19174
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/MiscTestCase.java
Log:
arquillian conversion misc test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/MiscTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/MiscTestCase.java 2014-12-22 00:41:15 UTC (rev 19173)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/MiscTestCase.java 2014-12-22 01:02:48 UTC (rev 19174)
@@ -29,7 +29,15 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
-import junit.framework.Test;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
@@ -43,30 +51,27 @@
* @author alessio.soldano(a)jboss.com
* @since 07-Mar-2014
*/
+(a)RunWith(Arquillian.class)
public class MiscTestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-misc/endpoint";
+ @ArquillianResource
+ private URL baseURL;
- public static BaseDeployment<?>[] createDeployments() {
- List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
- list.add(new JBossWSTestHelper.JarDeployment("jaxws-misc.jar") { {
+ @Deployment(testable = false)
+ public static JavaArchive createDeployments() {
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-misc.jar");
archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.misc.Endpoint.class)
- .addClass(org.jboss.test.ws.jaxws.misc.EndpointImpl.class);
- }
- });
- return list.toArray(new BaseDeployment<?>[list.size()]);
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.misc.Endpoint.class)
+ .addClass(org.jboss.test.ws.jaxws.misc.EndpointImpl.class);
+ return archive;
}
- public static Test suite()
- {
- return new JBossWSTestSetup(MiscTestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
- }
-
+ @Test
+ @RunAsClient
public void testEndpoint() throws Exception
{
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ URL wsdlURL = new URL(baseURL + "/jaxws-misc/endpoint?wsdl");
QName serviceName = new QName("http://org.jboss.ws/misc", "EndpointService");
Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class);
String retObj = port.echo("Hello");
@@ -77,19 +82,23 @@
* [JBWS-3741] WebService doesn't support "//"
*
*/
+ @Test
+ @RunAsClient
public void testJBWS3741() throws Exception
{
- assertTrue(IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080//jaxws-misc/endpoint?wsdl").openStream()).contains("wsdl:definitions"));
- assertTrue(IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/jaxws-misc///endpoint?wsdl").openStream()).contains("wsdl:definitions"));
+ assertTrue(IOUtils.readAndCloseStream(new URL(baseURL + "//jaxws-misc/endpoint?wsdl").openStream()).contains("wsdl:definitions"));
+ assertTrue(IOUtils.readAndCloseStream(new URL(baseURL + "/jaxws-misc///endpoint?wsdl").openStream()).contains("wsdl:definitions"));
}
/**
* [JBWS-3743] Block HTTP GET requests with no query string
*
*/
+ @Test
+ @RunAsClient
public void testJBWS3743() throws Exception
{
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS);
+ URL wsdlURL = new URL(baseURL + "/jaxws-misc/endpoint");
final HttpURLConnection c = (HttpURLConnection)wsdlURL.openConnection();
c.connect();
assertEquals(405, c.getResponseCode());
11 years