diff --git a/glassfish-runner/persistence-platform-tck/pom.xml b/glassfish-runner/persistence-platform-tck/pom.xml index 701dd4435c..3a6f57c13f 100644 --- a/glassfish-runner/persistence-platform-tck/pom.xml +++ b/glassfish-runner/persistence-platform-tck/pom.xml @@ -32,20 +32,11 @@ ${project.build.directory}/${glassfish.toplevel.dir} ${glassfish.home}/glassfish/lib - + glassfish8 8.0.0-JDK17-M9 - org.apache.derby.jdbc.ClientDriver - cts1 - jdbc:derby://localhost:1527/derbyDB;create=true - cts1 - org.eclipse.persistence.jpa.PersistenceProvider 11.0.0-M2 - ${glassfish.home}/javadb/lib - ${project.build.directory}/${glassfish.toplevel.dir}/javadb/lib/derbyclient.jar:${project.build.directory}/${glassfish.toplevel.dir}/javadb/lib/derbyshared.jar:${project.build.directory}/${glassfish.toplevel.dir}/javadb/lib/derbytools.jar - ${javadb.lib}/derbyclient.jar:${javadb.lib}/derbyshared.jar:${javadb.lib}/derbytools.jar - jdbc:derby://localhost:1527/derbyDB;create=true 5.11.3 persistence-platform-tck-tests @@ -277,6 +268,20 @@ + + + ${project.build.directory}/sql + true + ${project.basedir}/sql/derby + + *.sql + + + + src/main/resources + + + org.apache.maven.plugins @@ -384,90 +389,6 @@ - - org.codehaus.mojo - exec-maven-plugin - - - start-database - - exec - - pre-integration-test - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - start-database - - - - - - stop-database-final - - exec - - post-integration-test - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - stop-database - - - 0 - 1 - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - initdb - - run - - pre-integration-test - - - - - - - - - - - - - install_java_procedures - - run - - pre-integration-test - - - - - - - CALL sqlj.remove_jar('APP.dbprocedures', 0); - CALL sqlj.install_jar('${project.build.directory}/dbprocedures.jar', 'APP.dbprocedures', 0); - CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.database.classpath', 'APP.dbprocedures'); - - - - - - - maven-failsafe-plugin 3.5.0 @@ -476,19 +397,19 @@ jakarta.tck:persistence-platform-tck-tests - + ${basedir}/sql/derby/password.txt ${project.build.directory}/${glassfish.toplevel.dir} set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true create-file-user --groups guest --passwordfile ${project.basedir}/javajoe.pass javajoe create-file-user --groups staff:mgr --passwordfile ${project.basedir}/j2ee.pass j2ee - create-jdbc-connection-pool --restype javax.sql.DataSource --datasourceclassname org.apache.derby.jdbc.ClientDataSource --property DatabaseName=derbyDB:serverName=localhost:PortNumber=1527:User=cts1:Password=cts1 --steadypoolsize 32 --maxpoolsize 64 cts-derby-pool + create-jdbc-connection-pool --restype javax.sql.DataSource --datasourceclassname org.apache.derby.jdbc.ClientDataSource --property DatabaseName=${glassfish.home}/glassfish/domains/domain1/config/derbyDB:serverName=localhost:portNumber=1527:user=cts1:password=cts1 --steadypoolsize 32 --maxpoolsize 64 cts-derby-pool + create-jdbc-connection-pool --restype javax.sql.DataSource --datasourceclassname org.apache.derby.jdbc.ClientDataSource --property DatabaseName=${glassfish.home}/glassfish/domains/domain1/config/derbyDB:serverName=localhost:PortNumber=1527:User=cts1:Password=cts1 --steadypoolsize 32 --maxpoolsize 64 cts-derby-pool_no_tx create-jdbc-resource --connectionpoolid cts-derby-pool jdbc/DB1 - create-jdbc-connection-pool --restype javax.sql.DataSource --datasourceclassname org.apache.derby.jdbc.ClientDataSource --property DatabaseName=derbyDB:serverName=localhost:PortNumber=1527:User=cts1:Password=cts1 --steadypoolsize 32 --maxpoolsize 64 cts-derby-pool_no_tx create-jdbc-resource --connectionpoolid cts-derby-pool_no_tx jdbc/DB_no_tx list-jdbc-connection-pools list-jdbc-resources @@ -501,6 +422,7 @@ + - tck-appclient @@ -520,6 +440,7 @@ + --> jpa-tests-cdi @@ -546,11 +467,8 @@ - - ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1PmservletTest.java - + ee/jakarta/tck/persistence/**/*Test.java - tck-javatest @@ -601,5 +519,37 @@ web + + appclient + + + + + maven-failsafe-plugin + 3.5.0 + + + + jpa-tests-appclient + + integration-test + verify + + + + ee/jakarta/tck/persistence/**/*Test.java + + tck-appclient + + + appclient-arquillian.xml + + + + + + + + diff --git a/glassfish-runner/persistence-platform-tck/sql/derby/derby.ddl.sql b/glassfish-runner/persistence-platform-tck/sql/derby/derby.ddl.sql index b27b5a1490..0fc914bbdd 100644 --- a/glassfish-runner/persistence-platform-tck/sql/derby/derby.ddl.sql +++ b/glassfish-runner/persistence-platform-tck/sql/derby/derby.ddl.sql @@ -1,3 +1,31 @@ +DROP PROCEDURE GetEmpOneFirstNameFromOut; +CREATE PROCEDURE GetEmpOneFirstNameFromOut (out OUT_PARAM VARCHAR(255)) language java external name 'ee.jakarta.tck.persistence.storedprocedures.CS_Procs.GetEmpOneFirstNameFromOut' parameter style java; + +DROP PROCEDURE GetEmpFirstNameFromOut; +CREATE PROCEDURE GetEmpFirstNameFromOut (in IN_PARAM INTEGER, out OUT_PARAM VARCHAR(255)) language java external name 'ee.jakarta.tck.persistence.storedprocedures.CS_Procs.GetEmpFirstNameFromOut' parameter style java; + +DROP PROCEDURE GetEmpLastNameFromInOut; +CREATE PROCEDURE GetEmpLastNameFromInOut (inout INOUT_PARAM VARCHAR(255)) language java external name 'ee.jakarta.tck.persistence.storedprocedures.CS_Procs.GetEmpLastNameFromInOut' parameter style java; + +DROP PROCEDURE GetEmpASCFromRS; +CREATE PROCEDURE GetEmpASCFromRS() language java dynamic result sets 1 external name 'ee.jakarta.tck.persistence.storedprocedures.CS_Procs.GetEmpASCFromRS' parameter style java; + +DROP PROCEDURE GetEmpIdFNameLNameFromRS; +CREATE PROCEDURE GetEmpIdFNameLNameFromRS (in IN_PARAM INTEGER) language java dynamic result sets 1 external name 'ee.jakarta.tck.persistence.storedprocedures.CS_Procs.GetEmpIdFNameLNameFromRS' parameter style java; + +DROP PROCEDURE GetEmpIdUsingHireDateFromOut; +CREATE PROCEDURE GetEmpIdUsingHireDateFromOut (in IN_PARAM DATE, out OUT_PARAM INTEGER) language java external name 'ee.jakarta.tck.persistence.storedprocedures.CS_Procs.GetEmpIdUsingHireDateFromOut' parameter style java; + +DROP PROCEDURE UpdateEmpSalaryColumn; +CREATE PROCEDURE UpdateEmpSalaryColumn() language java external name 'ee.jakarta.tck.persistence.storedprocedures.CS_Procs.UpdateEmpSalaryColumn' parameter style java; + +DROP PROCEDURE DeleteAllEmp; +CREATE PROCEDURE DeleteAllEmp() language java external name 'ee.jakarta.tck.persistence.storedprocedures.CS_Procs.DeleteAllEmp' parameter style java; + +DROP FUNCTION REPLACE; +CREATE FUNCTION REPLACE (origin_string VARCHAR(255), old_string VARCHAR(255), new_string VARCHAR(255)) RETURNS VARCHAR(255) language java external name 'ee.jakarta.tck.persistence.storedprocedures.CS_Procs.ReplaceString' parameter style java; + + ALTER TABLE PHONE_TABLE DROP CONSTRAINT FK_FOR_ADDRESS ; ALTER TABLE CUSTOMER_TABLE DROP CONSTRAINT FK5_FOR_CUST ; ALTER TABLE CUSTOMER_TABLE DROP CONSTRAINT FK6_FOR_CUST ; @@ -943,3 +971,6 @@ CREATE TABLE CRITERIA_TEST_COLTABLE(ENT_ID INTEGER NOT NULL, COLVAL VARCHAR(255) DROP TABLE UUIDTYPE; CREATE TABLE UUIDTYPE (ID char(16) for bit data NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID)); + +CALL sqlj.install_jar('${project.build.directory}/dbprocedures.jar', 'APP.dbprocedures', 0); +CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.database.classpath', 'APP.dbprocedures'); diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPmservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPmservletTest.java index e1889bc592..d0339c195d 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPmservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPmservletTest.java @@ -1,17 +1,28 @@ package ee.jakarta.tck.persistence.core.entityManagerFactoryCloseExceptions; -import ee.jakarta.tck.persistence.core.entityManagerFactoryCloseExceptions.Client; +import com.sun.ts.lib.harness.EETest; +import com.sun.ts.lib.harness.ServiceEETest; +import com.sun.ts.tests.common.vehicle.VehicleClient; +import com.sun.ts.tests.common.vehicle.VehicleRunnable; +import com.sun.ts.tests.common.vehicle.VehicleRunnerFactory; +import com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean; +import com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF; +import com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper; +import com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper; +import com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager; +import com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory; +import com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper; +import com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle; +import com.sun.ts.tests.common.vehicle.servlet.ServletVehicle; + import java.net.URL; + import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.container.test.api.OverProtocol; import org.jboss.arquillian.container.test.api.TargetsContainer; import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.exporter.ZipExporter; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -19,19 +30,20 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; + +import ee.jakarta.tck.persistence.common.PMClientBase; import tck.arquillian.porting.lib.spi.TestArchiveProcessor; import tck.arquillian.protocol.common.TargetVehicle; - - @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") @Tag("web") @Tag("tck-javatest") - @TestMethodOrder(MethodOrderer.MethodName.class) -public class ClientPmservletTest extends ee.jakarta.tck.persistence.core.entityManagerFactoryCloseExceptions.Client { +public class ClientPmservletTest extends Client { + + private static final long serialVersionUID = 1L; static final String VEHICLE_ARCHIVE = "jpa_core_entityManagerFactoryCloseException_pmservlet_vehicle"; /** @@ -101,13 +113,13 @@ public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchive return jpa_core_entityManagerFactoryCloseException_pmservlet_vehicle_web; } + } - @Test - @Override - @TargetVehicle("pmservlet") - public void exceptionsTest() throws java.lang.Exception { - super.exceptionsTest(); - } - + @Test + @Override + @TargetVehicle("pmservlet") + public void exceptionsTest() throws java.lang.Exception { + super.exceptionsTest(); + } } diff --git a/tcks/apis/persistence/persistence-inside-container/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/persistence.xml b/tcks/apis/persistence/persistence-inside-container/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/persistence.xml new file mode 100644 index 0000000000..784786a985 --- /dev/null +++ b/tcks/apis/persistence/persistence-inside-container/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/persistence.xml @@ -0,0 +1,44 @@ + + + + + + + Persistence Unit for CTS Vehicle Tests + jdbc/DB1 + + + + Persistence Unit for CTS Vehicle Tests + jdbc/DB1 + + + + + The persistence.xml file may be used to designate more than one persistence + unit within the same scope. + + Persistence Unit for Application Managed Resource Local + jdbc/DB_no_tx + + \ No newline at end of file