[jboss-svn-commits] JBL Code SVN: r37589 - in labs/jbosstm/trunk/XTS: sar/tests/arquillian and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Oct 18 07:48:52 EDT 2011
Author: zhfeng
Date: 2011-10-18 07:48:52 -0400 (Tue, 18 Oct 2011)
New Revision: 37589
Added:
labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/resources/
labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/resources/context-handlers.xml
labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/webapp/WEB-INF/service-web-app.xml
labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/test/java/org/jboss/jbossts/xts/servicetests/test/RunSingleParticipantPrepareAndCommitTest.java
Removed:
labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/webapp/WEB-INF/web.xml
labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/test/java/org/jboss/jbossts/xts/servicetests/test/SingleParticipantPrepareAndCommitTest.java
Modified:
labs/jbosstm/trunk/XTS/demo/jboss.properties
labs/jbosstm/trunk/XTS/sar/tests/arquillian/pom.xml
labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/java/org/jboss/jbossts/xts/servicetests/ejb/XTSServiceTestRunnerEJBImpl.java
labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/java/org/jboss/jbossts/xts/servicetests/test/at/SingleParticipantPrepareAndCommitTest.java
Log:
update to add xts dependency in arquillian test
Modified: labs/jbosstm/trunk/XTS/demo/jboss.properties
===================================================================
--- labs/jbosstm/trunk/XTS/demo/jboss.properties 2011-10-18 08:07:24 UTC (rev 37588)
+++ labs/jbosstm/trunk/XTS/demo/jboss.properties 2011-10-18 11:48:52 UTC (rev 37589)
@@ -29,9 +29,9 @@
The default services are the ones running within JBoss.
-->
<arjuna>
- <hostname>JBOSS_HOSTNAME</hostname>
- <port>JBOSS_PORT</port>
- <urlstub>JBOSS_URLSTUB</urlstub>
+ <hostname>localhost</hostname>
+ <port>80</port>
+ <urlstub>xts</urlstub>
<!-- JBoss services -->
<restaurantATURL>http://JBOSS_HOSTNAME:JBOSS_PORT/JBOSS_URLSTUB/RestaurantServiceAT</restaurantATURL>
Modified: labs/jbosstm/trunk/XTS/sar/tests/arquillian/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/arquillian/pom.xml 2011-10-18 08:07:24 UTC (rev 37588)
+++ labs/jbosstm/trunk/XTS/sar/tests/arquillian/pom.xml 2011-10-18 11:48:52 UTC (rev 37589)
@@ -47,7 +47,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml>
<archive>
<manifestEntries>
- <Dependencies>org.jboss.jts</Dependencies>
+ <Dependencies>org.jboss.xts</Dependencies>
</manifestEntries>
</archive>
</configuration>
@@ -126,6 +126,7 @@
<dependency>
<groupId>org.jboss.narayana.xts</groupId>
<artifactId>jbossxts</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
Modified: labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/java/org/jboss/jbossts/xts/servicetests/ejb/XTSServiceTestRunnerEJBImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/java/org/jboss/jbossts/xts/servicetests/ejb/XTSServiceTestRunnerEJBImpl.java 2011-10-18 08:07:24 UTC (rev 37588)
+++ labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/java/org/jboss/jbossts/xts/servicetests/ejb/XTSServiceTestRunnerEJBImpl.java 2011-10-18 11:48:52 UTC (rev 37589)
@@ -42,7 +42,7 @@
log.info("XTSServiceTestRunner run test " + testName);
Class testClass;
ClassLoader cl = XTSServiceTestRunnerEJBImpl.class.getClassLoader();
-
+
try {
testClass = cl.loadClass(testName);
} catch (ClassNotFoundException cnfe) {
Modified: labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/java/org/jboss/jbossts/xts/servicetests/test/at/SingleParticipantPrepareAndCommitTest.java
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/java/org/jboss/jbossts/xts/servicetests/test/at/SingleParticipantPrepareAndCommitTest.java 2011-10-18 08:07:24 UTC (rev 37588)
+++ labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/java/org/jboss/jbossts/xts/servicetests/test/at/SingleParticipantPrepareAndCommitTest.java 2011-10-18 11:48:52 UTC (rev 37589)
@@ -39,83 +39,84 @@
*/
public class SingleParticipantPrepareAndCommitTest extends XTSServiceTestBase implements XTSServiceTest
{
- public void run() {
+ public void run() {
- // wait a while so the service has time to start
-
+ // wait a while so the service has time to start
+ /*
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
// ignore
}
+ */
- String serviceURL1;
+ String serviceURL1;
- serviceURL1 = System.getProperty(XTSServiceTest.SERVICE_URL1_KEY);
+ serviceURL1 = System.getProperty(XTSServiceTest.SERVICE_URL1_KEY);
- if (serviceURL1 == null) {
- serviceURL1 = "http://localhost:8080/xtstest/xtsservicetest1";
- }
+ if (serviceURL1 == null) {
+ serviceURL1 = "http://localhost:8080/xtstest/xtsservicetest1";
+ }
- addDefaultBinding("service1", serviceURL1);
+ addDefaultBinding("service1", serviceURL1);
- UserTransaction tx = UserTransactionFactory.userTransaction();
+ UserTransaction tx = UserTransactionFactory.userTransaction();
- // start the transaction
+ // start the transaction
- try {
- tx.begin();
- } catch (WrongStateException e) {
- exception = e;
- } catch (SystemException e) {
- exception = e;
- }
+ try {
+ tx.begin();
+ } catch (WrongStateException e) {
+ exception = e;
+ } catch (SystemException e) {
+ exception = e;
+ }
- if (exception != null) {
- error("txbegin failure " + exception);
- return;
- }
+ if (exception != null) {
+ error("txbegin failure " + exception);
+ return;
+ }
- List<String> commands = new ArrayList<String>();
- List<String> results = new ArrayList<String>();
+ List<String> commands = new ArrayList<String>();
+ List<String> results = new ArrayList<String>();
- commands.add("serve");
- commands.add("{service1}");
- commands.add("enlistDurable");
- commands.add("prepare");
- commands.add("commit");
+ commands.add("serve");
+ commands.add("{service1}");
+ commands.add("enlistDurable");
+ commands.add("prepare");
+ commands.add("commit");
- try {
- processCommands(commands, results);
- } catch (Exception e) {
- exception = e;
- }
+ try {
+ processCommands(commands, results);
+ } catch (Exception e) {
+ exception = e;
+ }
- if (exception != null) {
- error("test failure " + exception);
- return;
- }
+ if (exception != null) {
+ error("test failure " + exception);
+ return;
+ }
- // now commit the transaction
+ // now commit the transaction
- try {
- tx.commit();
- } catch (TransactionRolledBackException e) {
- exception = e;
- } catch (UnknownTransactionException e) {
- exception = e;
- } catch (SystemException e) {
- exception = e;
- } catch (WrongStateException e) {
- exception = e;
- }
+ try {
+ tx.commit();
+ } catch (TransactionRolledBackException e) {
+ exception = e;
+ } catch (UnknownTransactionException e) {
+ exception = e;
+ } catch (SystemException e) {
+ exception = e;
+ } catch (WrongStateException e) {
+ exception = e;
+ }
- if (exception != null) {
- error("commit failure " + exception);
- }
+ if (exception != null) {
+ error("commit failure " + exception);
+ }
- message("completed");
+ message("completed");
- isSuccessful = (exception == null);
- }
+ isSuccessful = (exception == null);
+ }
}
Added: labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/resources/context-handlers.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/resources/context-handlers.xml (rev 0)
+++ labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/resources/context-handlers.xml 2011-10-18 11:48:52 UTC (rev 37589)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+-->
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://java.sun.com/xml/ns/javaee">
+ <handler-chain>
+ <handler>
+ <handler-name>ContextHandler</handler-name>
+ <handler-class>com.arjuna.mw.wst11.service.JaxWSHeaderContextProcessor</handler-class>
+ </handler>
+ </handler-chain>
+</handler-chains>
Copied: labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/webapp/WEB-INF/service-web-app.xml (from rev 37588, labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/webapp/WEB-INF/web.xml)
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/webapp/WEB-INF/service-web-app.xml (rev 0)
+++ labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/webapp/WEB-INF/service-web-app.xml 2011-10-18 11:48:52 UTC (rev 37589)
@@ -0,0 +1,92 @@
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ as indicated by the @author tags.
+ See the copyright.txt in the distribution for a full listing
+ of individual contributors.
+ This copyrighted material is made available to anyone wishing to use,
+ modify, copy, or redistribute it subject to the terms and conditions
+ of the GNU Lesser General Public License, v. 2.1.
+ This program is distributed in the hope that it will be useful, but WITHOUT A
+ 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,
+ v.2.1 along with this distribution; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+
+ (C) 2009,
+ @author JBoss Inc.
+-->
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+ <display-name>XTS Service Tests Service</display-name>
+
+ <description>XTS Service Tests Service</description>
+
+ <!-- Initialise test services -->
+ <!--
+ <listener>
+ <listener-class>org.jboss.jbossts.xts.servicetests.bean.XTSServiceTestRunnerBean</listener-class>
+ </listener>
+ -->
+
+ <!-- Define Server endpoints and implementation classes -->
+ <servlet>
+ <servlet-name>XTS_Service_Test_Service_One</servlet-name>
+ <servlet-class>org.jboss.jbossts.xts.servicetests.service.XTSServiceTestPortTypeImpl</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>XTS_Service_Test_Service_Two</servlet-name>
+ <servlet-class>org.jboss.jbossts.xts.servicetests.service.XTSServiceTestPortTypeImpl</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>XTS_Service_Test_Service_Three</servlet-name>
+ <servlet-class>org.jboss.jbossts.xts.servicetests.service.XTSServiceTestPortTypeImpl</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>XTS_Service_Test_Subordinate_Service_One</servlet-name>
+ <servlet-class>org.jboss.jbossts.xts.servicetests.service.subordinate.XTSSubordinateServiceTestPortTypeImpl</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>XTS_Service_Test_Web_Runner</servlet-name>
+ <servlet-class>org.jboss.jbossts.xts.servicetests.webbean.XTSHTTPServiceTestRunner</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <!-- Define Server Endpoint Mappings -->
+ <servlet-mapping>
+ <servlet-name>XTS_Service_Test_Service_One</servlet-name>
+ <url-pattern>/xtsservicetest1</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>XTS_Service_Test_Service_Two</servlet-name>
+ <url-pattern>/xtsservicetest2</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>XTS_Service_Test_Service_Three</servlet-name>
+ <url-pattern>/xtsservicetest3</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>XTS_Service_Test_Subordinate_Service_One</servlet-name>
+ <url-pattern>/xtssubordinateservicetest1</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>XTS_Service_Test_Web_Runner</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+</web-app>
Deleted: labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/webapp/WEB-INF/web.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/webapp/WEB-INF/web.xml 2011-10-18 08:07:24 UTC (rev 37588)
+++ labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/main/webapp/WEB-INF/web.xml 2011-10-18 11:48:52 UTC (rev 37589)
@@ -1,92 +0,0 @@
-<!--
- JBoss, Home of Professional Open Source
- Copyright 2009, Red Hat Middleware LLC, and individual contributors
- as indicated by the @author tags.
- See the copyright.txt in the distribution for a full listing
- of individual contributors.
- This copyrighted material is made available to anyone wishing to use,
- modify, copy, or redistribute it subject to the terms and conditions
- of the GNU Lesser General Public License, v. 2.1.
- This program is distributed in the hope that it will be useful, but WITHOUT A
- 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,
- v.2.1 along with this distribution; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
-
- (C) 2009,
- @author JBoss Inc.
--->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
- <display-name>XTS Service Tests Service</display-name>
-
- <description>XTS Service Tests Service</description>
-
- <!-- Initialise test services -->
- <!--
- <listener>
- <listener-class>org.jboss.jbossts.xts.servicetests.bean.XTSServiceTestRunnerBean</listener-class>
- </listener>
- -->
-
- <!-- Define Server endpoints and implementation classes -->
- <servlet>
- <servlet-name>XTS_Service_Test_Service_One</servlet-name>
- <servlet-class>org.jboss.jbossts.xts.servicetests.service.XTSServiceTestPortTypeImpl</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>XTS_Service_Test_Service_Two</servlet-name>
- <servlet-class>org.jboss.jbossts.xts.servicetests.service.XTSServiceTestPortTypeImpl</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>XTS_Service_Test_Service_Three</servlet-name>
- <servlet-class>org.jboss.jbossts.xts.servicetests.service.XTSServiceTestPortTypeImpl</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>XTS_Service_Test_Subordinate_Service_One</servlet-name>
- <servlet-class>org.jboss.jbossts.xts.servicetests.service.subordinate.XTSSubordinateServiceTestPortTypeImpl</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>XTS_Service_Test_Web_Runner</servlet-name>
- <servlet-class>org.jboss.jbossts.xts.servicetests.webbean.XTSHTTPServiceTestRunner</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <!-- Define Server Endpoint Mappings -->
- <servlet-mapping>
- <servlet-name>XTS_Service_Test_Service_One</servlet-name>
- <url-pattern>/xtsservicetest1</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>XTS_Service_Test_Service_Two</servlet-name>
- <url-pattern>/xtsservicetest2</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>XTS_Service_Test_Service_Three</servlet-name>
- <url-pattern>/xtsservicetest3</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>XTS_Service_Test_Subordinate_Service_One</servlet-name>
- <url-pattern>/xtssubordinateservicetest1</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>XTS_Service_Test_Web_Runner</servlet-name>
- <url-pattern>/</url-pattern>
- </servlet-mapping>
-</web-app>
Added: labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/test/java/org/jboss/jbossts/xts/servicetests/test/RunSingleParticipantPrepareAndCommitTest.java
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/test/java/org/jboss/jbossts/xts/servicetests/test/RunSingleParticipantPrepareAndCommitTest.java (rev 0)
+++ labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/test/java/org/jboss/jbossts/xts/servicetests/test/RunSingleParticipantPrepareAndCommitTest.java 2011-10-18 11:48:52 UTC (rev 37589)
@@ -0,0 +1,36 @@
+package org.jboss.jbossts.xts.servicetests.test;
+
+import java.io.File;
+import javax.inject.Inject;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.jbossts.xts.servicetests.bean.XTSServiceTestRunnerBean;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+ at RunWith(Arquillian.class)
+public class RunSingleParticipantPrepareAndCommitTest extends XTSServiceTestBase {
+ @Inject
+ private XTSServiceTestRunnerBean testRunner;
+
+ private String testName =
+ "org.jboss.jbossts.xts.servicetests.test.at.SingleParticipantPrepareAndCommitTest";
+
+ @Deployment
+ public static WebArchive createDeployment() {
+ WebArchive archive = ShrinkWrap.
+ createFromZipFile(WebArchive.class, new File("../xtstest.war"));
+
+ return archive;
+ }
+
+ @Test
+ public void ATCrashDuringOnePhaseCommit() throws Exception {
+
+ testRunner.runTest(testName);
+ }
+
+}
Deleted: labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/test/java/org/jboss/jbossts/xts/servicetests/test/SingleParticipantPrepareAndCommitTest.java
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/test/java/org/jboss/jbossts/xts/servicetests/test/SingleParticipantPrepareAndCommitTest.java 2011-10-18 08:07:24 UTC (rev 37588)
+++ labs/jbosstm/trunk/XTS/sar/tests/arquillian/src/test/java/org/jboss/jbossts/xts/servicetests/test/SingleParticipantPrepareAndCommitTest.java 2011-10-18 11:48:52 UTC (rev 37589)
@@ -1,44 +0,0 @@
-package org.jboss.jbossts.xts.servicetests.test;
-
-import java.io.File;
-import javax.inject.Inject;
-
-import org.jboss.arquillian.container.test.api.Deployment;
-//import org.jboss.arquillian.framework.byteman.api.BMRule;
-//import org.jboss.arquillian.framework.byteman.api.BMRules;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.jbossts.xts.servicetests.bean.XTSServiceTestRunnerBean;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/*
- at BMRules(
- @BMRule(
- name = "Throw exception on success",
- targetClass = "SingleParticipantPrepareAndCommitTest",
- targetMethod = "ATCrashDuringOnePhaseCommit",
- action = "throw new java.lang.RuntimeException()")
-)
-*/
-
- at RunWith(Arquillian.class)
-public class SingleParticipantPrepareAndCommitTest extends XTSServiceTestBase {
- @Inject
- private XTSServiceTestRunnerBean testRunner;
-
- @Deployment
- public static WebArchive createDeployment() {
- WebArchive archive = ShrinkWrap.
- createFromZipFile(WebArchive.class, new File("../xtstest.war"));
-
- return archive;
- }
-
- @Test
- public void ATCrashDuringOnePhaseCommit() throws Exception {
- testRunner.runTest("SingleParticipantPrepareAndCommitTest");
- }
-
-}
More information about the jboss-svn-commits
mailing list