Skip to content

Commit

Permalink
100/195 tests passing
Browse files Browse the repository at this point in the history
  • Loading branch information
@alwin-joseph
alwin-joseph committed Sep 18, 2024
1 parent 5e32854 commit 083ea03
Show file tree
Hide file tree
Showing 23 changed files with 65 additions and 233 deletions.
48 changes: 11 additions & 37 deletions glassfish-runner/jta-platform-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<user1>cts1</user1>
<user2>cts1</user2>
<version.jakarta.tck>11.0.0-SNAPSHOT</version.jakarta.tck>
<version.jakarta.tck.arquillian>1.0.0-M13</version.jakarta.tck.arquillian>
<version.jakarta.tck.arquillian>1.0.0-M15</version.jakarta.tck.arquillian>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -115,20 +115,9 @@
<version>${junit.jupiter.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -242,22 +231,7 @@
<artifactId>tck-porting-lib</artifactId>
<version>${version.jakarta.tck.arquillian}</version>
</dependency>

</dependencies>
<!-- <repositories>
<repository>
<id>central</id>
<url>https://repo1.maven.org/maven2</url>
</repository>
<repository>
<id>jboss</id>
<url>https://repository.jboss.org/nexus/content/repositories/releases/</url>
</repository>
<repository>
<id>jakarta-snapshots</id>
<url>https://jakarta.oss.sonatype.org/content/repositories/staging/</url>
</repository>
</repositories> -->

<build>
<plugins>
Expand Down Expand Up @@ -764,19 +738,20 @@
<trimStackTrace>false</trimStackTrace>
</configuration>
<executions>

<execution>
<id>jta-tests-appclient</id>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<additionalClasspathElements>
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/parsson.jar</additionalClasspathElement>
</additionalClasspathElements>
<!-- Select the @Tag("tck-appclient") tests -->
<groups>tck-appclient</groups>
<includes>
<!-- <include>com/sun/ts/tests/jta/ee/transactional/*Ejb*.java</include>
<include>com/sun/ts/tests/jta/ee/txpropagationtest/*Ejb*.java</include>
<include>com/sun/ts/tests/jta/ee/usertransaction/**/*EjbTest*.java</include> -->
</includes>
<dependenciesToScan>jakarta.tck:${tck.artifactId}</dependenciesToScan>
<systemPropertyVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
Expand Down Expand Up @@ -820,10 +795,10 @@
<include>com/sun/ts/tests/jta/ee/transactional/ClientEjbliteservletTest*.java</include>
<include>com/sun/ts/tests/jta/ee/transactional/ClientEjbliteservlet2Test*.java</include>
<include>com/sun/ts/tests/jta/ee/transactional/ClientEjblitejsfTest*.java</include>
<include>com/sun/ts/tests/jta/ee/txpropagationtest/ClientServletTest*.java</include>
<!-- <include>com/sun/ts/tests/jta/ee/txpropagationtest/ClientServletTest*.java</include>
<include>com/sun/ts/tests/jta/ee/txpropagationtest/ClientJspTest*.java</include>
<include>com/sun/ts/tests/jta/ee/usertransaction/**/*JspTest*.java</include>
<include>com/sun/ts/tests/jta/ee/usertransaction/**/*ServletTest*.java</include>
<include>com/sun/ts/tests/jta/ee/usertransaction/**/*ServletTest*.java</include> -->
</includes>
<!-- Select the @Tag("tck-javatest") tests -->
<groups>tck-javatest</groups>
Expand All @@ -849,7 +824,6 @@
</environmentVariables>
</configuration>
</execution>

</executions>
</plugin>
</plugins>
Expand Down
64 changes: 1 addition & 63 deletions jta/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<arquillian.junit>1.9.1.Final</arquillian.junit>
<jakarta.platform.version>11.0.0-M2</jakarta.platform.version>
<junit.jupiter.version>5.10.2</junit.jupiter.version>
<version.jakarta.tck.arquillian>1.0.0-M13</version.jakarta.tck.arquillian>
<version.jakarta.tck.arquillian>1.0.0-M16</version.jakarta.tck.arquillian>
</properties>

<dependencyManagement>
Expand All @@ -48,24 +48,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- <dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.9.1.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency> -->
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -127,7 +109,6 @@
<artifactId>tck-porting-lib</artifactId>
<version>${version.jakarta.tck.arquillian}</version>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
Expand All @@ -146,52 +127,9 @@
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-core</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>

</dependencies>

<repositories>
<repository>
<id>central</id>
<url>https://repo1.maven.org/maven2</url>
</repository>
<repository>
<id>jboss</id>
<url>https://repository.jboss.org/nexus/content/repositories/releases/</url>
</repository>
<repository>
<id>jakarta-snapshots</id>
<url>https://jakarta.oss.sonatype.org/content/repositories/staging/</url>
</repository>
</repositories>

<build>
<!-- Include the container descriptors in the output artifact -->
<!-- <resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources> -->

<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
2 changes: 0 additions & 2 deletions jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjblitejspTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@ public static void main(String[] args) {
@OverProtocol("javatest")
@Deployment(name = VEHICLE_ARCHIVE, order = 2)
public static WebArchive createDeploymentVehicle() {
// public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {

// War
// the war with the correct archive name
WebArchive transactional_ejblitejsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "transactional_ejblitejsp_vehicle_web.war");
Expand Down
17 changes: 10 additions & 7 deletions jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjbliteservlet2Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ public class ClientEjbliteservlet2Test extends EJBLiteClientBase {

private static final Logger logger = System.getLogger(ClientEjbliteservlet2Test.class.getName());


@BeforeEach
void logStartTest(TestInfo testInfo) {
logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
Expand All @@ -68,6 +67,14 @@ public void cleanup() {
logger.log(Logger.Level.INFO, "cleanup ok");
}

/*
* @class.setup_props:
* This is needed by the vehicle base classes
*/
public void setup(String[] args, Properties p) throws Exception {

}

private static StringBuilder callRecords = new StringBuilder();

@Inject
Expand Down Expand Up @@ -95,12 +102,9 @@ public static void main(String[] args) {
@OverProtocol("javatest")
@Deployment(name = VEHICLE_ARCHIVE, order = 2)
public static WebArchive createDeploymentVehicle() {
// public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {

// War
// the war with the correct archive name
WebArchive transactional_ejbliteservlet2_vehicle_web = ShrinkWrap.create(WebArchive.class, "transactional_ejbliteservlet2_vehicle_web.war");
// The class files
transactional_ejbliteservlet2_vehicle_web.addClasses(
com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
Expand All @@ -110,7 +114,6 @@ public static WebArchive createDeploymentVehicle() {
com.sun.ts.tests.ejb30.common.lite.NumberEnum.class,
com.sun.ts.tests.ejb30.common.helper.Helper.class,
com.sun.ts.tests.ejb30.common.lite.EJBLiteClientBase.class,
// com.sun.ts.tests.ejb30.common.lite.EJBLiteJsfClientBase.class,
com.sun.ts.tests.ejb30.common.lite.NumberIF.class,
com.sun.ts.lib.harness.EETest.Fault.class,
com.sun.ts.lib.harness.EETest.class,
Expand All @@ -124,8 +127,8 @@ public static WebArchive createDeploymentVehicle() {
com.sun.ts.tests.jta.ee.transactional.Helper.class,
com.sun.ts.tests.jta.ee.transactional.CTSDontRollbackException.class,
com.sun.ts.tests.jta.ee.transactional.OneManagedBean.class,
EJBLiteServlet2Filter.class,
HttpServletDelegate.class,
com.sun.ts.tests.jta.ee.transactional.EJBLiteServlet2Filter.class,
com.sun.ts.tests.jta.ee.transactional.HttpServletDelegate.class,
ClientEjbliteservlet2Test.class
);
// The web.xml descriptor
Expand Down
7 changes: 2 additions & 5 deletions jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjbliteservletTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ public static void main(String[] args) {
@OverProtocol("javatest")
@Deployment(name = VEHICLE_ARCHIVE, order = 2)
public static WebArchive createDeploymentVehicle() {
// public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {

// War
// the war with the correct archive name
WebArchive transactional_ejbliteservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "transactional_ejbliteservlet_vehicle_web.war");
Expand All @@ -122,8 +120,8 @@ public static WebArchive createDeploymentVehicle() {
com.sun.ts.tests.jta.ee.transactional.Helper.class,
com.sun.ts.tests.jta.ee.transactional.CTSDontRollbackException.class,
com.sun.ts.tests.jta.ee.transactional.OneManagedBean.class,
EJBLiteServletVehicle.class,
HttpServletDelegate.class,
com.sun.ts.tests.jta.ee.transactional.EJBLiteServletVehicle.class,
com.sun.ts.tests.jta.ee.transactional.HttpServletDelegate.class,
ClientEjbliteservletTest.class
);
// The web.xml descriptor
Expand All @@ -137,7 +135,6 @@ public static WebArchive createDeploymentVehicle() {
transactional_ejbliteservlet_vehicle_web.addAsWebInfResource(warResURL, "beans.xml");
}


return transactional_ejbliteservlet_vehicle_web;
}

Expand Down
38 changes: 8 additions & 30 deletions jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientJspTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,20 +81,17 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
// The class files
begin_jsp_vehicle_web.addClasses(
com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
com.sun.ts.lib.harness.EETest.Fault.class,
com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
com.sun.ts.tests.common.vehicle.VehicleClient.class,
com.sun.ts.tests.jta.ee.usertransaction.begin.UserBeginClient.class,
com.sun.ts.tests.jta.ee.common.Transact.class,
com.sun.ts.tests.jta.ee.common.InvalidStatusException.class,
com.sun.ts.tests.jta.ee.common.InitFailedException.class,
com.sun.ts.tests.jta.ee.common.TransactionStatus.class,
com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
com.sun.ts.tests.jta.ee.common.InvalidStatusException.class,
com.sun.ts.tests.jta.ee.common.InitFailedException.class,
com.sun.ts.lib.harness.EETest.Fault.class,
com.sun.ts.lib.harness.EETest.class,
com.sun.ts.lib.harness.ServiceEETest.class,
com.sun.ts.tests.jta.ee.common.TransactionStatus.class,
com.sun.ts.lib.harness.EETest.SetupException.class,
com.sun.ts.tests.common.vehicle.VehicleClient.class,
UserBeginClientJspTest.class
);
// The web.xml descriptor
Expand All @@ -109,36 +106,17 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
begin_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");

// The sun-web.xml descriptor
warResURL = UserBeginClientJspTest.class.getClassLoader().getResource(packagePath+"/begin_jsp_vehicle_web.war.sun-web.xml");
if(warResURL != null) {
begin_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
}
// warResURL = UserBeginClientJspTest.class.getClassLoader().getResource(packagePath+"/begin_jsp_vehicle_web.war.sun-web.xml");
// if(warResURL != null) {
// begin_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
// }


archiveProcessor.processWebArchive(begin_jsp_vehicle_web, UserBeginClientJspTest.class, warResURL);
// archiveProcessor.processWebArchive(begin_jsp_vehicle_web, UserBeginClientJspTest.class, warResURL);

// Ear
EnterpriseArchive begin_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "begin_jsp_vehicle.ear");

// Any libraries added to the ear

// The component jars built by the package target
begin_jsp_vehicle_ear.addAsModule(begin_jsp_vehicle_web);



// // The application.xml descriptor
// URL earResURL = UserBeginClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/begin/");
// if(earResURL != null) {
// begin_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml");
// }
// // The sun-application.xml descriptor
// earResURL = UserBeginClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/begin/.ear.sun-application.xml");
// if(earResURL != null) {
// begin_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
// }
// archiveProcessor.processEarArchive(begin_jsp_vehicle_ear, UserBeginClient.class, earResURL);

return begin_jsp_vehicle_ear;
}

Expand Down
Loading

0 comments on commit 083ea03

Please sign in to comment.