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

Initial refactor of the connector tests #1512

Merged
merged 1 commit into from
Sep 13, 2024
Merged

Initial refactor of the connector tests #1512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions common/src/main/java/com/sun/ts/lib/harness/ServiceEETest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,9 @@ public Properties getVehicleSpecificClientProps(Properties p) {
*/
public Status run(String[] argv, Properties p) {
Status status = null;
if (TestUtil.iWhereAreWe == TestUtil.VM_HARNESS
&& this instanceof com.sun.ts.tests.common.vehicle.VehicleClient) {
boolean inTestHarness = TestUtil.iWhereAreWe == TestUtil.VM_HARNESS;
boolean isVehicleClient = this instanceof com.sun.ts.tests.common.vehicle.VehicleClient;
if (inTestHarness && isVehicleClient) {
TestUtil.logTrace("in ServiceEETest.run() method");
String sVehicle = TestUtil.getProperty(p, "vehicle");
String className = this.getClass().getName();
Expand Down
26 changes: 26 additions & 0 deletions connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,32 @@
<groupId>jakarta.resource</groupId>
<artifactId>jakarta.resource-api</artifactId>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.tck.arquillian</groupId>
<artifactId>arquillian-protocol-common</artifactId>
<version>${arquillian.jakarta.tck.version}</version>
</dependency>
<dependency>
<groupId>jakarta.tck.arquillian</groupId>
<artifactId>tck-porting-lib</artifactId>
</dependency>
</dependencies>
<build>
<!-- Include the container descriptors in the output artifact -->
Expand Down
303 changes: 303 additions & 0 deletions connector/rewrite-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,303 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
http://www.eclipse.org/legal/epl-2.0.

This Source Code may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the
Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
version 2 with the GNU Classpath Exception, which is available at
https://www.gnu.org/software/classpath/license.html.

SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0

-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.7</version>
</parent>

<groupId>jakarta.tck</groupId>
<artifactId>connector-rewrite</artifactId>
<version>11.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>project</name>
<description>project</description>

<properties>
<ant.version>1.10.11</ant.version>
<arquillian.version>1.8.0.Final</arquillian.version>

<!-- CDI -->
<cdi-api.version>4.0.0</cdi-api.version>
<!-- Jakarta Concurrency -->
<concurrent-api.version>2.0.0</concurrent-api.version>
<!-- Jakarta Persistence -->
<jakarta-persistence-api.version>3.2.0-M2</jakarta-persistence-api.version>
<jakarta.activation-api.version>2.0.0</jakarta.activation-api.version>

<jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
<jakarta.authentication-api.version>2.0.0</jakarta.authentication-api.version>
<jakarta.authorization-api.version>2.1.0</jakarta.authorization-api.version>
<!-- Jakarta Batch -->
<jakarta.batch-api.version>2.0.0</jakarta.batch-api.version>
<!-- Jakarta Enterprise beans -->
<jakarta.ejb-api.version>4.0.0</jakarta.ejb-api.version>
<jakarta.el-api.version>6.0.0-M1</jakarta.el-api.version>
<jakarta.faces-api.version>3.0.0</jakarta.faces-api.version>
<jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
<!-- Jakarta Interceptors -->
<jakarta.interceptor-api.version>2.1.0</jakarta.interceptor-api.version>
<jakarta.jws-api.version>3.0.0</jakarta.jws-api.version>
<jakarta.mail-api.version>2.0.0</jakarta.mail-api.version>
<!-- Jakarta Connectors -->
<jakarta.resource-api.version>2.0.0</jakarta.resource-api.version>
<!-- Jakarta EE Security + Authentication/Authorization -->
<jakarta.security.enterprise-api.version>2.0.0</jakarta.security.enterprise-api.version>
<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
<!-- Jakarta Transactions -->
<jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
<jakarta.validation-api.version>3.0.0</jakarta.validation-api.version>

<jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
<jakarta.xml.bind-api.version>3.0.0</jakarta.xml.bind-api.version>
<jakarta.xml.soap-api.version>3.0.0</jakarta.xml.soap-api.version>
<jakarta.xml.ws-api.version>4.0.0</jakarta.xml.ws-api.version>
<javatest.version>5.0</javatest.version>
<jaxb-osgi.version>3.0.0</jaxb-osgi.version>
<!-- Jakarta Messaging -->
<jms-api.version>3.1.0</jms-api.version>
<json.bind-api.version>3.0.0</json.bind-api.version>
<!-- Jakarta JSON -->
<jsonp-api.version>2.1.1</jsonp-api.version>
<!-- Jakarta Server Pages -->
<jsp-api.version>3.1.0</jsp-api.version>
<!-- Jakarta Standard Tag Library -->
<jstl-api.version>2.0.0</jstl-api.version>
<maven.compiler.release>17</maven.compiler.release>
<maven.compiler.testRelease>${maven.compiler.release}</maven.compiler.testRelease>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<slf4j.version>2.0.0</slf4j.version>
<surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
<version.openrewrite>8.24.0</version.openrewrite>
<version.org.jboss.arquillian.core>1.9.1.Final</version.org.jboss.arquillian.core>
<webservices-api-osgi.version>3.0.0</webservices-api-osgi.version>
<webservices-api.version>3.0.0</webservices-api.version>
<webservices-osgi.version>3.0.0</webservices-osgi.version>
<webservices-tools.version>3.0.0</webservices-tools.version>
<!-- Jakarta WebSocket -->
<websocket-api.version>2.2.0</websocket-api.version>
<websocket-client-api.version>2.2.0</websocket-client-api.version>
</properties>


<dependencies>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>libutil</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>jakarta.ejb</groupId>
<artifactId>jakarta.ejb-api</artifactId>
<version>4.0.1</version>
</dependency>
<dependency>
<groupId>jakarta.resource</groupId>
<artifactId>jakarta.resource-api</artifactId>
<version>2.0.0</version>
</dependency>

</dependencies>

<pluginRepositories>
<pluginRepository>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>oss.sonatype.org</id>
<name>Jetty Snapshot Repository</name>
<url>https://oss.sonatype.org/content/repositories/jetty-snapshots/</url>
</pluginRepository>
</pluginRepositories>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-maven-plugin</artifactId>
<version>4.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<configuration>
<mavenExecutorId>forked-path</mavenExecutorId>
<preparationGoals>clean install</preparationGoals>
<arguments>-Drelease -Dtck-audit</arguments>
</configuration>
</plugin>
<!-- Plugin versions since ee4j parent no longer declares them-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<doclint>none</doclint>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<environmentVariables>
<AS_JAVA>${java.home}</AS_JAVA>
<JAVA_HOME>${java.home}</JAVA_HOME>
</environmentVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.0.0-M1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<!-- Run with: mvn -Drewrite.exclusions="$PWD/annotations,$PWD/appclient,$PWD/assembly,$PWD/bin,$PWD/common,$PWD/connector,$PWD/core-profile-tck,$PWD/docker,$PWD/docker-images,$PWD/ejb,$PWD/ejb30,$PWD/ejb30-ws,$PWD/ejb32,$PWD/el,$PWD/glassfish-runner,$PWD/glassfishtck,$PWD/install,$PWD/integration,$PWD/internal,$PWD/jacc,$PWD/javaee,$PWD/javamail,$PWD/jaxrs,$PWD/jaxws,$PWD/jaxws-common,$PWD/jdbc,$PWD/jdbc_extras,$PWD/jms,$PWD/jsonb,$PWD/jsonp,$PWD/jsp,$PWD/jstl,$PWD/jta,$PWD/jws,$PWD/jws,$PWD/common,$PWD/lib,$PWD/libutil,$PWD/notes,$PWD/release,$PWD/runtime,$PWD/saaj,$PWD/samples,$PWD/servlet,$PWD/signaturetest,$PWD/sql,$PWD/src,$PWD/user_guides,$PWD/webartifacts,$PWD/webservices12,$PWD/webservices13,$PWD/websocket,$PWD/xa" org.openrewrite.maven:rewrite-maven-plugin:runNoFork 2>&1 | tee /tmp/tck.log
-->
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<version>5.32.1</version>
<configuration>
<activeRecipes>
<recipe>tck.jakarta.platform.rewrite.GenerateNewTestClassRecipe</recipe>
</activeRecipes>
</configuration>
<dependencies>
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>tck-rewrite-tools</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openrewrite</groupId>
<artifactId>rewrite-core</artifactId>
<version>8.24.0</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.openrewrite.recipe</groupId>
<artifactId>rewrite-testing-frameworks</artifactId>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>org.openrewrite.recipe</groupId>
<artifactId>rewrite-github-actions</artifactId>
<version>2.1.7</version>
</dependency>
<dependency>
<groupId>org.openrewrite</groupId>
<artifactId>rewrite-java-17</artifactId>
<version>${version.openrewrite}</version>
</dependency>
<dependency>
<groupId>org.openrewrite</groupId>
<artifactId>rewrite-test</artifactId>
<version>${version.openrewrite}</version>
</dependency>
<dependency>
<groupId>org.openrewrite</groupId>
<artifactId>rewrite-java-test</artifactId>
<version>${version.openrewrite}</version>
</dependency>
</dependencies>
</plugin>

</plugins>
</build>

</project>
0 .../embedded/adapter1/CRDActivationSpec.java → .../embedded/adapter1/CRDActivationSpec.java
View file
Open in desktop
File renamed without changes.
0 ...tor/embedded/adapter1/CRDAdminObject.java → ...tor/embedded/adapter1/CRDAdminObject.java
View file
Open in desktop
File renamed without changes.
0 ...adapter1/CRDManagedConnectionFactory.java → ...adapter1/CRDManagedConnectionFactory.java
View file
Open in desktop
File renamed without changes.
0 ...embedded/adapter1/CRDMessageListener.java → ...embedded/adapter1/CRDMessageListener.java
View file
Open in desktop
File renamed without changes.
0 ...tor/embedded/adapter1/CRDMessageWork.java → ...tor/embedded/adapter1/CRDMessageWork.java
View file
Open in desktop
File renamed without changes.
0 ...dded/adapter1/CRDResourceAdapterImpl.java → ...dded/adapter1/CRDResourceAdapterImpl.java
View file
Open in desktop
File renamed without changes.
0 ...tor/embedded/adapter1/CRDWorkManager.java → ...tor/embedded/adapter1/CRDWorkManager.java
View file
Open in desktop
File renamed without changes.
0 ...ctor/embedded/adapter1/MsgXAResource.java → ...ctor/embedded/adapter1/MsgXAResource.java
View file
Open in desktop
File renamed without changes.
0 ...tor/embedded/adapter1/NestedWorkXid1.java → ...tor/embedded/adapter1/NestedWorkXid1.java
View file
Open in desktop
File renamed without changes.
Loading