[jboss-svn-commits] JBL Code SVN: r38103 - in labs/jbosstm/branches/JBOSSTS_4_16: XTS/demo-test/src/test/java/org/jboss/jbossts/xts/demotest and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri May 25 04:05:57 EDT 2012
Author: istudens at redhat.com
Date: 2012-05-25 04:05:54 -0400 (Fri, 25 May 2012)
New Revision: 38103
Modified:
labs/jbosstm/branches/JBOSSTS_4_16/XTS/demo-test/pom.xml
labs/jbosstm/branches/JBOSSTS_4_16/XTS/demo-test/src/test/java/org/jboss/jbossts/xts/demotest/XTSDemoTest.java
labs/jbosstm/branches/JBOSSTS_4_16/XTS/demo-test/src/test/resources/arquillian.xml
labs/jbosstm/branches/JBOSSTS_4_16/txbridge/demo-test/pom.xml
labs/jbosstm/branches/JBOSSTS_4_16/txbridge/demo-test/src/test/java/org/jboss/jbossts/txbridge/demotest/TxBridgeDemoTest.java
labs/jbosstm/branches/JBOSSTS_4_16/txbridge/demo-test/src/test/resources/arquillian.xml
Log:
adding ipv6 support to xts demo tests and txbridge demo tests, JBTM-1173
Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/demo-test/pom.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/demo-test/pom.xml 2012-05-24 18:55:01 UTC (rev 38102)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/demo-test/pom.xml 2012-05-25 08:05:54 UTC (rev 38103)
@@ -11,19 +11,33 @@
<properties>
<version.jbossas>7.1.1.Final</version.jbossas>
- <version.arquillian.junit>1.0.0.Final</version.arquillian.junit>
- <version.arquillian.drone>1.0.0.Final</version.arquillian.drone>
- <version.arquillian.ajocado.junit>1.0.0.CR2</version.arquillian.ajocado.junit>
+ <version.org.jboss.arquillian>1.0.0.Final</version.org.jboss.arquillian>
+ <version.org.jboss.arquillian.drone>1.0.0.Final</version.org.jboss.arquillian.drone>
+ <version.org.jboss.arquillian.graphene>1.0.0.Final</version.org.jboss.arquillian.graphene>
<version.junit>4.8.2</version.junit>
+
+ <jvm.args.ip>-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false</jvm.args.ip>
+ <jvm.args.ip.server>${jvm.args.ip}</jvm.args.ip.server>
+ <jvm.args.ip.client>${jvm.args.ip}</jvm.args.ip.client>
+ <node0>127.0.0.1</node0>
+ <surefire.forked.process.timeout>1200</surefire.forked.process.timeout>
</properties>
<dependencyManagement>
<dependencies>
+ <!-- Arquillian Core dependencies -->
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-bom</artifactId>
+ <version>${version.org.jboss.arquillian}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<!-- Arquillian Drone dependencies and Selenium dependencies -->
<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-drone-bom</artifactId>
- <version>${version.arquillian.drone}</version>
+ <version>${version.org.jboss.arquillian.drone}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -49,14 +63,14 @@
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
- <version>${version.arquillian.junit}</version>
+ <version>${version.org.jboss.arquillian}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.arquillian.ajocado</groupId>
- <artifactId>arquillian-ajocado-junit</artifactId>
- <version>${version.arquillian.ajocado.junit}</version>
+ <groupId>org.jboss.arquillian.graphene</groupId>
+ <artifactId>arquillian-graphene</artifactId>
+ <version>${version.org.jboss.arquillian.graphene}</version>
<type>pom</type>
<scope>test</scope>
</dependency>
@@ -119,6 +133,31 @@
</filesets>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.11</version>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <enableAssertions>true</enableAssertions>
+ <!--<workingDirectory>${basedir}/target/workdir</workingDirectory> <!– Work in submodule's own dir. –>-->
+
+ <!-- Forked process timeout -->
+ <forkedProcessTimeoutInSeconds>${surefire.forked.process.timeout}</forkedProcessTimeoutInSeconds>
+ <!-- System properties to forked surefire JVM which runs clients. -->
+ <argLine>${jvm.args.ip.client}</argLine>
+
+ <!-- System properties passed to test cases -->
+ <systemPropertyVariables>
+ <node0>${node0}</node0>
+ <!--
+ Used in arquillian.xml - arguments for all JBoss AS instances.
+ System properties are duplicated here until ARQ-647 is implemented.
+ -->
+ <server.jvm.args>-Xmx512m -XX:MaxPermSize=128m ${jvm.args.ip.server} -Djboss.bind.address=${node0} -Djboss.bind.address.management=${node0}</server.jvm.args>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -137,5 +176,14 @@
</dependency>
</dependencies>
</profile>
+
+ <profile>
+ <id>ipv6</id>
+ <activation><property><name>ipv6</name></property></activation>
+ <properties>
+ <jvm.args.ip>-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true</jvm.args.ip>
+ <node0>[::1]</node0>
+ </properties>
+ </profile>
</profiles>
</project>
Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/demo-test/src/test/java/org/jboss/jbossts/xts/demotest/XTSDemoTest.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/demo-test/src/test/java/org/jboss/jbossts/xts/demotest/XTSDemoTest.java 2012-05-24 18:55:01 UTC (rev 38102)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/demo-test/src/test/java/org/jboss/jbossts/xts/demotest/XTSDemoTest.java 2012-05-25 08:05:54 UTC (rev 38103)
@@ -21,13 +21,13 @@
*/
package org.jboss.jbossts.xts.demotest;
-import static org.jboss.arquillian.ajocado.Ajocado.elementPresent;
-import static org.jboss.arquillian.ajocado.Ajocado.name;
-import static org.jboss.arquillian.ajocado.Ajocado.waitForHttp;
-import static org.jboss.arquillian.ajocado.Ajocado.waitModel;
-import static org.jboss.arquillian.ajocado.Ajocado.xp;
+import static org.jboss.arquillian.ajocado.Graphene.elementPresent;
+import static org.jboss.arquillian.ajocado.Graphene.name;
+import static org.jboss.arquillian.ajocado.Graphene.waitForHttp;
+import static org.jboss.arquillian.ajocado.Graphene.waitModel;
+import static org.jboss.arquillian.ajocado.Graphene.xp;
-import org.jboss.arquillian.ajocado.framework.AjaxSelenium;
+import org.jboss.arquillian.ajocado.framework.GrapheneSelenium;
import org.jboss.arquillian.ajocado.locator.NameLocator;
import org.jboss.arquillian.ajocado.locator.XPathLocator;
import org.jboss.arquillian.container.test.api.Deployment;
@@ -70,7 +70,7 @@
// load ajocado driver
@Drone
- AjaxSelenium driver;
+ GrapheneSelenium driver;
// Load context path to the test
@ArquillianResource
Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/demo-test/src/test/resources/arquillian.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/demo-test/src/test/resources/arquillian.xml 2012-05-24 18:55:01 UTC (rev 38102)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/demo-test/src/test/resources/arquillian.xml 2012-05-25 08:05:54 UTC (rev 38103)
@@ -4,9 +4,11 @@
<container qualifier="jboss" default="true">
<configuration>
<property name="serverConfig">../../docs/examples/configs/standalone-xts.xml</property>
+ <property name="javaVmArguments">${server.jvm.args}</property>
+ <property name="managementAddress">${node0:127.0.0.1}</property>
</configuration>
</container>
- <extension qualifier="ajocado">
+ <extension qualifier="graphene">
<property name="seleniumTimeoutDefault">60000</property>
<property name="seleniumTimeoutGui">60000</property>
<property name="seleniumTimeoutAjax">60000</property>
Modified: labs/jbosstm/branches/JBOSSTS_4_16/txbridge/demo-test/pom.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/txbridge/demo-test/pom.xml 2012-05-24 18:55:01 UTC (rev 38102)
+++ labs/jbosstm/branches/JBOSSTS_4_16/txbridge/demo-test/pom.xml 2012-05-25 08:05:54 UTC (rev 38103)
@@ -11,19 +11,33 @@
<properties>
<version.jbossas>7.1.1.Final</version.jbossas>
- <version.arquillian.junit>1.0.0.Final</version.arquillian.junit>
- <version.arquillian.drone>1.0.0.Final</version.arquillian.drone>
- <version.arquillian.ajocado.junit>1.0.0.CR2</version.arquillian.ajocado.junit>
+ <version.org.jboss.arquillian>1.0.0.Final</version.org.jboss.arquillian>
+ <version.org.jboss.arquillian.drone>1.0.0.Final</version.org.jboss.arquillian.drone>
+ <version.org.jboss.arquillian.graphene>1.0.0.Final</version.org.jboss.arquillian.graphene>
<version.junit>4.8.2</version.junit>
+
+ <jvm.args.ip>-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false</jvm.args.ip>
+ <jvm.args.ip.server>${jvm.args.ip}</jvm.args.ip.server>
+ <jvm.args.ip.client>${jvm.args.ip}</jvm.args.ip.client>
+ <node0>127.0.0.1</node0>
+ <surefire.forked.process.timeout>1200</surefire.forked.process.timeout>
</properties>
<dependencyManagement>
<dependencies>
+ <!-- Arquillian Core dependencies -->
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-bom</artifactId>
+ <version>${version.org.jboss.arquillian}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<!-- Arquillian Drone dependencies and Selenium dependencies -->
<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-drone-bom</artifactId>
- <version>${version.arquillian.drone}</version>
+ <version>${version.org.jboss.arquillian.drone}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -49,14 +63,14 @@
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
- <version>${version.arquillian.junit}</version>
+ <version>${version.org.jboss.arquillian}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.arquillian.ajocado</groupId>
- <artifactId>arquillian-ajocado-junit</artifactId>
- <version>${version.arquillian.ajocado.junit}</version>
+ <groupId>org.jboss.arquillian.graphene</groupId>
+ <artifactId>arquillian-graphene</artifactId>
+ <version>${version.org.jboss.arquillian.graphene}</version>
<type>pom</type>
<scope>test</scope>
</dependency>
@@ -112,12 +126,38 @@
<directory>${basedir}</directory>
<includes>
<include>restaurantManagerState</include>
+ <include>theatreManagerState</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
</filesets>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.11</version>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <enableAssertions>true</enableAssertions>
+ <!--<workingDirectory>${basedir}/target/workdir</workingDirectory> <!– Work in submodule's own dir. –>-->
+
+ <!-- Forked process timeout -->
+ <forkedProcessTimeoutInSeconds>${surefire.forked.process.timeout}</forkedProcessTimeoutInSeconds>
+ <!-- System properties to forked surefire JVM which runs clients. -->
+ <argLine>${jvm.args.ip.client}</argLine>
+
+ <!-- System properties passed to test cases -->
+ <systemPropertyVariables>
+ <node0>${node0}</node0>
+ <!--
+ Used in arquillian.xml - arguments for all JBoss AS instances.
+ System properties are duplicated here until ARQ-647 is implemented.
+ -->
+ <server.jvm.args>-Xmx512m -XX:MaxPermSize=128m ${jvm.args.ip.server} -Djboss.bind.address=${node0} -Djboss.bind.address.management=${node0}</server.jvm.args>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -136,5 +176,14 @@
</dependency>
</dependencies>
</profile>
+
+ <profile>
+ <id>ipv6</id>
+ <activation><property><name>ipv6</name></property></activation>
+ <properties>
+ <jvm.args.ip>-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true</jvm.args.ip>
+ <node0>[::1]</node0>
+ </properties>
+ </profile>
</profiles>
</project>
Modified: labs/jbosstm/branches/JBOSSTS_4_16/txbridge/demo-test/src/test/java/org/jboss/jbossts/txbridge/demotest/TxBridgeDemoTest.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/txbridge/demo-test/src/test/java/org/jboss/jbossts/txbridge/demotest/TxBridgeDemoTest.java 2012-05-24 18:55:01 UTC (rev 38102)
+++ labs/jbosstm/branches/JBOSSTS_4_16/txbridge/demo-test/src/test/java/org/jboss/jbossts/txbridge/demotest/TxBridgeDemoTest.java 2012-05-25 08:05:54 UTC (rev 38103)
@@ -21,13 +21,13 @@
*/
package org.jboss.jbossts.txbridge.demotest;
-import static org.jboss.arquillian.ajocado.Ajocado.elementPresent;
-import static org.jboss.arquillian.ajocado.Ajocado.name;
-import static org.jboss.arquillian.ajocado.Ajocado.waitForHttp;
-import static org.jboss.arquillian.ajocado.Ajocado.waitModel;
-import static org.jboss.arquillian.ajocado.Ajocado.xp;
+import static org.jboss.arquillian.ajocado.Graphene.elementPresent;
+import static org.jboss.arquillian.ajocado.Graphene.name;
+import static org.jboss.arquillian.ajocado.Graphene.waitForHttp;
+import static org.jboss.arquillian.ajocado.Graphene.waitModel;
+import static org.jboss.arquillian.ajocado.Graphene.xp;
-import org.jboss.arquillian.ajocado.framework.AjaxSelenium;
+import org.jboss.arquillian.ajocado.framework.GrapheneSelenium;
import org.jboss.arquillian.ajocado.locator.NameLocator;
import org.jboss.arquillian.ajocado.locator.XPathLocator;
import org.jboss.arquillian.container.test.api.Deployment;
@@ -74,9 +74,8 @@
private static final String PARENT_TX_TYPE_JTA = "JTA";
- // load ajocado driver
@Drone
- AjaxSelenium driver;
+ GrapheneSelenium driver;
protected NameLocator TX_TYPE_FIELD = name("txType");
Modified: labs/jbosstm/branches/JBOSSTS_4_16/txbridge/demo-test/src/test/resources/arquillian.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/txbridge/demo-test/src/test/resources/arquillian.xml 2012-05-24 18:55:01 UTC (rev 38102)
+++ labs/jbosstm/branches/JBOSSTS_4_16/txbridge/demo-test/src/test/resources/arquillian.xml 2012-05-25 08:05:54 UTC (rev 38103)
@@ -4,9 +4,11 @@
<container qualifier="jboss" default="true">
<configuration>
<property name="serverConfig">../../docs/examples/configs/standalone-xts.xml</property>
+ <property name="javaVmArguments">${server.jvm.args}</property>
+ <property name="managementAddress">${node0:127.0.0.1}</property>
</configuration>
</container>
- <extension qualifier="ajocado">
+ <extension qualifier="graphene">
<property name="seleniumTimeoutDefault">60000</property>
<property name="seleniumTimeoutGui">60000</property>
<property name="seleniumTimeoutAjax">60000</property>
More information about the jboss-svn-commits
mailing list