From a14776b6c7a610c20d3a6725ee06b6d6e2764acc Mon Sep 17 00:00:00 2001 From: Scott Marlow Date: Wed, 19 Jun 2024 14:57:26 -0400 Subject: [PATCH 1/2] excludes for https://github.com/jakartaee/persistence/issues/632 Derived identity TCK tests rely on unspecified cascading behavior and increment the JPA TCK version Signed-off-by: Scott Marlow --- install/jakartaee/bin/ts.jtx | 38 ++++++++++++++++++++++++++++++++++++ install/jpa/bin/ts.jtx | 9 +++++++++ release/tools/jpa.xml | 2 +- 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/install/jakartaee/bin/ts.jtx b/install/jakartaee/bin/ts.jtx index 6ded0d796f..33a5e02f69 100644 --- a/install/jakartaee/bin/ts.jtx +++ b/install/jakartaee/bin/ts.jtx @@ -86,6 +86,44 @@ com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client.java#fetchTest_from_ com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client.java#fetchTest_from_stateful3 com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client.java#fetchTest_from_stateless3 +# https://github.com/jakartaee/persistence/issues/632 Derived identity TCK tests rely on unspecified cascading behavior +com/sun/ts/tests/jpa/core/derivedid/ex1a/Client.java#DIDTest_from_appmanaged +com/sun/ts/tests/jpa/core/derivedid/ex1a/Client.java#DIDTest_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/derivedid/ex1a/Client.java#DIDTest_from_pmservlet +com/sun/ts/tests/jpa/core/derivedid/ex1a/Client.java#DIDTest_from_puservlet +com/sun/ts/tests/jpa/core/derivedid/ex1a/Client.java#DIDTest_from_stateful3 +com/sun/ts/tests/jpa/core/derivedid/ex1a/Client.java#DIDTest_from_stateless3 +com/sun/ts/tests/jpa/core/derivedid/ex1b/Client.java#DIDTest_from_appmanaged +com/sun/ts/tests/jpa/core/derivedid/ex1b/Client.java#DIDTest_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/derivedid/ex1b/Client.java#DIDTest_from_pmservlet +com/sun/ts/tests/jpa/core/derivedid/ex1b/Client.java#DIDTest_from_puservlet +com/sun/ts/tests/jpa/core/derivedid/ex1b/Client.java#DIDTest_from_stateful3 +com/sun/ts/tests/jpa/core/derivedid/ex1b/Client.java#DIDTest_from_stateless3 +com/sun/ts/tests/jpa/core/derivedid/ex2b/Client.java#DIDTest_from_appmanaged +com/sun/ts/tests/jpa/core/derivedid/ex2b/Client.java#DIDTest_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/derivedid/ex2b/Client.java#DIDTest_from_pmservlet +com/sun/ts/tests/jpa/core/derivedid/ex2b/Client.java#DIDTest_from_puservlet +com/sun/ts/tests/jpa/core/derivedid/ex2b/Client.java#DIDTest_from_stateful3 +com/sun/ts/tests/jpa/core/derivedid/ex2b/Client.java#DIDTest_from_stateless3 +com/sun/ts/tests/jpa/core/derivedid/ex3a/Client.java#DIDTest_from_appmanaged +com/sun/ts/tests/jpa/core/derivedid/ex3a/Client.java#DIDTest_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/derivedid/ex3a/Client.java#DIDTest_from_pmservlet +com/sun/ts/tests/jpa/core/derivedid/ex3a/Client.java#DIDTest_from_puservlet +com/sun/ts/tests/jpa/core/derivedid/ex3a/Client.java#DIDTest_from_stateful3 +com/sun/ts/tests/jpa/core/derivedid/ex3a/Client.java#DIDTest_from_stateless3 +com/sun/ts/tests/jpa/core/derivedid/ex3b/Client.java#DIDTest_from_appmanaged +com/sun/ts/tests/jpa/core/derivedid/ex3b/Client.java#DIDTest_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/derivedid/ex3b/Client.java#DIDTest_from_pmservlet +com/sun/ts/tests/jpa/core/derivedid/ex3b/Client.java#DIDTest_from_puservlet +com/sun/ts/tests/jpa/core/derivedid/ex3b/Client.java#DIDTest_from_stateful3 +com/sun/ts/tests/jpa/core/derivedid/ex3b/Client.java#DIDTest_from_stateless3 +com/sun/ts/tests/jpa/core/annotations/mapsid/Client.java#persistMX1Test1_from_appmanaged +com/sun/ts/tests/jpa/core/annotations/mapsid/Client.java#persistMX1Test1_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/annotations/mapsid/Client.java#persistMX1Test1_from_pmservlet +com/sun/ts/tests/jpa/core/annotations/mapsid/Client.java#persistMX1Test1_from_puservlet +com/sun/ts/tests/jpa/core/annotations/mapsid/Client.java#persistMX1Test1_from_stateful3 +com/sun/ts/tests/jpa/core/annotations/mapsid/Client.java#persistMX1Test1_from_stateless3 + ################ # Security API ################ diff --git a/install/jpa/bin/ts.jtx b/install/jpa/bin/ts.jtx index 0ebf7f95e2..5e6395b8d9 100644 --- a/install/jpa/bin/ts.jtx +++ b/install/jpa/bin/ts.jtx @@ -41,3 +41,12 @@ com/sun/ts/tests/jpa/se/entityManager/Client.java#typedQueryMethodsAfterClose16T # https://github.com/jakartaee/persistence/issues/591 Multiple fetch joins for same attribute com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client.java#fetchTest_from_standalone + +# https://github.com/jakartaee/persistence/issues/632 Derived identity TCK tests rely on unspecified cascading behavior +com/sun/ts/tests/jpa/core/derivedid/ex1a/Client.java#DIDTest_from_standalone +com/sun/ts/tests/jpa/core/derivedid/ex1b/Client.java#DIDTest_from_standalone +com/sun/ts/tests/jpa/core/derivedid/ex2b/Client.java#DIDTest_from_standalone +com/sun/ts/tests/jpa/core/derivedid/ex3a/Client.java#DIDTest_from_standalone +com/sun/ts/tests/jpa/core/derivedid/ex3b/Client.java#DIDTest_from_standalone +com/sun/ts/tests/jpa/core/annotations/mapsid/Client.java#persistMX1Test1_from_standalone + diff --git a/release/tools/jpa.xml b/release/tools/jpa.xml index 5f3125b794..a360a41d0f 100644 --- a/release/tools/jpa.xml +++ b/release/tools/jpa.xml @@ -22,7 +22,7 @@ - + From 140f7e4d422d36e46510152a911423a979105eb3 Mon Sep 17 00:00:00 2001 From: Scott Marlow Date: Wed, 19 Jun 2024 15:05:15 -0400 Subject: [PATCH 2/2] excludes for https://github.com/jakartaee/persistence/issues/637 TCK should not set version on entity manually Signed-off-by: Scott Marlow --- install/jakartaee/bin/ts.jtx | 87 ++++++++++++++++++++++++++++++++++++ install/jpa/bin/ts.jtx | 16 +++++++ 2 files changed, 103 insertions(+) diff --git a/install/jakartaee/bin/ts.jtx b/install/jakartaee/bin/ts.jtx index 33a5e02f69..7dc0f1073a 100644 --- a/install/jakartaee/bin/ts.jtx +++ b/install/jakartaee/bin/ts.jtx @@ -124,6 +124,93 @@ com/sun/ts/tests/jpa/core/annotations/mapsid/Client.java#persistMX1Test1_from_pu com/sun/ts/tests/jpa/core/annotations/mapsid/Client.java#persistMX1Test1_from_stateful3 com/sun/ts/tests/jpa/core/annotations/mapsid/Client.java#persistMX1Test1_from_stateless3 +# https://github.com/jakartaee/persistence/issues/637 TCK should not set version on entity manually +com/sun/ts/tests/jpa/core/annotations/version/Client.java#intFieldTest_from_appmanaged +com/sun/ts/tests/jpa/core/annotations/version/Client.java#intFieldTest_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/annotations/version/Client.java#intFieldTest_from_pmservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#intFieldTest_from_puservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#intFieldTest_from_stateful3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#intFieldTest_from_stateless3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#intPropertyTest_from_appmanaged +com/sun/ts/tests/jpa/core/annotations/version/Client.java#intPropertyTest_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/annotations/version/Client.java#intPropertyTest_from_pmservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#intPropertyTest_from_puservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#intPropertyTest_from_stateful3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#intPropertyTest_from_stateless3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerFieldTest_from_appmanaged +com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerFieldTest_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerFieldTest_from_pmservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerFieldTest_from_puservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerFieldTest_from_stateful3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerFieldTest_from_stateless3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerPropertyTest_from_appmanaged +com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerPropertyTest_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerPropertyTest_from_pmservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerPropertyTest_from_puservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerPropertyTest_from_stateful3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerPropertyTest_from_stateless3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassFieldTest_from_appmanaged +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassFieldTest_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassFieldTest_from_pmservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassFieldTest_from_puservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassFieldTest_from_stateful3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassFieldTest_from_stateless3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassPropertyTest_from_appmanaged +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassPropertyTest_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassPropertyTest_from_pmservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassPropertyTest_from_puservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassPropertyTest_from_stateful3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassPropertyTest_from_stateless3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longFieldTest_from_appmanaged +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longFieldTest_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longFieldTest_from_pmservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longFieldTest_from_puservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longFieldTest_from_stateful3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longFieldTest_from_stateless3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longPropertyTest_from_appmanaged +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longPropertyTest_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longPropertyTest_from_pmservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longPropertyTest_from_puservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longPropertyTest_from_stateful3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longPropertyTest_from_stateless3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassFieldTest_from_appmanaged +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassFieldTest_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassFieldTest_from_pmservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassFieldTest_from_puservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassFieldTest_from_stateful3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassFieldTest_from_stateless3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassPropertyTest_from_appmanaged +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassPropertyTest_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassPropertyTest_from_pmservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassPropertyTest_from_puservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassPropertyTest_from_stateful3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassPropertyTest_from_stateless3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortFieldTest_from_appmanaged +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortFieldTest_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortFieldTest_from_pmservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortFieldTest_from_puservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortFieldTest_from_stateful3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortFieldTest_from_stateless3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortPropertyTest_from_appmanaged +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortPropertyTest_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortPropertyTest_from_pmservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortPropertyTest_from_puservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortPropertyTest_from_stateful3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortPropertyTest_from_stateless3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampFieldTest_from_appmanaged +com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampFieldTest_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampFieldTest_from_pmservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampFieldTest_from_puservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampFieldTest_from_stateful3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampFieldTest_from_stateless3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampPropertyTest_from_appmanaged +com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampPropertyTest_from_appmanagedNoTx +com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampPropertyTest_from_pmservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampPropertyTest_from_puservlet +com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampPropertyTest_from_stateful3 +com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampPropertyTest_from_stateless3 + + ################ # Security API ################ diff --git a/install/jpa/bin/ts.jtx b/install/jpa/bin/ts.jtx index 5e6395b8d9..c81a67d60b 100644 --- a/install/jpa/bin/ts.jtx +++ b/install/jpa/bin/ts.jtx @@ -50,3 +50,19 @@ com/sun/ts/tests/jpa/core/derivedid/ex3a/Client.java#DIDTest_from_standalone com/sun/ts/tests/jpa/core/derivedid/ex3b/Client.java#DIDTest_from_standalone com/sun/ts/tests/jpa/core/annotations/mapsid/Client.java#persistMX1Test1_from_standalone +# https://github.com/jakartaee/persistence/issues/637 TCK should not set version on entity manually +com/sun/ts/tests/jpa/core/annotations/version/Client.java#intFieldTest_from_standalone +com/sun/ts/tests/jpa/core/annotations/version/Client.java#intPropertyTest_from_standalone +com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerFieldTest_from_standalone +com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerPropertyTest_from_standalone +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassFieldTest_from_standalone +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassPropertyTest_from_standalone +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longFieldTest_from_standalone +com/sun/ts/tests/jpa/core/annotations/version/Client.java#longPropertyTest_from_standalone +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassFieldTest_from_standalone +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassPropertyTest_from_standalone +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortFieldTest_from_standalone +com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortPropertyTest_from_standalone +com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampFieldTest_from_standalone +com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampPropertyTest_from_standalone +