JBossWS SVN: r19344 - in stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074: usecase2/client and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-01-08 05:05:41 -0500 (Thu, 08 Jan 2015)
New Revision: 19344
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java
Log:
Properly fixing JBWS2074TestCase (also works in parallel test mode)
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2015-01-08 08:17:36 UTC (rev 19343)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2015-01-08 10:05:41 UTC (rev 19344)
@@ -22,9 +22,6 @@
package org.jboss.test.ws.jaxws.jbws2074.usecase1.client;
import java.io.File;
-import java.lang.Exception;
-import java.lang.String;
-import java.lang.StringBuffer;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -37,7 +34,6 @@
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.exporter.ZipExporter;
import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.test.ws.jaxws.jbws2074.usecase1.service.POJOIface;
@@ -54,34 +50,38 @@
@RunWith(Arquillian.class)
public final class JBWS2074TestCase extends JBossWSTest
{
+ private static final String WAR_DEPLOYMENT = "jaxws-jbws2074-usecase1";
+
@ArquillianResource
Deployer deployer;
+
+ private static WebArchive getWarArchive() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, WAR_DEPLOYMENT + ".war");
+ archive
+ .setManifest(new StringAsset("Manifest-Version: 1.0\n"
+ + "Dependencies: org.jboss.logging\n"))
+ .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.JavaResourcesHandler.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.ManualResourcesHandler.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase1.service.POJOIface.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase1.service.POJOImpl.class)
+ .addAsResource("org/jboss/test/ws/jaxws/jbws2074/usecase1/service/jaxws-service-handlers.xml")
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase1/WEB-INF/web.xml"));
+ return archive;
+ }
- private static final String WAR_DEPLOYMENT = "jaxws-jbws2074-usecase1";
@Deployment(name = WAR_DEPLOYMENT, testable = false, managed = false, order = 1)
public static WebArchive createClientDeployment1() {
- WebArchive archive = ShrinkWrap.create(WebArchive.class, WAR_DEPLOYMENT + ".war");
- archive
- .setManifest(new StringAsset("Manifest-Version: 1.0\n"
- + "Dependencies: org.jboss.logging\n"))
- .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.JavaResourcesHandler.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.ManualResourcesHandler.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase1.service.POJOIface.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase1.service.POJOImpl.class)
- .addAsResource("org/jboss/test/ws/jaxws/jbws2074/usecase1/service/jaxws-service-handlers.xml")
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase1/WEB-INF/web.xml"));
- JBossWSTestHelper.writeToFile(archive);
- return archive;
+ return getWarArchive();
}
@Deployment(name = "jaxws-jbws2074-ear-usecase1", testable = false, managed = false, order = 2)
public static EnterpriseArchive createClientDeployment() {
EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws2074-usecase1.ear");
- archive
- .addManifest()
- .addAsModule(new File(JBossWSTestHelper.getTestArchiveDir(), WAR_DEPLOYMENT + ".war"))
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase1-ear/META-INF/application.xml"), "application.xml");
+ archive
+ .addManifest()
+ .addAsModule(getWarArchive())
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase1-ear/META-INF/application.xml"), "application.xml");
return archive;
}
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2015-01-08 08:17:36 UTC (rev 19343)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2015-01-08 10:05:41 UTC (rev 19344)
@@ -51,12 +51,13 @@
@RunWith(Arquillian.class)
public final class JBWS2074TestCase extends JBossWSTest
{
+ private static final String JAR_DEPLOYMENT = "jaxws-jbws2074-usecase2";
+ private static final String EAR_DEPLOYMENT = "jaxws-jbws2074-ear-usecase2";
+
@ArquillianResource
Deployer deployer;
-
- private static final String JAR_DEPLOYMENT = "jaxws-jbws2074-usecase2";
- @Deployment(name = JAR_DEPLOYMENT, testable = false, managed = false, order = 1)
- public static JavaArchive createClientDeployment1() {
+
+ private static JavaArchive getJarArchive() {
JavaArchive archive = ShrinkWrap.create(JavaArchive.class, JAR_DEPLOYMENT + ".jar");
archive
.setManifest(new StringAsset("Manifest-Version: 1.0\n"
@@ -64,18 +65,21 @@
.addClass(org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Iface.class)
.addClass(org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Impl.class)
.addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase2/META-INF/ejb-jar.xml"), "ejb-jar.xml");
- JBossWSTestHelper.writeToFile(archive);
return archive;
}
- private static final String EAR_DEPLOYMENT = "jaxws-jbws2074-ear-usecase2";
+ @Deployment(name = JAR_DEPLOYMENT, testable = false, managed = false, order = 1)
+ public static JavaArchive createClientDeployment1() {
+ return getJarArchive();
+ }
+
@Deployment(name = EAR_DEPLOYMENT, testable = false, managed = false, order = 2)
public static EnterpriseArchive createClientDeployment() {
EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws2074-usecase2.ear");
- archive
- .addManifest()
- .addAsModule(new File(JBossWSTestHelper.getTestArchiveDir(), JAR_DEPLOYMENT + ".jar"))
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase2-ear/META-INF/application.xml"), "application.xml");
+ archive
+ .addManifest()
+ .addAsModule(getJarArchive())
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase2-ear/META-INF/application.xml"), "application.xml");
return archive;
}
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2015-01-08 08:17:36 UTC (rev 19343)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2015-01-08 10:05:41 UTC (rev 19344)
@@ -34,7 +34,6 @@
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.exporter.ZipExporter;
import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOIface;
@@ -51,12 +50,13 @@
@RunWith(Arquillian.class)
public final class JBWS2074TestCase extends JBossWSTest
{
+ private static final String WAR_DEPLOYMENT = "jaxws-jbws2074-usecase3";
+ private static final String EAR_DEPLOYMENT = "jaxws-jbws2074-ear-usecase3";
+
@ArquillianResource
Deployer deployer;
- private static final String WAR_DEPLOYMENT = "jaxws-jbws2074-usecase3";
- @Deployment(name = WAR_DEPLOYMENT, testable = false, managed = false, order = 1)
- public static WebArchive createClientDeployment1() {
+ private static WebArchive getWarArchive() {
WebArchive archive = ShrinkWrap.create(WebArchive.class, WAR_DEPLOYMENT + ".war");
archive
.setManifest(new StringAsset("Manifest-Version: 1.0\n"
@@ -64,17 +64,20 @@
.addClass(org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOIface.class)
.addClass(org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOImpl.class)
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase3/WEB-INF/web.xml"));
- JBossWSTestHelper.writeToFile(archive);
return archive;
}
- private static final String EAR_DEPLOYMENT = "jaxws-jbws2074-ear-usecase3";
+ @Deployment(name = WAR_DEPLOYMENT, testable = false, managed = false, order = 1)
+ public static WebArchive createClientDeployment1() {
+ return getWarArchive();
+ }
+
@Deployment(name = EAR_DEPLOYMENT, testable = false, managed = false, order = 2)
public static EnterpriseArchive createClientDeployment() {
EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, EAR_DEPLOYMENT + ".ear");
archive
.addManifest()
- .addAsModule(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws2074-usecase3.war"))
+ .addAsModule(getWarArchive())
.addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase3-ear/META-INF/application.xml"), "application.xml");
return archive;
}
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2015-01-08 08:17:36 UTC (rev 19343)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2015-01-08 10:05:41 UTC (rev 19344)
@@ -34,7 +34,6 @@
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.exporter.ZipExporter;
import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.test.ws.jaxws.jbws2074.usecase4.service.EJB3Iface;
@@ -51,12 +50,13 @@
@RunWith(Arquillian.class)
public final class JBWS2074TestCase extends JBossWSTest
{
+ private static final String JAR_DEPLOYMENT = "jaxws-jbws2074-usecase4";
+ private static final String EAR_DEPLOYMENT = "jaxws-jbws2074-ear-usecase4";
+
@ArquillianResource
Deployer deployer;
- private static final String JAR_DEPLOYMENT = "jaxws-jbws2074-usecase4";
- @Deployment(name = JAR_DEPLOYMENT, testable = false, managed = false, order = 1)
- public static JavaArchive createClientDeployment1() {
+ private static JavaArchive getJarArchive() {
JavaArchive archive = ShrinkWrap.create(JavaArchive.class, JAR_DEPLOYMENT + ".jar");
archive
.setManifest(new StringAsset("Manifest-Version: 1.0\n"
@@ -68,17 +68,20 @@
.addClass(org.jboss.test.ws.jaxws.jbws2074.usecase4.service.EJB3Impl.class)
.addAsResource("org/jboss/test/ws/jaxws/jbws2074/usecase4/service/jaxws-service-handlers.xml")
.addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase4/META-INF/ejb-jar.xml"), "ejb-jar.xml");
- JBossWSTestHelper.writeToFile(archive);
return archive;
}
- private static final String EAR_DEPLOYMENT = "jaxws-jbws2074-ear-usecase4";
+ @Deployment(name = JAR_DEPLOYMENT, testable = false, managed = false, order = 1)
+ public static JavaArchive createClientDeployment1() {
+ return getJarArchive();
+ }
+
@Deployment(name = EAR_DEPLOYMENT, testable = false, managed = false, order = 2)
public static EnterpriseArchive createClientDeployment() {
EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws2074-usecase4.ear");
archive
.addManifest()
- .addAsModule(new File(JBossWSTestHelper.getTestArchiveDir(), JAR_DEPLOYMENT + ".jar"))
+ .addAsModule(getJarArchive())
.addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase4-ear/META-INF/application.xml"), "application.xml");
return archive;
}
10 years, 8 months
JBossWS SVN: r19343 - in stack/cxf/branches/arquillian: modules/testsuite/shared-tests and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2015-01-08 03:17:36 -0500 (Thu, 08 Jan 2015)
New Revision: 19343
Removed:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jboss-home-bin-script-permissions.groovy
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml
stack/cxf/branches/arquillian/pom.xml
Log:
Update parent version to 1.1.1-SNAPSHOT to use maven-dependency-plugin 2.8;Remove the groovy script which changes server scripts permission
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml 2015-01-08 01:48:29 UTC (rev 19342)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml 2015-01-08 08:17:36 UTC (rev 19343)
@@ -89,19 +89,6 @@
</properties>
</configuration>
</execution>
- <execution>
- <id>jboss-home-bin-script-permissions</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <source>${basedir}/src/test/scripts/jboss-home-bin-script-permissions.groovy</source>
- <properties>
- <jbossHome>${jboss.home}</jbossHome>
- </properties>
- </configuration>
- </execution>
</executions>
</plugin>
Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jboss-home-bin-script-permissions.groovy
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jboss-home-bin-script-permissions.groovy 2015-01-08 01:48:29 UTC (rev 19342)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jboss-home-bin-script-permissions.groovy 2015-01-08 08:17:36 UTC (rev 19343)
@@ -1,18 +0,0 @@
-
-/*
- * Set execute permission on needed server scripts.
- */
- String[] scriptList = [ "wsconsume.bat",
- "wsconsume.sh",
- "wsprovide.bat",
- "wsprovide.sh",
- "appclient.bat",
- "appclient.sh"
- ]
- for (n in scriptList) {
- def cmd = "chmod +x " + project.properties['jbossHome'] + "/bin/" + n
- println cmd
- cmd.execute()
- def tmp = "touch /tmp/" + n
- tmp.execute()
- }
Modified: stack/cxf/branches/arquillian/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/pom.xml 2015-01-08 01:48:29 UTC (rev 19342)
+++ stack/cxf/branches/arquillian/pom.xml 2015-01-08 08:17:36 UTC (rev 19343)
@@ -38,7 +38,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.1.0.GA</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<!-- Source Control Management -->
@@ -1463,7 +1463,7 @@
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <versionRange>[2.4,)</versionRange>
+ <versionRange>[2.8,)</versionRange>
<goals>
<goal>sources</goal>
<goal>copy</goal>
10 years, 8 months
JBossWS SVN: r19342 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-07 20:48:29 -0500 (Wed, 07 Jan 2015)
New Revision: 19342
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/DeploymentArchives.java
Log:
switch to JBossWSTestHelper.writeToFile usage
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/DeploymentArchives.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/DeploymentArchives.java 2015-01-08 01:47:35 UTC (rev 19341)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/DeploymentArchives.java 2015-01-08 01:48:29 UTC (rev 19342)
@@ -75,7 +75,7 @@
.addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/jboss-client.xml"), "jboss-client.xml")
.addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl")
.addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl"), "wsdl/MultipleEndpoint.wsdl");
- writeToDisk(archive);
+ JBossWSTestHelper.writeToFile(archive);
return archive;
}
@@ -86,7 +86,7 @@
archive
.addManifest()
.addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-samples-webserviceref-appclient.jar"));
- writeToDisk(archive);
+ JBossWSTestHelper.writeToFile(archive);
return archive;
}
@@ -107,9 +107,4 @@
return archive;
}
- public static void writeToDisk(Archive archive)
- {
- File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName());
- archive.as(ZipExporter.class).exportTo(file, true);
- }
}
10 years, 9 months
JBossWS SVN: r19341 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-07 20:47:35 -0500 (Wed, 07 Jan 2015)
New Revision: 19341
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java
Log:
switch to JBossWSTestHelper.writeToFile usage
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2015-01-08 01:41:35 UTC (rev 19340)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2015-01-08 01:47:35 UTC (rev 19341)
@@ -95,21 +95,15 @@
.addAsManifestResource(
new File(JBossWSTestHelper.getTestResourcesDir()
+ "/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl");
- writeToDisk(archive1);
+ JBossWSTestHelper.writeToFile(archive1);
EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, DEPLOYMENT + ".ear");
archive.addManifest().addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-samples-serviceref-appclient.jar"));
- writeToDisk(archive);
+ JBossWSTestHelper.writeToFile(archive);
fullAppclientDepName = archive.getName() + "#" + archive1.getName();
return archive;
}
- public static void writeToDisk(Archive archive)
- {
- File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName());
- archive.as(ZipExporter.class).exportTo(file, true);
- }
-
@Test
@RunAsClient
public void testWSDLAccess() throws Exception
10 years, 9 months
JBossWS SVN: r19340 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-07 20:41:35 -0500 (Wed, 07 Jan 2015)
New Revision: 19340
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
Log:
switch to JBossWSTestHelper.writeToFile usage
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2015-01-08 01:36:54 UTC (rev 19339)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2015-01-08 01:41:35 UTC (rev 19340)
@@ -70,7 +70,7 @@
.addClass(org.jboss.test.ws.jaxws.samples.eardeployment.EJB3Bean.class)
.addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl")
.addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/TestService.xsd"), "wsdl/TestService.xsd");
- writeToDisk(archive1);
+ JBossWSTestHelper.writeToFile(archive1);
WebArchive archive2 = ShrinkWrap.create(WebArchive.class, "jaxws-samples-eardeployment-pojo.war");
archive2
@@ -82,7 +82,7 @@
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/TestService.xsd"), "wsdl/TestService.xsd")
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/web.xml"));
- writeToDisk(archive2);
+ JBossWSTestHelper.writeToFile(archive2);
EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-samples-eardeployment.ear");
archive
@@ -93,12 +93,6 @@
return archive;
}
- private static void writeToDisk(Archive archive)
- {
- File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName());
- archive.as(ZipExporter.class).exportTo(file, true);
- }
-
@Test
@RunAsClient
public void testEJB3Endpoint() throws Exception
10 years, 9 months
JBossWS SVN: r19339 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2957.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-07 20:36:54 -0500 (Wed, 07 Jan 2015)
New Revision: 19339
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2957/JBWS2957TestCase.java
Log:
switch to JBossWSTestHelper.writeToFile usage
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2957/JBWS2957TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2957/JBWS2957TestCase.java 2015-01-08 01:32:04 UTC (rev 19338)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2957/JBWS2957TestCase.java 2015-01-08 01:36:54 UTC (rev 19339)
@@ -61,7 +61,7 @@
.addManifest()
.addClass(org.jboss.test.ws.jaxws.jbws2957.common.HelloIface.class)
.addClass(org.jboss.test.ws.jaxws.jbws2957.common.HelloImpl.class);
- writeToDisk(archive1);
+ JBossWSTestHelper.writeToFile(archive1);
WebArchive archive2 = ShrinkWrap.create(WebArchive.class, "jaxws-jbws2957-ejbinwarwebinflib_web.war");
archive2
@@ -69,19 +69,13 @@
.addAsLibrary(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws2957-ejbinwarwebinflib_ejb.jar"))
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2957/WEB-INF/ejb-jar.xml"), "ejb-jar.xml")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl");
- writeToDisk(archive2);
+ JBossWSTestHelper.writeToFile(archive2);
EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws2957-ejbinwarwebinflib.ear");
archive.addManifest().addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws2957-ejbinwarwebinflib_web.war"));
return archive;
}
- public static void writeToDisk(Archive archive)
- {
- File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName());
- archive.as(ZipExporter.class).exportTo(file, true);
- }
-
@Test
@RunAsClient
public void testEJB() throws Exception
10 years, 9 months
JBossWS SVN: r19338 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-07 20:32:04 -0500 (Wed, 07 Jan 2015)
New Revision: 19338
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java
Log:
switch to JBossWSTestHelper.writeToFile usage
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java 2015-01-07 23:13:54 UTC (rev 19337)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java 2015-01-08 01:32:04 UTC (rev 19338)
@@ -63,7 +63,7 @@
.addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.POJOBean.class)
.addAsResource("org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml")
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2634/WEB-INF/web.xml"));
- writeToDisk(archive1);
+ JBossWSTestHelper.writeToFile(archive1);
JavaArchive archive2 = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws2634.jar");
archive2
@@ -73,7 +73,7 @@
.addClass(org.jboss.test.ws.jaxws.jbws2634.shared.handlers.TestHandler.class)
.addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.AbstractEndpointImpl.class)
.addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.EndpointIface.class);
- writeToDisk(archive2);
+ JBossWSTestHelper.writeToFile(archive2);
JavaArchive archive3 = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws2634-ejb3.jar");
archive3
@@ -82,7 +82,7 @@
.addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.EJB3Bean.class)
.addAsResource("org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml")
.addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2634/META-INF/ejb-jar.xml"), "ejb-jar.xml");
- writeToDisk(archive3);
+ JBossWSTestHelper.writeToFile(archive3);
JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws2634.ear");
archive
@@ -94,12 +94,6 @@
return archive;
}
- public static void writeToDisk(Archive archive)
- {
- File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName());
- archive.as(ZipExporter.class).exportTo(file, true);
- }
-
@Test
@RunAsClient
public void testPojoEndpointInjection() throws Exception
10 years, 9 months
JBossWS SVN: r19337 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-01-07 18:13:54 -0500 (Wed, 07 Jan 2015)
New Revision: 19337
Removed:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java
Log:
Do not re-use the same deployment in multiple tests, as that prevents parallel testsuite execution
Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.java 2015-01-07 21:40:32 UTC (rev 19336)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.java 2015-01-07 23:13:54 UTC (rev 19337)
@@ -1,94 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2014, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws2307;
-
-import java.io.File;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.wsf.test.JBossWSTestHelper;
-
-public final class DeploymentArchives
-{
- public static final String SERVER_DEPLOYMENT = "jaxws-jbws2307-service";
- public static WebArchive createDeployment() {
- WebArchive archive = ShrinkWrap.create(WebArchive.class, SERVER_DEPLOYMENT + ".war");
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloImpl.class)
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/jboss-web.xml"), "jboss-web.xml")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml"), "web.xml")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl")
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml"));
- return archive;
- }
-
- public static final String CLIENT_2_DEPLOYMENT = "jaxws-jbws2307-client-2";
- public static WebArchive createDeployment2() {
- WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_2_DEPLOYMENT + ".war");
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet2.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloService.class)
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web2.xml"), "web.xml")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl")
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web2.xml"));
- return archive;
- }
-
- public static final String CLIENT_3_DEPLOYMENT = "jaxws-jbws2307-client-3";
- public static WebArchive createDeployment3() {
- WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_3_DEPLOYMENT + ".war");
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet3.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloServiceJAXWS22.class)
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web3.xml"), "web.xml")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl")
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web3.xml"));
- return archive;
- }
-
- public static final String CLIENT_DEPLOYMENT = "jaxws-jbws2307-client";
- public static WebArchive createDeployment4() {
- WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws2307-client.war");
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloServiceJAXWS22.class)
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml"), "web.xml")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl")
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml"));
- return archive;
- }
-
- private DeploymentArchives() {
- //NOOP
- }
-}
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2015-01-07 21:40:32 UTC (rev 19336)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2015-01-07 23:13:54 UTC (rev 19337)
@@ -22,45 +22,107 @@
package org.jboss.test.ws.jaxws.jbws2307;
import java.io.BufferedReader;
+import java.io.File;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployer;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.OperateOnDeployment;
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.spec.WebArchive;
import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
import org.junit.Test;
import org.junit.runner.RunWith;
/**
- * JBWS-2307 / JBWS-2997 testcase
+ * [JBWS-2307] / [JBWS-2997] testcase
+ * [JBWS-3820] JAXWS 2.1 / 2.0 clients and WebServiceRef using JAXWS features cause NoSuchMethodException
*
* @author alessio.soldano(a)jboss.com
*/
@RunWith(Arquillian.class)
public class JBWS2307MTOMTestCase extends JBossWSTest
{
+ public static final String SERVER_DEPLOYMENT = "jaxws-jbws2307-service";
+ public static final String CLIENT_DEPLOYMENT = "jaxws-jbws2307-client";
+ public static final String CLIENT_2_DEPLOYMENT = "jaxws-jbws2307-client-2";
+ public static final String CLIENT_3_DEPLOYMENT = "jaxws-jbws2307-client-3";
+
@ArquillianResource
private URL baseURL;
- @Deployment(name= DeploymentArchives.SERVER_DEPLOYMENT, order=1, testable = false)
- public static WebArchive createClientDeployment() {
- return DeploymentArchives.createDeployment();
+ @ArquillianResource
+ Deployer deployer;
+
+ @Deployment(name = SERVER_DEPLOYMENT, order=1, testable = false)
+ public static WebArchive createDeployment() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, SERVER_DEPLOYMENT + ".war");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloImpl.class)
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/jboss-web.xml"), "jboss-web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml"), "web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl")
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml"));
+ return archive;
}
- @Deployment(name = DeploymentArchives.CLIENT_DEPLOYMENT, order=2, testable = false)
+ @Deployment(name = CLIENT_DEPLOYMENT, order=2, testable = false)
public static WebArchive createDeployment4() {
- return DeploymentArchives.createDeployment4();
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_DEPLOYMENT + ".war");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloServiceJAXWS22.class)
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml"), "web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl")
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml"));
+ return archive;
}
+ @Deployment(name = CLIENT_3_DEPLOYMENT, testable = false, managed = false)
+ public static WebArchive createDeployment3() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_3_DEPLOYMENT + ".war");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet3.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloServiceJAXWS22.class)
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web3.xml"), "web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl")
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web3.xml"));
+ return archive;
+ }
+
+ @Deployment(name = CLIENT_2_DEPLOYMENT, testable = false, managed = false)
+ public static WebArchive createDeployment2() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_2_DEPLOYMENT + ".war");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet2.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloService.class)
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web2.xml"), "web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl")
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web2.xml"));
+ return archive;
+ }
+
@Test
@RunAsClient
- @OperateOnDeployment(DeploymentArchives.CLIENT_DEPLOYMENT)
+ @OperateOnDeployment(CLIENT_DEPLOYMENT)
public void testMTOM() throws Exception
{
assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client/jbws2307?mtom=true").openStream()));
@@ -68,11 +130,46 @@
@Test
@RunAsClient
- @OperateOnDeployment(DeploymentArchives.CLIENT_DEPLOYMENT)
+ @OperateOnDeployment(CLIENT_DEPLOYMENT)
public void testClient() throws Exception
{
HttpURLConnection con = (HttpURLConnection)new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client/jbws2307").openConnection();
BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream()));
assertEquals("true", isr.readLine());
}
+
+ @Test
+ @RunAsClient
+ @OperateOnDeployment(SERVER_DEPLOYMENT)
+ public void testUsingClientArchive3() throws Exception
+ {
+ try {
+ deployer.deploy(CLIENT_3_DEPLOYMENT);
+ assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client-3/jbws2307?mtom=true").openStream()));
+ HttpURLConnection con = (HttpURLConnection)new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client-3/jbws2307").openConnection();
+ BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream()));
+ assertEquals("true", isr.readLine());
+ } finally {
+ deployer.undeploy(CLIENT_3_DEPLOYMENT);
+ }
+ }
+
+ @Test
+ @RunAsClient
+ @OperateOnDeployment(SERVER_DEPLOYMENT)
+ public void testUsingClientArchive2() throws Exception
+ {
+ try {
+ deployer.deploy(CLIENT_2_DEPLOYMENT);
+ URL url = new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client-2/jbws2307?mtom=true");
+ final HttpURLConnection c = (HttpURLConnection)url.openConnection();
+ c.connect();
+ assertEquals(500, c.getResponseCode());
+ String error = IOUtils.readAndCloseStream(c.getErrorStream());
+ c.disconnect();
+ assertTrue(error.contains("Could not instantiate ClientServlet2"));
+ } finally {
+ deployer.undeploy(CLIENT_2_DEPLOYMENT);
+ }
+ }
}
Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java 2015-01-07 21:40:32 UTC (rev 19336)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java 2015-01-07 23:13:54 UTC (rev 19337)
@@ -1,101 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2014, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws2307;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import org.jboss.arquillian.container.test.api.Deployer;
-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.spec.WebArchive;
-import org.jboss.ws.common.IOUtils;
-import org.jboss.wsf.test.JBossWSTest;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * [JBWS-3820] JAXWS 2.1 / 2.0 clients and WebServiceRef using JAXWS features cause NoSuchMethodException
- *
- * @author alessio.soldano(a)jboss.com
- */
-(a)RunWith(Arquillian.class)
-public class WebServiceRefMTOMTestCase extends JBossWSTest
-{
- @ArquillianResource
- private URL baseURL;
-
- @ArquillianResource
- Deployer deployer;
-
- @Deployment(testable = false)
- public static WebArchive createClientDeployment() {
- return DeploymentArchives.createDeployment();
- }
-
- @Deployment(name = DeploymentArchives.CLIENT_3_DEPLOYMENT, testable = false, managed = false)
- public static WebArchive createDeployment3() {
- return DeploymentArchives.createDeployment3();
- }
-
- @Deployment(name = DeploymentArchives.CLIENT_2_DEPLOYMENT, testable = false, managed = false)
- public static WebArchive createDeployment2() {
- return DeploymentArchives.createDeployment2();
- }
-
- @Test
- @RunAsClient
- public void testUsingClientArchive3() throws Exception
- {
- try {
- deployer.deploy(DeploymentArchives.CLIENT_3_DEPLOYMENT);
- assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client-3/jbws2307?mtom=true").openStream()));
- HttpURLConnection con = (HttpURLConnection)new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client-3/jbws2307").openConnection();
- BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream()));
- assertEquals("true", isr.readLine());
- } finally {
- deployer.undeploy(DeploymentArchives.CLIENT_3_DEPLOYMENT);
- }
- }
-
- @Test
- @RunAsClient
- public void testUsingClientArchive2() throws Exception
- {
- try {
- deployer.deploy(DeploymentArchives.CLIENT_2_DEPLOYMENT);
- URL url = new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client-2/jbws2307?mtom=true");
- final HttpURLConnection c = (HttpURLConnection)url.openConnection();
- c.connect();
- assertEquals(500, c.getResponseCode());
- String error = IOUtils.readAndCloseStream(c.getErrorStream());
- c.disconnect();
- assertTrue(error.contains("Could not instantiate ClientServlet2"));
- } finally {
- deployer.undeploy(DeploymentArchives.CLIENT_2_DEPLOYMENT);
- }
- }
-}
10 years, 9 months
JBossWS SVN: r19336 - in stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074: usecase2/client and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-07 16:40:32 -0500 (Wed, 07 Jan 2015)
New Revision: 19336
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java
Log:
switch to JBossWSTestHelper.writeToFile usage
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2015-01-07 21:31:36 UTC (rev 19335)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2015-01-07 21:40:32 UTC (rev 19336)
@@ -22,6 +22,9 @@
package org.jboss.test.ws.jaxws.jbws2074.usecase1.client;
import java.io.File;
+import java.lang.Exception;
+import java.lang.String;
+import java.lang.StringBuffer;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -68,7 +71,7 @@
.addClass(org.jboss.test.ws.jaxws.jbws2074.usecase1.service.POJOImpl.class)
.addAsResource("org/jboss/test/ws/jaxws/jbws2074/usecase1/service/jaxws-service-handlers.xml")
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase1/WEB-INF/web.xml"));
- writeToDisk(archive);
+ JBossWSTestHelper.writeToFile(archive);
return archive;
}
@@ -82,12 +85,6 @@
return archive;
}
- public static void writeToDisk(WebArchive archive)
- {
- File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName());
- archive.as(ZipExporter.class).exportTo(file, true);
- }
-
public void executeTest() throws Exception
{
String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2074-usecase1/Service";
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2015-01-07 21:31:36 UTC (rev 19335)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2015-01-07 21:40:32 UTC (rev 19336)
@@ -64,7 +64,7 @@
.addClass(org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Iface.class)
.addClass(org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Impl.class)
.addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase2/META-INF/ejb-jar.xml"), "ejb-jar.xml");
- writeToDisk(archive);
+ JBossWSTestHelper.writeToFile(archive);
return archive;
}
@@ -79,12 +79,6 @@
return archive;
}
- public static void writeToDisk(JavaArchive archive)
- {
- File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName());
- archive.as(ZipExporter.class).exportTo(file, true);
- }
-
public void executeTest() throws Exception
{
String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2074-usecase2/Service";
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2015-01-07 21:31:36 UTC (rev 19335)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2015-01-07 21:40:32 UTC (rev 19336)
@@ -64,7 +64,7 @@
.addClass(org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOIface.class)
.addClass(org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOImpl.class)
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase3/WEB-INF/web.xml"));
- writeToDisk(archive);
+ JBossWSTestHelper.writeToFile(archive);
return archive;
}
@@ -79,12 +79,6 @@
return archive;
}
- public static void writeToDisk(WebArchive archive)
- {
- File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName());
- archive.as(ZipExporter.class).exportTo(file, true);
- }
-
public void executeTest() throws Exception
{
String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2074-usecase3/Service";
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2015-01-07 21:31:36 UTC (rev 19335)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2015-01-07 21:40:32 UTC (rev 19336)
@@ -68,7 +68,7 @@
.addClass(org.jboss.test.ws.jaxws.jbws2074.usecase4.service.EJB3Impl.class)
.addAsResource("org/jboss/test/ws/jaxws/jbws2074/usecase4/service/jaxws-service-handlers.xml")
.addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase4/META-INF/ejb-jar.xml"), "ejb-jar.xml");
- writeToDisk(archive);
+ JBossWSTestHelper.writeToFile(archive);
return archive;
}
@@ -83,12 +83,6 @@
return archive;
}
- public static void writeToDisk(JavaArchive archive)
- {
- File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName());
- archive.as(ZipExporter.class).exportTo(file, true);
- }
-
public void executeTest() throws Exception
{
String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2074-usecase4/Service";
10 years, 9 months
JBossWS SVN: r19335 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1813.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-07 16:31:36 -0500 (Wed, 07 Jan 2015)
New Revision: 19335
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java
Log:
switch to JBossWSTestHelper.writeToFile usage
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2015-01-07 21:26:24 UTC (rev 19334)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2015-01-07 21:31:36 UTC (rev 19335)
@@ -60,7 +60,7 @@
.addManifest()
.addClass(org.jboss.test.ws.jaxws.jbws1813.EndpointImpl.class)
.addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1813/META-INF/jboss-webservices.xml"), "jboss-webservices.xml");
- writeToDisk(archive1);
+ JBossWSTestHelper.writeToFile(archive1);
JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1813.ear");
archive
@@ -70,12 +70,6 @@
return archive;
}
- public static void writeToDisk(JavaArchive archive)
- {
- File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName());
- archive.as(ZipExporter.class).exportTo(file, true);
- }
-
@Test
@RunAsClient
public void testPositive() throws Exception
10 years, 9 months