Skip to content

Commit

Permalink
Merge branch 'main' into jakarta.tck.arquillian
Browse files Browse the repository at this point in the history
  • Loading branch information
@scottmarlow
scottmarlow authored Oct 7, 2024
2 parents 9a0d024 + cd4e9bd commit 629e1ad
Show file tree
Hide file tree
Showing 367 changed files with 3,650 additions and 549 deletions.
3 changes: 1 addition & 2 deletions glassfish-runner/jpa-platform-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,6 @@
<phase>process-resources</phase>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
<workingDirectory>${derby.basedir}</workingDirectory>
<arguments>
<argument>start-database</argument>
</arguments>
Expand Down Expand Up @@ -569,7 +568,7 @@
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/glassfish-naming.jar</additionalClasspathElement>
</additionalClasspathElements>
<includes>
<!-- <include>ee/jakarta/tck/persistence/**/*Test.java</include> -->
<include>ee/jakarta/tck/persistence/**/*Test.java</include>
</includes>
<!-- Select the @Tag("tck-javatest") tests -->
<groups>tck-javatest</groups>
Expand Down
3 changes: 3 additions & 0 deletions ...tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagedTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
ee.jakarta.tck.persistence.common.PMClientBase.class,
ee.jakarta.tck.persistence.core.EntityGraph.Client.class,
ee.jakarta.tck.persistence.core.EntityGraph.ClientAppmanagedTest.class,
com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class,
com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class,
Expand All @@ -83,6 +84,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class,
com.sun.ts.lib.harness.EETest.SetupException.class,
com.sun.ts.tests.common.vehicle.VehicleClient.class,
ee.jakarta.tck.persistence.core.EntityGraph.Employee3.class,
ee.jakarta.tck.persistence.core.EntityGraph.Department.class,
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class
);
// The application-client.xml descriptor
Expand Down
5 changes: 3 additions & 2 deletions ...s/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagednotxTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.junit.jupiter.api.extension.ExtendWith;
import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
import tck.arquillian.protocol.common.TargetVehicle;

import com.sun.ts.lib.harness.Status;


@ExtendWith(ArquillianExtension.class)
Expand Down Expand Up @@ -98,7 +98,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
ee.jakarta.tck.persistence.core.EntityGraph.Client.class,
ee.jakarta.tck.persistence.core.EntityGraph.Employee3.class,
ee.jakarta.tck.persistence.core.EntityGraph.Department.class,
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
ClientAppmanagednotxTest.class
);
// The application-client.xml descriptor
URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml");
Expand Down
24 changes: 22 additions & 2 deletions ...-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateful3Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
import org.junit.jupiter.api.extension.ExtendWith;
import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
import tck.arquillian.protocol.common.TargetVehicle;

import com.sun.ts.lib.harness.Status;
import java.util.Properties;


