From 24d55ac92dd8f863e28529da16c89eb90e49dfa5 Mon Sep 17 00:00:00 2001 From: Christian Beikov Date: Mon, 29 Apr 2024 19:39:53 +0200 Subject: [PATCH] Fix sequence schema generation tests to allow for if exists syntax --- .../jpa22/se/generators/sequencegenerators/Client.java | 10 ++++++++-- .../annotations/sequenceGenerator/Client.java | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/se/generators/sequencegenerators/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/se/generators/sequencegenerators/Client.java index 0e5aa7fe17..a8b0d0d215 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/se/generators/sequencegenerators/Client.java +++ b/jpa/spec-tests/src/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/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/sequenceGenerator/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/sequenceGenerator/Client.java index 76938de1f2..0f185ccfb8 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/sequenceGenerator/Client.java +++ b/jpa/spec-tests/src/main/java/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();