Fix some tests to allow cascade constraints syntax

beikov · Apr 29, 2024 · e4d7c2a · e4d7c2a
1 parent 1a84ffa
commit e4d7c2a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/...ain/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/joinTable/Client.java b/...ain/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/joinTable/Client.java
@@ -185,22 +185,10 @@ public void joinTableTest() throws Exception {
 		 * SCHEMAGENCOURSE (COURSEID)
 		 */
 
-		pass2a = findDataInFile(f2, new LinkedList<String>() {
-			private static final long serialVersionUID = 22L;
-			{
-				add("ALTER TABLE");
-				add("SCHEMAGEN_COURSE_STUDENT DROP");
-				add("STUDENTIDCONSTRAINT");
-			}
-		});
-		pass2b = findDataInFile(f2, new LinkedList<String>() {
-			private static final long serialVersionUID = 22L;
-			{
-				add("ALTER TABLE");
-				add("SCHEMAGEN_COURSE_STUDENT DROP");
-				add("COURSEIDCONSTRAINT");
-			}
-		});
+		pass2a = findDataInFile(f2, List.of("ALTER TABLE", "SCHEMAGEN_COURSE_STUDENT DROP", "STUDENTIDCONSTRAINT"));
+		pass2a = pass2a || findDataInFile(f2, List.of("DROP TABLE", "SCHEMAGEN_COURSE_STUDENT", "CASCADE CONSTRAINTS"));
+		pass2b = findDataInFile(f2, List.of("ALTER TABLE", "SCHEMAGEN_COURSE_STUDENT DROP", "COURSEIDCONSTRAINT"));
+		pass2b = pass2b || findDataInFile(f2, List.of("DROP TABLE", "SCHEMAGEN_COURSE_STUDENT", "CASCADE CONSTRAINTS"));
 		expected.clear();
 		expected.add("DROP TABLE");
 		expected.add("SCHEMAGEN_COURSE_STUDENT");

diff --git a/...n/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/orderColumn/Client.java b/...n/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/orderColumn/Client.java
@@ -171,6 +171,7 @@ public void orderColumnTest() throws Exception {
 		expected.add("ALTER TABLE");
 		expected.add("SCHEMAGENEMP DROP");
 		pass2c = findDataInFile(f2, expected);
+		pass2c = pass2c || findDataInFile(f2, List.of("DROP TABLE", "SCHEMAGENEMP", "CASCADE CONSTRAINTS"));
 
 		logger.log(Logger.Level.TRACE, "Execute the create script");
 		props = getPersistenceUnitProperties();

diff --git a/...ava/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/secondaryTable/Client.java b/...ava/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/secondaryTable/Client.java
@@ -159,6 +159,7 @@ public void secondaryTableTest() throws Exception {
 		expected.add("ALTER TABLE");
 		expected.add("SCHEMAGENSIMPLE_SECOND DROP");
 		pass2a = findDataInFile(f2, expected);
+		pass2a = pass2a || findDataInFile(f2, List.of("DROP TABLE", "SCHEMAGENSIMPLE_SECOND", "CASCADE CONSTRAINTS"));
 		expected.clear();
 		expected.add("DROP TABLE");
 		expected.add("SCHEMAGENSIMPLE");