Fix sequence schema generation tests to allow for if exists syntax

beikov · Apr 29, 2024 · 24d55ac · 24d55ac
1 parent 258bf53
commit 24d55ac
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/...c/main/java/ee/jakarta/tck/persistence/jpa22/se/generators/sequencegenerators/Client.java b/...c/main/java/ee/jakarta/tck/persistence/jpa22/se/generators/sequencegenerators/Client.java
@@ -148,8 +148,14 @@ public void sequenceGeneratorTest() throws Exception {
 		 * SEQUENCE SEQGENERATOR START WITH 10
 		 */
 
-		pass2a = findDataInFile(f2, "DROP TABLE SCHEMAGENSIMPLE");
-		pass2b = findDataInFile(f2, "DROP SEQUENCE SEQGENERATOR");
+		expected.clear();
+		expected.add("DROP TABLE");
+		expected.add("SCHEMAGENSIMPLE");
+		pass2a = findDataInFile(f2, expected);
+		expected.clear();
+		expected.add("DROP SEQUENCE");
+		expected.add("SEQGENERATOR");
+		pass2b = findDataInFile(f2, expected);
 
 		logger.log(Logger.Level.TRACE, "Execute the create script");
 		props = getPersistenceUnitProperties();

diff --git a/.../ee/jakarta/tck/persistence/se/schemaGeneration/annotations/sequenceGenerator/Client.java b/.../ee/jakarta/tck/persistence/se/schemaGeneration/annotations/sequenceGenerator/Client.java
@@ -151,8 +151,14 @@ public void sequenceGeneratorTest() throws Exception {
 		 * SEQUENCE SEQGENERATOR START WITH 10
 		 */
 
-		pass2a = findDataInFile(f2, "DROP TABLE SCHEMAGENSIMPLE");
-		pass2b = findDataInFile(f2, "DROP SEQUENCE SEQGENERATOR");
+		expected.clear();
+		expected.add("DROP TABLE");
+		expected.add("SCHEMAGENSIMPLE");
+		pass2a = findDataInFile(f2, expected);
+		expected.clear();
+		expected.add("DROP SEQUENCE");
+		expected.add("SEQGENERATOR");
+		pass2b = findDataInFile(f2, expected);
 
 		logger.log(Logger.Level.TRACE, "Execute the create script");
 		props = getPersistenceUnitProperties();