@ExtendWith(ArquillianExtension.class)
Expand All @@ -33,6 +34,21 @@
public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.EntityGraph.Client {
static final String VEHICLE_ARCHIVE = "jpa_core_EntityGraph_stateful3_vehicle";

public static void main(String[] args) {
ClientStateful3Test theTests = new ClientStateful3Test();
Status s = theTests.run(args, System.out, System.err);
s.exit();
}

public void setup(String[] args, Properties p) throws Fault {
try {
super.setup(args, p);
} catch (Exception e) {
logErr("Exception: ", e);
throw new Fault("Setup failed:", e);
}
}

/**
EE10 Deployment Descriptors:
jpa_core_EntityGraph: META-INF/persistence.xml
Expand Down Expand Up @@ -82,7 +98,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class,
com.sun.ts.lib.harness.EETest.SetupException.class,
com.sun.ts.tests.common.vehicle.VehicleClient.class,
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
ee.jakarta.tck.persistence.core.EntityGraph.Employee3.class,
ee.jakarta.tck.persistence.core.EntityGraph.Department.class,
ee.jakarta.tck.persistence.core.EntityGraph.Client.class,
ClientStateful3Test.class
);
// The application-client.xml descriptor
URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml");
Expand Down
15 changes: 13 additions & 2 deletions ...tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateless3Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
import org.junit.jupiter.api.extension.ExtendWith;
import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
import tck.arquillian.protocol.common.TargetVehicle;

import com.sun.ts.lib.harness.Status;
import java.util.Properties;


@ExtendWith(ArquillianExtension.class)
Expand All @@ -33,6 +34,12 @@
public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.EntityGraph.Client {
static final String VEHICLE_ARCHIVE = "jpa_core_EntityGraph_stateless3_vehicle";

public static void main(String[] args) {
ClientStateless3Test theTests = new ClientStateless3Test();
Status s = theTests.run(args, System.out, System.err);
s.exit();
}

/**
EE10 Deployment Descriptors:
jpa_core_EntityGraph: META-INF/persistence.xml
Expand Down Expand Up @@ -82,7 +89,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class,
com.sun.ts.lib.harness.EETest.SetupException.class,
com.sun.ts.tests.common.vehicle.VehicleClient.class,
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
ee.jakarta.tck.persistence.core.EntityGraph.Employee3.class,
ee.jakarta.tck.persistence.core.EntityGraph.Department.class,
ee.jakarta.tck.persistence.core.EntityGraph.Client.class,
ClientStateless3Test.class
);
// The application-client.xml descriptor
URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml");
Expand Down
21 changes: 18 additions & 3 deletions ...main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagedTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
import org.junit.jupiter.api.extension.ExtendWith;
import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
import tck.arquillian.protocol.common.TargetVehicle;

import com.sun.ts.lib.harness.Status;
import java.util.Properties;


@ExtendWith(ArquillianExtension.class)
Expand All @@ -33,6 +34,16 @@
public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1 {
static final String VEHICLE_ARCHIVE = "jpa_core_StoredProcedureQuery_appmanaged_vehicle";

public static void main(String[] args) {
Client1AppmanagedTest theTests = new Client1AppmanagedTest();
Status s = theTests.run(args, System.out, System.err);
s.exit();
}

public void setup(String[] args, Properties p) throws Exception {
super.setup(args, p);
}

/**
EE10 Deployment Descriptors:
jpa_core_StoredProcedureQuery: myMappingFile.xml,META-INF/persistence.xml
Expand Down Expand Up @@ -83,7 +94,10 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
com.sun.ts.lib.harness.EETest.SetupException.class,
com.sun.ts.tests.common.vehicle.VehicleClient.class,
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class,
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class,
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class,
Client1AppmanagedTest.class
);
// The application-client.xml descriptor
URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml");
Expand Down Expand Up @@ -122,7 +136,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
com.sun.ts.lib.harness.EETest.SetupException.class,
com.sun.ts.tests.common.vehicle.VehicleClient.class,
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class,
Client1AppmanagedTest.class
);
// The ejb-jar.xml descriptor
URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml");
Expand Down
21 changes: 18 additions & 3 deletions .../java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagednotxTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
import org.junit.jupiter.api.extension.ExtendWith;
import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
import tck.arquillian.protocol.common.TargetVehicle;

import com.sun.ts.lib.harness.Status;
import java.util.Properties;


@ExtendWith(ArquillianExtension.class)
Expand All @@ -33,6 +34,16 @@
public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1 {
static final String VEHICLE_ARCHIVE = "jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle";

public static void main(String[] args) {
Client1AppmanagednotxTest theTests = new Client1AppmanagednotxTest();
Status s = theTests.run(args, System.out, System.err);
s.exit();
}

public void setup(String[] args, Properties p) throws Exception {
super.setup(args, p);
}

/**
EE10 Deployment Descriptors:
jpa_core_StoredProcedureQuery: myMappingFile.xml,META-INF/persistence.xml
Expand Down Expand Up @@ -83,7 +94,10 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
com.sun.ts.lib.harness.EETest.SetupException.class,
com.sun.ts.tests.common.vehicle.VehicleClient.class,
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class,
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class,
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class,
Client1AppmanagednotxTest.class
);
// The application-client.xml descriptor
URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml");
Expand Down Expand Up @@ -122,7 +136,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
com.sun.ts.tests.common.vehicle.VehicleClient.class,
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class,
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class,
Client1AppmanagednotxTest.class
);
// The ejb-jar.xml descriptor
URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml");
Expand Down
22 changes: 19 additions & 3 deletions .../main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateful3Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
import org.junit.jupiter.api.extension.ExtendWith;
import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
import tck.arquillian.protocol.common.TargetVehicle;

import com.sun.ts.lib.harness.Status;
import java.util.Properties;


@ExtendWith(ArquillianExtension.class)
Expand All @@ -33,6 +34,17 @@
public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1 {
static final String VEHICLE_ARCHIVE = "jpa_core_StoredProcedureQuery_stateful3_vehicle";

public static void main(String[] args) {
Client1Stateful3Test theTests = new Client1Stateful3Test();
Status s = theTests.run(args, System.out, System.err);
s.exit();
}

public void setup(String[] args, Properties p) throws Exception {
super.setup(args, p);
}


/**
EE10 Deployment Descriptors:
jpa_core_StoredProcedureQuery: myMappingFile.xml,META-INF/persistence.xml
Expand Down Expand Up @@ -83,7 +95,10 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
com.sun.ts.lib.harness.EETest.SetupException.class,
com.sun.ts.tests.common.vehicle.VehicleClient.class,
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class,
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class,
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class,
Client1Stateful3Test.class
);
// The application-client.xml descriptor
URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml");
Expand Down Expand Up @@ -122,7 +137,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
com.sun.ts.lib.harness.EETest.SetupException.class,
com.sun.ts.tests.common.vehicle.VehicleClient.class,
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class,
Client1Stateful3Test.class
);
// The ejb-jar.xml descriptor
URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml");
Expand Down
21 changes: 18 additions & 3 deletions ...main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateless3Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
import org.junit.jupiter.api.extension.ExtendWith;
import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
import tck.arquillian.protocol.common.TargetVehicle;

import com.sun.ts.lib.harness.Status;
import java.util.Properties;


@ExtendWith(ArquillianExtension.class)
Expand All @@ -33,6 +34,16 @@
public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1 {
static final String VEHICLE_ARCHIVE = "jpa_core_StoredProcedureQuery_stateless3_vehicle";

public static void main(String[] args) {
Client1Stateless3Test theTests = new Client1Stateless3Test();
Status s = theTests.run(args, System.out, System.err);
s.exit();
}

public void setup(String[] args, Properties p) throws Exception {
super.setup(args, p);
}

/**
EE10 Deployment Descriptors:
jpa_core_StoredProcedureQuery: myMappingFile.xml,META-INF/persistence.xml
Expand Down Expand Up @@ -83,7 +94,10 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
com.sun.ts.lib.harness.EETest.SetupException.class,
com.sun.ts.tests.common.vehicle.VehicleClient.class,
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class,
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class,
Client1Stateless3Test.class,
Client1Stateless3Test.class
);
// The application-client.xml descriptor
URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml");
Expand Down Expand Up @@ -122,7 +136,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
com.sun.ts.lib.harness.EETest.SetupException.class,
com.sun.ts.tests.common.vehicle.VehicleClient.class,
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class,
Client1Stateless3Test.class
);
// The ejb-jar.xml descriptor
URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml");
Expand Down
19 changes: 16 additions & 3 deletions ...main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagedTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
import org.junit.jupiter.api.extension.ExtendWith;
import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
import tck.arquillian.protocol.common.TargetVehicle;

import com.sun.ts.lib.harness.Status;
import java.util.Properties;


@ExtendWith(ArquillianExtension.class)
Expand All @@ -33,6 +34,16 @@
public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client2 {
static final String VEHICLE_ARCHIVE = "jpa_core_StoredProcedureQuery_appmanaged_vehicle";

public static void main(String[] args) {
Client2AppmanagedTest theTests = new Client2AppmanagedTest();
Status s = theTests.run(args, System.out, System.err);
s.exit();
}

public void setup(String[] args, Properties p) throws Exception {
super.setup(args, p);
}

/**
EE10 Deployment Descriptors:
jpa_core_StoredProcedureQuery: myMappingFile.xml,META-INF/persistence.xml
Expand Down Expand Up @@ -83,7 +94,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
com.sun.ts.lib.harness.EETest.SetupException.class,
com.sun.ts.tests.common.vehicle.VehicleClient.class,
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class,
Client2AppmanagedTest.class
);
// The application-client.xml descriptor
URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml");
Expand Down Expand Up @@ -122,7 +134,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
com.sun.ts.lib.harness.EETest.SetupException.class,
com.sun.ts.tests.common.vehicle.VehicleClient.class,
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class,
Client2AppmanagedTest.class
);
// The ejb-jar.xml descriptor
URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml");
Expand Down
Loading

0 comments on commit 629e1ad

Please sign in to comment.