JBossWS SVN: r19334 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-07 16:26:24 -0500 (Wed, 07 Jan 2015)
New Revision: 19334
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
Log:
switched to JBossWSTestHelper.writeToFile usage
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2015-01-07 21:10:50 UTC (rev 19333)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2015-01-07 21:26:24 UTC (rev 19334)
@@ -76,7 +76,7 @@
+ "Dependencies: javax.jws.api,javax.xml.ws.api\n"))
.addClass(org.jboss.test.ws.jaxws.jbws1666.TestClient.class)
.addClass(org.jboss.test.ws.jaxws.jbws1666.TestEndpoint.class);
- writeToDisk(archive);
+ JBossWSTestHelper.writeToFile(archive);
return archive;
}
@@ -89,16 +89,10 @@
+ "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n"))
.addClass(org.jboss.test.ws.jaxws.jbws1666.TestClient.class)
.addClass(org.jboss.test.ws.jaxws.jbws1666.TestEndpoint.class);
- writeToDisk(archive);
+ JBossWSTestHelper.writeToFile(archive);
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
@OperateOnDeployment("jaxws-jbws1666")
10 years, 2 months
JBossWS SVN: r19333 - in stack/cxf/branches/arquillian/modules/testsuite/cxf-tests: src/test/scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-07 16:10:50 -0500 (Wed, 07 Jan 2015)
New Revision: 19333
Added:
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jboss-home-bin-script-permissions.groovy
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml
Log:
set permissions on needed server bin scripts
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2015-01-07 21:10:16 UTC (rev 19332)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2015-01-07 21:10:50 UTC (rev 19333)
@@ -123,6 +123,21 @@
</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>
<plugin> <!-- This copies jbossws-cxf-factories jar to endorsed dir before the integration-tests are run -->
Added: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jboss-home-bin-script-permissions.groovy
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jboss-home-bin-script-permissions.groovy (rev 0)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jboss-home-bin-script-permissions.groovy 2015-01-07 21:10:50 UTC (rev 19333)
@@ -0,0 +1,18 @@
+
+/*
+ * 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()
+ }
10 years, 2 months
JBossWS SVN: r19332 - in stack/cxf/branches/arquillian/modules/testsuite/shared-tests: src/test/scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-07 16:10:16 -0500 (Wed, 07 Jan 2015)
New Revision: 19332
Added:
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
Log:
set permissions on needed server bin scripts
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml 2015-01-07 20:04:12 UTC (rev 19331)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml 2015-01-07 21:10:16 UTC (rev 19332)
@@ -89,6 +89,19 @@
</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>
Added: 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 (rev 0)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jboss-home-bin-script-permissions.groovy 2015-01-07 21:10:16 UTC (rev 19332)
@@ -0,0 +1,18 @@
+
+/*
+ * 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()
+ }
10 years, 2 months
JBossWS SVN: r19331 - in stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws: jbws1581 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-01-07 15:04:12 -0500 (Wed, 07 Jan 2015)
New Revision: 19331
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java
Log:
Fixing some failures
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java 2015-01-07 15:44:18 UTC (rev 19330)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java 2015-01-07 20:04:12 UTC (rev 19331)
@@ -33,9 +33,8 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.exporter.ZipExporter;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
import org.junit.Test;
@@ -65,7 +64,7 @@
.addManifest()
.addClass(org.jboss.test.ws.jaxws.jbws1556.EJB3Bean.class)
.addClass(org.jboss.test.ws.jaxws.jbws1556.UserType.class);
- writeToDisk(archive1);
+ JBossWSTestHelper.writeToFile(archive1);
EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws1556.ear");
archive
@@ -75,12 +74,6 @@
return archive;
}
- public static void writeToDisk(JavaArchive archive)
- {
- File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName());
- archive.as(ZipExporter.class).exportTo(file, true);
- }
-
protected void cleanUp() {
port = null;
}
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java 2015-01-07 15:44:18 UTC (rev 19330)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java 2015-01-07 20:04:12 UTC (rev 19331)
@@ -62,7 +62,7 @@
@ArquillianResource
Deployer deployer;
- @Deployment(name = WAR_DEPLOYMENT, testable = false, managed = false)
+ @Deployment(name = WAR_DEPLOYMENT, order = 1, testable = false, managed = false)
public static WebArchive createDeployment1() {
WebArchive archive = ShrinkWrap.create(WebArchive.class, WAR_DEPLOYMENT + ".war");
archive
@@ -74,7 +74,7 @@
return archive;
}
- @Deployment(name="jaxws-jbws1581-ejb3", order=1, testable = false)
+ @Deployment(name="jaxws-jbws1581-ejb3", order=2, testable = false)
public static JavaArchive createDeployment2() {
JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1581-ejb3.jar");
archive
@@ -88,7 +88,7 @@
return archive;
}
- @Deployment(name = EAR_DEPLOYMENT, testable = false, managed = false)
+ @Deployment(name = EAR_DEPLOYMENT, order = 3, testable = false, managed = false)
public static EnterpriseArchive createDeployment3() {
EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, EAR_DEPLOYMENT + ".ear");
archive
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java 2015-01-07 15:44:18 UTC (rev 19330)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java 2015-01-07 20:04:12 UTC (rev 19331)
@@ -33,7 +33,6 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.ShrinkWrap;
-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.jbws1822.webservice.EJB3RemoteIface;
@@ -55,13 +54,13 @@
@ArquillianResource
Deployer deployer;
- public static void createDeployment3() {
+ static {
JavaArchive archive1 = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1822-shared.jar");
- archive1
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanIface.class)
- .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanImpl.class);
- writeToDisk(archive1);
+ archive1
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanIface.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanImpl.class);
+ JBossWSTestHelper.writeToFile(archive1);
}
@Deployment(name = "jaxws-jbws1822-two-ejb-modules", testable = false, managed = false)
@@ -71,13 +70,13 @@
.addManifest()
.addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3Bean.class)
.addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3RemoteIface.class);
- writeToDisk(archive3);
+ JBossWSTestHelper.writeToFile(archive3);
EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws1822-two-ejb-modules.ear");
archive
.addManifest()
- .addAsModule(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-one-ejb3-inside.jar"))
- .addAsModule(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-shared.jar"));
+ .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-one-ejb3-inside.jar"))
+ .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-shared.jar"));
return archive;
}
@@ -90,21 +89,15 @@
.addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanImpl.class)
.addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3Bean.class)
.addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3RemoteIface.class);
- writeToDisk(archive2);
+ JBossWSTestHelper.writeToFile(archive2);
EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws1822-one-ejb-module.ear");
archive
.addManifest()
- .addAsModule(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-two-ejb3-inside.jar"));
+ .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-two-ejb3-inside.jar"));
return archive;
}
- public static void writeToDisk(JavaArchive archive)
- {
- File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName());
- archive.as(ZipExporter.class).exportTo(file, true);
- }
-
private EJB3RemoteIface getProxy() throws Exception
{
QName serviceName = new QName("http://jbossws.org/JBWS1822", "EndpointService");
10 years, 2 months
JBossWS SVN: r19330 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-07 10:44:18 -0500 (Wed, 07 Jan 2015)
New Revision: 19330
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java
Log:
changed location of jar in ear
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java 2015-01-07 15:08:26 UTC (rev 19329)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java 2015-01-07 15:44:18 UTC (rev 19330)
@@ -64,7 +64,7 @@
writeToDisk(archive1);
}
- @Deployment(name="jaxws-jbws1822-two-ejb-modules", testable = false, managed=false)
+ @Deployment(name = "jaxws-jbws1822-two-ejb-modules", testable = false, managed = false)
public static EnterpriseArchive createDeployment2() {
JavaArchive archive3 = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1822-one-ejb3-inside.jar");
archive3
@@ -74,10 +74,10 @@
writeToDisk(archive3);
EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws1822-two-ejb-modules.ear");
- archive
- .addManifest()
- .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-one-ejb3-inside.jar"))
- .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-shared.jar"));
+ archive
+ .addManifest()
+ .addAsModule(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-one-ejb3-inside.jar"))
+ .addAsModule(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-shared.jar"));
return archive;
}
@@ -95,7 +95,7 @@
EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws1822-one-ejb-module.ear");
archive
.addManifest()
- .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-two-ejb3-inside.jar"));
+ .addAsModule(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-two-ejb3-inside.jar"));
return archive;
}
10 years, 2 months
JBossWS SVN: r19329 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1556.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-07 10:08:26 -0500 (Wed, 07 Jan 2015)
New Revision: 19329
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java
Log:
arquillian changed location of jar in ear.
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java 2015-01-07 14:31:13 UTC (rev 19328)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java 2015-01-07 15:08:26 UTC (rev 19329)
@@ -35,6 +35,7 @@
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.exporter.ZipExporter;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
import org.junit.Test;
@@ -58,7 +59,7 @@
@Deployment(testable = false)
- public static JavaArchive createDeployment3() {
+ public static EnterpriseArchive createDeployment3() {
JavaArchive archive1 = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1556.jar");
archive1
.addManifest()
@@ -66,10 +67,10 @@
.addClass(org.jboss.test.ws.jaxws.jbws1556.UserType.class);
writeToDisk(archive1);
- JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1556.ear");
+ EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws1556.ear");
archive
.addManifest()
- .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1556.jar"))
+ .addAsModule(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1556.jar"))
.addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1556/META-INF/application.xml"), "application.xml");
return archive;
}
10 years, 2 months
JBossWS SVN: r19328 - 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-07 09:31:13 -0500 (Wed, 07 Jan 2015)
New Revision: 19328
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:
Set deployment order to avoid errors reading on the filesystem
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 10:44:09 UTC (rev 19327)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2015-01-07 14:31:13 UTC (rev 19328)
@@ -55,7 +55,7 @@
Deployer deployer;
private static final String WAR_DEPLOYMENT = "jaxws-jbws2074-usecase1";
- @Deployment(name = WAR_DEPLOYMENT, testable = false, managed = false)
+ @Deployment(name = WAR_DEPLOYMENT, testable = false, managed = false, order = 1)
public static WebArchive createClientDeployment1() {
WebArchive archive = ShrinkWrap.create(WebArchive.class, WAR_DEPLOYMENT + ".war");
archive
@@ -72,7 +72,7 @@
return archive;
}
- @Deployment(name = "jaxws-jbws2074-ear-usecase1", testable = false, managed = false)
+ @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
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 10:44:09 UTC (rev 19327)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2015-01-07 14:31:13 UTC (rev 19328)
@@ -55,7 +55,7 @@
Deployer deployer;
private static final String JAR_DEPLOYMENT = "jaxws-jbws2074-usecase2";
- @Deployment(name = JAR_DEPLOYMENT, testable = false, managed = false)
+ @Deployment(name = JAR_DEPLOYMENT, testable = false, managed = false, order = 1)
public static JavaArchive createClientDeployment1() {
JavaArchive archive = ShrinkWrap.create(JavaArchive.class, JAR_DEPLOYMENT + ".jar");
archive
@@ -69,7 +69,7 @@
}
private static final String EAR_DEPLOYMENT = "jaxws-jbws2074-ear-usecase2";
- @Deployment(name = EAR_DEPLOYMENT, testable = false, managed = false)
+ @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
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 10:44:09 UTC (rev 19327)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2015-01-07 14:31:13 UTC (rev 19328)
@@ -55,7 +55,7 @@
Deployer deployer;
private static final String WAR_DEPLOYMENT = "jaxws-jbws2074-usecase3";
- @Deployment(name = WAR_DEPLOYMENT, testable = false, managed = false)
+ @Deployment(name = WAR_DEPLOYMENT, testable = false, managed = false, order = 1)
public static WebArchive createClientDeployment1() {
WebArchive archive = ShrinkWrap.create(WebArchive.class, WAR_DEPLOYMENT + ".war");
archive
@@ -69,7 +69,7 @@
}
private static final String EAR_DEPLOYMENT = "jaxws-jbws2074-ear-usecase3";
- @Deployment(name = EAR_DEPLOYMENT, testable = false, managed = false)
+ @Deployment(name = EAR_DEPLOYMENT, testable = false, managed = false, order = 2)
public static EnterpriseArchive createClientDeployment() {
EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, EAR_DEPLOYMENT + ".ear");
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-07 10:44:09 UTC (rev 19327)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2015-01-07 14:31:13 UTC (rev 19328)
@@ -55,7 +55,7 @@
Deployer deployer;
private static final String JAR_DEPLOYMENT = "jaxws-jbws2074-usecase4";
- @Deployment(name = JAR_DEPLOYMENT, testable = false, managed = false)
+ @Deployment(name = JAR_DEPLOYMENT, testable = false, managed = false, order = 1)
public static JavaArchive createClientDeployment1() {
JavaArchive archive = ShrinkWrap.create(JavaArchive.class, JAR_DEPLOYMENT + ".jar");
archive
@@ -73,7 +73,7 @@
}
private static final String EAR_DEPLOYMENT = "jaxws-jbws2074-ear-usecase4";
- @Deployment(name = EAR_DEPLOYMENT, testable = false, managed = false)
+ @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
10 years, 2 months
JBossWS SVN: r19327 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-01-07 05:44:09 -0500 (Wed, 07 Jan 2015)
New Revision: 19327
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
Log:
[JBWS-3863] @MTOM.enabled is not honored
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2015-01-06 20:39:29 UTC (rev 19326)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2015-01-07 10:44:09 UTC (rev 19327)
@@ -101,7 +101,7 @@
BindingType bindingType = (BindingType)beanClass.getAnnotation(BindingType.class);
MTOM mtom = (MTOM)beanClass.getAnnotation(MTOM.class);
- boolean mtomEnabled = mtom != null;
+ boolean mtomEnabled = mtom != null && mtom.enabled();
if (!mtomEnabled && bindingType != null)
{
String binding = bindingType.value();
10 years, 2 months
JBossWS SVN: r19326 - stack/cxf/branches/arquillian/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-01-06 15:39:29 -0500 (Tue, 06 Jan 2015)
New Revision: 19326
Modified:
stack/cxf/branches/arquillian/modules/testsuite/pom.xml
Log:
Uncommenting shared testsuite module
Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-06 09:19:52 UTC (rev 19325)
+++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-06 20:39:29 UTC (rev 19326)
@@ -38,7 +38,7 @@
<!-- Modules -->
<modules>
<module>cxf-tests</module>
- <!-- <module>shared-tests</module> -->
+ <module>shared-tests</module>
</modules>
10 years, 2 months
JBossWS SVN: r19325 - in stack/cxf/branches/arquillian/modules: testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2015-01-06 04:19:52 -0500 (Tue, 06 Jan 2015)
New Revision: 19325
Modified:
stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/AsynchTestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCaseForked.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java
Log:
Convert WebParamTestCase to arquillan test;Fix JBWS1581TestCase and more clean up
Modified: stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2015-01-05 15:13:41 UTC (rev 19324)
+++ stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2015-01-06 09:19:52 UTC (rev 19325)
@@ -41,6 +41,7 @@
import javax.xml.ws.Service.Mode;
import javax.xml.ws.soap.SOAPBinding;
+import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.exporter.ZipExporter;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -401,6 +402,14 @@
getDeployer().restart();
}
+ @SuppressWarnings("rawtypes")
+ public static void writeToFile(Archive archive)
+ {
+ File archiveDir = assertArchiveDirExists();
+ File file = new File(archiveDir, archive.getName());
+ archive.as(ZipExporter.class).exportTo(file, true);
+ }
+
public static abstract class BaseDeployment<T extends org.jboss.shrinkwrap.api.Archive<T>>
{
protected T archive;
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/AsynchTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/AsynchTestCase.java 2015-01-05 15:13:41 UTC (rev 19324)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/AsynchTestCase.java 2015-01-06 09:19:52 UTC (rev 19325)
@@ -23,8 +23,6 @@
import java.io.File;
import java.net.URL;
-import java.util.LinkedList;
-import java.util.List;
import java.util.concurrent.Future;
import javax.xml.namespace.QName;
@@ -35,12 +33,12 @@
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;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -53,21 +51,9 @@
@RunWith(Arquillian.class)
public class AsynchTestCase extends JBossWSTest
{
- private String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-samples-asynch";
+ @ArquillianResource
+ private URL baseURL;
- public static BaseDeployment<?>[] createDeployments() {
- List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
- list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-asynch.war") { {
- archive
- .setManifest(new StringAsset("Manifest-Version: 1.0\n"
- + "Dependencies: org.apache.cxf\n"))
- .addClass(org.jboss.test.ws.jaxws.samples.asynch.EndpointImpl.class)
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/asynch/WEB-INF/web.xml"));
- }
- });
- return list.toArray(new BaseDeployment<?>[list.size()]);
- }
-
@Deployment(testable = false)
public static WebArchive createDep() {
WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-asynch.war");
@@ -83,7 +69,7 @@
public void testEndpoint() throws Exception
{
QName serviceName = new QName("http://org.jboss.ws/cxf/samples/asynch", "EndpointImplService");
- URL wsdlURL = new URL(endpointAddress + "?wsdl");
+ URL wsdlURL = new URL(baseURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
Endpoint proxy = service.getPort(Endpoint.class);
final String user = "Kermit";
@@ -95,7 +81,7 @@
public void testAsyncEndpoint() throws Exception
{
QName serviceName = new QName("http://org.jboss.ws/cxf/samples/asynch", "EndpointImplService");
- URL wsdlURL = new URL(endpointAddress + "?wsdl");
+ URL wsdlURL = new URL(baseURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
Endpoint proxy = service.getPort(Endpoint.class);
final String user = "Kermit";
@@ -108,7 +94,7 @@
public void testAsyncEndpointUsingHandler() throws Exception
{
QName serviceName = new QName("http://org.jboss.ws/cxf/samples/asynch", "EndpointImplService");
- URL wsdlURL = new URL(endpointAddress + "?wsdl");
+ URL wsdlURL = new URL(baseURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
Endpoint proxy = service.getPort(Endpoint.class);
final String user = "Kermit";
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java 2015-01-05 15:13:41 UTC (rev 19324)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java 2015-01-06 09:19:52 UTC (rev 19325)
@@ -34,7 +34,6 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.exporter.ZipExporter;
import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -71,7 +70,7 @@
.addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointBean.class)
.addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointInterface.class)
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1581/WEB-INF/web.xml"));
- writeToDisk(archive);
+ JBossWSTestHelper.writeToFile(archive);
return archive;
}
@@ -97,13 +96,6 @@
.addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), WAR_DEPLOYMENT + ".war"));
return archive;
}
-
- public static void writeToDisk(WebArchive archive)
- {
- File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName());
- archive.as(ZipExporter.class).exportTo(file, true);
- }
-
@Test
@RunAsClient
public void testWSDLAccessWar() throws Exception {
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCaseForked.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCaseForked.java 2015-01-05 15:13:41 UTC (rev 19324)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCaseForked.java 2015-01-06 09:19:52 UTC (rev 19325)
@@ -65,7 +65,6 @@
@Deployment(name = INCONTAINER_CLIENT, testable = false)
public static WebArchive createDeployments() {
- List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
WebArchive archive = ShrinkWrap.create(WebArchive.class, INCONTAINER_CLIENT + ".war");
archive
.setManifest(new StringAsset("Manifest-Version: 1.0\n"
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java 2015-01-05 15:13:41 UTC (rev 19324)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java 2015-01-06 09:19:52 UTC (rev 19325)
@@ -23,20 +23,22 @@
import java.io.File;
import java.net.URL;
-import java.util.LinkedList;
-import java.util.List;
import javax.xml.namespace.QName;
import javax.xml.ws.Holder;
import javax.xml.ws.Service;
-import junit.framework.Test;
-
-import org.jboss.wsf.test.CleanupOperation;
+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.shrinkwrap.api.ShrinkWrap;
+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;
-import org.jboss.wsf.test.JBossWSTestSetup;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
/**
* Test the JSR-181 annotation: javax.jws.WebParam
@@ -44,38 +46,26 @@
* @author Thomas.Diesler(a)jboss.org
* @since 07-Oct-2005
*/
+(a)RunWith(Arquillian.class)
public class WebParamTestCase extends JBossWSTest
{
- private String targetNS = "http://www.openuri.org/jsr181/WebParamExample";
-
+ private String targetNS = "http://www.openuri.org/jsr181/WebParamExample";
private static PingService port;
- public static BaseDeployment<?>[] createDeployments() {
- List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
- list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-webparam.war") { {
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.samples.webparam.PingDocument.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webparam.PingServiceImpl.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webparam.SecurityHeader.class)
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webparam/WEB-INF/web.xml"));
- }
- });
- return list.toArray(new BaseDeployment<?>[list.size()]);
+ @Deployment(testable = false)
+ public static WebArchive createDeployment1() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-webparam.war");
+ archive.addManifest()
+ .addClass(org.jboss.test.ws.jaxws.samples.webparam.PingDocument.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.webparam.PingServiceImpl.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.webparam.SecurityHeader.class)
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webparam/WEB-INF/web.xml"));
+ return archive;
}
- public static Test suite()
+ @Before
+ public void createPort() throws Exception
{
- return new JBossWSTestSetup(WebParamTestCase.class, JBossWSTestHelper.writeToFile(createDeployments()), new CleanupOperation() {
- @Override
- public void cleanUp() {
- port = null;
- }
- });
- }
-
- public void setUp() throws Exception
- {
if (port == null)
{
QName serviceName = new QName(targetNS, "PingServiceService");
@@ -85,7 +75,8 @@
port = service.getPort(PingService.class);
}
}
-
+ @Test
+ @RunAsClient
public void testEcho() throws Exception
{
PingDocument doc = new PingDocument();
@@ -93,14 +84,16 @@
PingDocument retObj = port.echo(doc);
assertEquals(doc.getContent(), retObj.getContent());
}
-
+ @Test
+ @RunAsClient
public void testPingOneWay() throws Exception
{
PingDocument doc = new PingDocument();
doc.setContent("Hello Kermit");
port.pingOneWay(doc);
}
-
+ @Test
+ @RunAsClient
public void testPingTwoWay() throws Exception
{
PingDocument doc = new PingDocument();
@@ -110,7 +103,8 @@
port.pingTwoWay(holder);
assertEquals("Hello Kermit Response", holder.value.getContent());
}
-
+ @Test
+ @RunAsClient
public void testSecurePing() throws Exception
{
PingDocument doc = new PingDocument();
@@ -120,4 +114,9 @@
port.securePing(doc, secHeader);
}
+
+ @After
+ public void resetPort() {
+ port = null;
+ }
}
10 years, 2 months