Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JBTM-2524] Added a new test to check CMR records and solved JBTM-2524 #2120

Merged
merged 2 commits into from Apr 14, 2023
Merged

[JBTM-2524] Added a new test to check CMR records and solved JBTM-2524 #2120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
060bc93
[JBTM-2524] Added a new test to check CMR records and solved JBTM-2524
jmfinelli Apr 12, 2023
b77756a
Removed unused test in CMRIntegrationTest
jmfinelli Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
172 changes: 91 additions & 81 deletions ArjunaJTA/jta/pom.xml
View file
Open in desktop
Expand Up @@ -25,8 +25,9 @@
<description>Narayana: ArjunaJTA jta</description>

<properties>
<!-- java.net.preferIPv6Addresses=false is a workaround to (not) solve the bug in arquillian-extension-byteman -->
<ipv6.server.jvm.args>-Djboss.bind.address=[::1] -Djboss.bind.address.management=[::1]
-Djboss.bind.address.unsecure=[::1] -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true</ipv6.server.jvm.args>
-Djboss.bind.address.unsecure=[::1] -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=false</ipv6.server.jvm.args>
marcosgopen marked this conversation as resolved.
Show resolved Hide resolved
<server.jvm.args>${jvm.args.other} ${jvm.args.memory} ${jvm.args.debug} ${jvm.args.modular}</server.jvm.args>
</properties>
<dependencies>
Expand Down Expand Up @@ -133,16 +134,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet-jakarta</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.narayana</groupId>
<artifactId>test-utils</artifactId>
Expand Down Expand Up @@ -183,6 +174,7 @@
<configuration>
<testExcludes>
<exclude>io/narayana/perf/product/*.java</exclude>
<exclude>**/integration/*IntegrationTest.java</exclude>
</testExcludes>
</configuration>
</execution>
Expand All @@ -195,7 +187,6 @@
<useManifestOnlyJar>false</useManifestOnlyJar>
<excludes>
<exclude>**/io/narayana/perf/product/*</exclude>
<exclude>**/integration/*IntegrationTest.java</exclude>
<!-- exclude tests which were run above using byteman scripts -->
<exclude>**/recovery/CrashRecovery.java</exclude>
</excludes>
Expand Down Expand Up @@ -237,6 +228,18 @@
</plugins>
</build>
</profile>
<!-- For further info about this profile, refer to https://github.com/arquillian/arquillian-extension-byteman -->
<profile>
<id>use-toolsjar-jigsaw</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<properties>
<byteman.agent.support>-Djboss.modules.system.pkgs=com.sun.tools.attach,org.jboss.byteman -Djdk.attach.allowAttachSelf=true</byteman.agent.support>
<!-- required for VM attach under JDK 11-->
<surefire.argline>-Djdk.attach.allowAttachSelf=true</surefire.argline>
</properties>
</profile>
<profile>
<id>arq</id>
<activation>
Expand All @@ -248,65 +251,75 @@
</activation>
<dependencies>
<dependency>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-transaction-spi</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</exclusion>
</exclusions>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet-jakarta</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-extension-byteman</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<groupId>org.wildfly.extras.creaper</groupId>
jmfinelli marked this conversation as resolved.
Show resolved Hide resolved
<artifactId>creaper-core</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-controller-client</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet-jakarta</artifactId>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-cli</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<scope>provided</scope>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>arq-testCompile</id>
<goals>
<goal>testCompile</goal>
</goals>
<phase>test-compile</phase>
<configuration>
<testIncludes>
<include>**/integration/*IntegrationTest.java</include>
</testIncludes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.argline}</argLine>
<systemPropertyVariables combine.children="append">
<!--
Used in arquillian.xml
-->
<server.jvm.args>${server.jvm.args}</server.jvm.args>
<server.jvm.args>${server.jvm.args} ${byteman.agent.support}</server.jvm.args>
<node.address>127.0.0.1</node.address>
</systemPropertyVariables>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
Expand All @@ -332,75 +345,76 @@
</activation>
<dependencies>
<dependency>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<version>${version.org.wildfly.arquillian}</version>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-transaction-spi</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</exclusion>
</exclusions>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet-jakarta</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>${version.org.jboss.logging.jboss-logging}</version>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-extension-byteman</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${version.postgresql}</version>
<groupId>org.wildfly.extras.creaper</groupId>
<artifactId>creaper-core</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${version.com.h2database}</version>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-controller-client</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet-jakarta</artifactId>
<version>${version.org.jboss.arquillian.core}</version>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-cli</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<version>${version.org.jboss.arquillian.core}</version>
<scope>provided</scope>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>arqIPv6-testCompile</id>
<goals>
<goal>testCompile</goal>
</goals>
<phase>test-compile</phase>
<configuration>
<testIncludes>
<include>**/integration/*IntegrationTest.java</include>
</testIncludes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>false</skip>
<argLine>${ipv6.server.jvm.args}</argLine>
<argLine>${surefire.argline}</argLine>
<systemPropertyVariables combine.children="append">
<!--
Used in arquillian.xml
-->
<server.jvm.args>${server.jvm.args} ${ipv6.server.jvm.args}</server.jvm.args>
<server.jvm.args>${server.jvm.args} ${byteman.agent.support} ${ipv6.server.jvm.args}</server.jvm.args>
<node.address>[::1]</node.address>
</systemPropertyVariables>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
Expand All @@ -421,30 +435,26 @@
<dependency>
<groupId>com.ibm.db2</groupId>
<artifactId>jcc</artifactId>
<version>${version.com.ibm}</version>
<scope>test</scope>
</dependency>
<!--
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>sqljdbc4</artifactId>
<version>${version.com.microsoft.sqlserver}</version>
<systemPath>${orson.jar.location}/../qa/dbdrivers/mssql2005_sqljdbc_2.0/enu/sqljdbc4.jar
</systemPath>
<scope>system</scope>
</dependency>
<dependency>
<groupId>com.sybase.jdbcx</groupId>
<artifactId>jconn4</artifactId>
<version>jConnect-7_0</version>
<systemPath>${orson.jar.location}/../qa/dbdrivers/jConnect-6_0/classes/jconn3.jar</systemPath>
<scope>system</scope>
</dependency>
-->
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<version>${version.com.oracle}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
10 changes: 6 additions & 4 deletions ArjunaJTA/jta/src/test/resources/arquillian.xml
View file
Open in desktop
Expand Up @@ -24,14 +24,16 @@

<container qualifier="jboss" default="true">
<configuration>
<!-- defaults to JBOSS_HOME
<property name="jbossHome">$WORKSPACE/jboss-as/build/target/wildfly-$WILDFLY_MAIN_VERSION</property> -->

<property name="serverConfig">standalone.xml</property>
<property name="javaVmArguments">${server.jvm.args}</property>
<property name="managementAddress">${node.address}</property>
<property name="startupTimeoutInSeconds">${server.startup.timeout:60}</property>
</configuration>
</configuration>
</container>

<extension qualifier="byteman">
<property name="autoInstallAgent">true</property>
<property name="agentProperties">org.jboss.byteman.verbose=true,prop:org.jboss.byteman.debug=true</property>
</extension>

</arquillian>