story(ccls-2178): update IT ddl script to match pui liquibase

ministryofjustice · Jul 18, 2024 · 7312842 · 7312842
1 parent b687ca2
commit 7312842
Show file tree

Hide file tree

Showing 11 changed files with 757 additions and 543 deletions.
diff --git a/...onTest/java/uk/gov/laa/ccms/data/api/controller/ApplicationControllerIntegrationTest.java b/...onTest/java/uk/gov/laa/ccms/data/api/controller/ApplicationControllerIntegrationTest.java
@@ -1,21 +1,19 @@
 package uk.gov.laa.ccms.data.api.controller;
 
+import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.AFTER_TEST_METHOD;
 import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.BEFORE_TEST_METHOD;
 import static org.springframework.test.context.jdbc.SqlMergeMode.MergeMode.MERGE;
 
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.jdbc.Sql;
-import org.springframework.test.context.jdbc.SqlConfig;
-import org.springframework.test.context.jdbc.SqlConfig.ErrorMode;
-import org.springframework.test.context.jdbc.SqlConfig.TransactionMode;
 import org.springframework.test.context.jdbc.SqlMergeMode;
 import uk.gov.laa.ccms.caab.api.CaabApiApplication;
 import uk.gov.laa.ccms.data.api.IntegrationTestInterface;
 
 @SpringBootTest(classes = CaabApiApplication.class)
 @SqlMergeMode(MERGE)
-@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_drop_schema.sql", config = @SqlConfig(transactionMode = TransactionMode.ISOLATED, errorMode = ErrorMode.CONTINUE_ON_ERROR))
-@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_create_schema.sql", config = @SqlConfig(transactionMode = TransactionMode.ISOLATED))
+@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_create_schema.sql")
+@Sql(executionPhase = AFTER_TEST_METHOD, scripts = "/sql/application_tables_drop_schema.sql")
 public class ApplicationControllerIntegrationTest extends BaseApplicationControllerIntegrationTest implements
     IntegrationTestInterface {
 

diff --git a/...onTest/java/uk/gov/laa/ccms/data/api/controller/CaseOutcomeControllerIntegrationTest.java b/...onTest/java/uk/gov/laa/ccms/data/api/controller/CaseOutcomeControllerIntegrationTest.java
@@ -1,22 +1,19 @@
 package uk.gov.laa.ccms.data.api.controller;
 
+import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.AFTER_TEST_METHOD;
 import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.BEFORE_TEST_METHOD;
 import static org.springframework.test.context.jdbc.SqlMergeMode.MergeMode.MERGE;
 
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.jdbc.Sql;
-import org.springframework.test.context.jdbc.SqlConfig;
-import org.springframework.test.context.jdbc.SqlConfig.ErrorMode;
-import org.springframework.test.context.jdbc.SqlConfig.TransactionMode;
 import org.springframework.test.context.jdbc.SqlMergeMode;
 import uk.gov.laa.ccms.caab.api.CaabApiApplication;
 import uk.gov.laa.ccms.data.api.IntegrationTestInterface;
 
 @SpringBootTest(classes = CaabApiApplication.class)
 @SqlMergeMode(MERGE)
-@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_drop_schema.sql", config = @SqlConfig(transactionMode = TransactionMode.ISOLATED, errorMode = ErrorMode.CONTINUE_ON_ERROR))
-@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_create_schema.sql", config = @SqlConfig(transactionMode = TransactionMode.ISOLATED))
-public class CaseOutcomeControllerIntegrationTest extends BaseCaseOutcomeControllerIntegrationTest implements
+@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_create_schema.sql")
+@Sql(executionPhase = AFTER_TEST_METHOD, scripts = "/sql/application_tables_drop_schema.sql")public class CaseOutcomeControllerIntegrationTest extends BaseCaseOutcomeControllerIntegrationTest implements
     IntegrationTestInterface {
 
     //this runs all tests in BaseCaseOutcomeControllerIntegrationTest, do not add anything here

diff --git a/...ationTest/java/uk/gov/laa/ccms/data/api/controller/EvidenceControllerIntegrationTest.java b/...ationTest/java/uk/gov/laa/ccms/data/api/controller/EvidenceControllerIntegrationTest.java
@@ -1,21 +1,19 @@
 package uk.gov.laa.ccms.data.api.controller;
 
+import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.AFTER_TEST_METHOD;
 import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.BEFORE_TEST_METHOD;
 import static org.springframework.test.context.jdbc.SqlMergeMode.MergeMode.MERGE;
 
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.jdbc.Sql;
-import org.springframework.test.context.jdbc.SqlConfig;
-import org.springframework.test.context.jdbc.SqlConfig.ErrorMode;
-import org.springframework.test.context.jdbc.SqlConfig.TransactionMode;
 import org.springframework.test.context.jdbc.SqlMergeMode;
 import uk.gov.laa.ccms.caab.api.CaabApiApplication;
 import uk.gov.laa.ccms.data.api.IntegrationTestInterface;
 
 @SpringBootTest(classes = CaabApiApplication.class)
 @SqlMergeMode(MERGE)
-@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_drop_schema.sql", config = @SqlConfig(transactionMode = TransactionMode.ISOLATED, errorMode = ErrorMode.CONTINUE_ON_ERROR))
-@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_create_schema.sql", config = @SqlConfig(transactionMode = TransactionMode.ISOLATED))
+@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_create_schema.sql")
+@Sql(executionPhase = AFTER_TEST_METHOD, scripts = "/sql/application_tables_drop_schema.sql")
 public class EvidenceControllerIntegrationTest extends BaseEvidenceControllerIntegrationTest implements
     IntegrationTestInterface {
 

diff --git a/...ionTest/java/uk/gov/laa/ccms/data/api/controller/LinkedCaseControllerIntegrationTest.java b/...ionTest/java/uk/gov/laa/ccms/data/api/controller/LinkedCaseControllerIntegrationTest.java
@@ -1,21 +1,19 @@
 package uk.gov.laa.ccms.data.api.controller;
 
+import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.AFTER_TEST_METHOD;
 import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.BEFORE_TEST_METHOD;
 import static org.springframework.test.context.jdbc.SqlMergeMode.MergeMode.MERGE;
 
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.jdbc.Sql;
-import org.springframework.test.context.jdbc.SqlConfig;
-import org.springframework.test.context.jdbc.SqlConfig.ErrorMode;
-import org.springframework.test.context.jdbc.SqlConfig.TransactionMode;
 import org.springframework.test.context.jdbc.SqlMergeMode;
 import uk.gov.laa.ccms.caab.api.CaabApiApplication;
 import uk.gov.laa.ccms.data.api.IntegrationTestInterface;
 
 @SpringBootTest(classes = CaabApiApplication.class)
 @SqlMergeMode(MERGE)
-@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_drop_schema.sql", config = @SqlConfig(transactionMode = TransactionMode.ISOLATED, errorMode = ErrorMode.CONTINUE_ON_ERROR))
-@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_create_schema.sql", config = @SqlConfig(transactionMode = TransactionMode.ISOLATED))
+@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_create_schema.sql")
+@Sql(executionPhase = AFTER_TEST_METHOD, scripts = "/sql/application_tables_drop_schema.sql")
 public class LinkedCaseControllerIntegrationTest extends BaseLinkedCaseControllerIntegrationTest
     implements IntegrationTestInterface {
 

diff --git a/...ationTest/java/uk/gov/laa/ccms/data/api/controller/OpponentControllerIntegrationTest.java b/...ationTest/java/uk/gov/laa/ccms/data/api/controller/OpponentControllerIntegrationTest.java
@@ -1,21 +1,19 @@
 package uk.gov.laa.ccms.data.api.controller;
 
+import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.AFTER_TEST_METHOD;
 import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.BEFORE_TEST_METHOD;
 import static org.springframework.test.context.jdbc.SqlMergeMode.MergeMode.MERGE;
 
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.jdbc.Sql;
-import org.springframework.test.context.jdbc.SqlConfig;
-import org.springframework.test.context.jdbc.SqlConfig.ErrorMode;
-import org.springframework.test.context.jdbc.SqlConfig.TransactionMode;
 import org.springframework.test.context.jdbc.SqlMergeMode;
 import uk.gov.laa.ccms.caab.api.CaabApiApplication;
 import uk.gov.laa.ccms.data.api.IntegrationTestInterface;
 
 @SpringBootTest(classes = CaabApiApplication.class)
 @SqlMergeMode(MERGE)
-@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_drop_schema.sql", config = @SqlConfig(transactionMode = TransactionMode.ISOLATED, errorMode = ErrorMode.CONTINUE_ON_ERROR))
-@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_create_schema.sql", config = @SqlConfig(transactionMode = TransactionMode.ISOLATED))
+@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_create_schema.sql")
+@Sql(executionPhase = AFTER_TEST_METHOD, scripts = "/sql/application_tables_drop_schema.sql")
 public class OpponentControllerIntegrationTest extends BaseOpponentControllerIntegrationTest
     implements IntegrationTestInterface {
 

diff --git a/...est/java/uk/gov/laa/ccms/data/api/controller/PriorAuthorityControllerIntegrationTest.java b/...est/java/uk/gov/laa/ccms/data/api/controller/PriorAuthorityControllerIntegrationTest.java
@@ -1,21 +1,19 @@
 package uk.gov.laa.ccms.data.api.controller;
 
+import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.AFTER_TEST_METHOD;
 import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.BEFORE_TEST_METHOD;
 import static org.springframework.test.context.jdbc.SqlMergeMode.MergeMode.MERGE;
 
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.jdbc.Sql;
-import org.springframework.test.context.jdbc.SqlConfig;
-import org.springframework.test.context.jdbc.SqlConfig.ErrorMode;
-import org.springframework.test.context.jdbc.SqlConfig.TransactionMode;
 import org.springframework.test.context.jdbc.SqlMergeMode;
 import uk.gov.laa.ccms.caab.api.CaabApiApplication;
 import uk.gov.laa.ccms.data.api.IntegrationTestInterface;
 
 @SpringBootTest(classes = CaabApiApplication.class)
 @SqlMergeMode(MERGE)
-@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_drop_schema.sql", config = @SqlConfig(transactionMode = TransactionMode.ISOLATED, errorMode = ErrorMode.CONTINUE_ON_ERROR))
-@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_create_schema.sql", config = @SqlConfig(transactionMode = TransactionMode.ISOLATED))
+@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_create_schema.sql")
+@Sql(executionPhase = AFTER_TEST_METHOD, scripts = "/sql/application_tables_drop_schema.sql")
 public class PriorAuthorityControllerIntegrationTest
     extends BasePriorAuthorityControllerIntegrationTest
     implements IntegrationTestInterface {

diff --git a/...ionTest/java/uk/gov/laa/ccms/data/api/controller/ProceedingControllerIntegrationTest.java b/...ionTest/java/uk/gov/laa/ccms/data/api/controller/ProceedingControllerIntegrationTest.java
@@ -1,21 +1,19 @@
 package uk.gov.laa.ccms.data.api.controller;
 
+import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.AFTER_TEST_METHOD;
 import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.BEFORE_TEST_METHOD;
 import static org.springframework.test.context.jdbc.SqlMergeMode.MergeMode.MERGE;
 
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.jdbc.Sql;
-import org.springframework.test.context.jdbc.SqlConfig;
-import org.springframework.test.context.jdbc.SqlConfig.ErrorMode;
-import org.springframework.test.context.jdbc.SqlConfig.TransactionMode;
 import org.springframework.test.context.jdbc.SqlMergeMode;
 import uk.gov.laa.ccms.caab.api.CaabApiApplication;
 import uk.gov.laa.ccms.data.api.IntegrationTestInterface;
 
 @SpringBootTest(classes = CaabApiApplication.class)
 @SqlMergeMode(MERGE)
-@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_drop_schema.sql", config = @SqlConfig(transactionMode = TransactionMode.ISOLATED, errorMode = ErrorMode.CONTINUE_ON_ERROR))
-@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_create_schema.sql", config = @SqlConfig(transactionMode = TransactionMode.ISOLATED))
+@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_create_schema.sql")
+@Sql(executionPhase = AFTER_TEST_METHOD, scripts = "/sql/application_tables_drop_schema.sql")
 public class ProceedingControllerIntegrationTest
     extends BaseProceedingControllerIntegrationTest
     implements IntegrationTestInterface {

diff --git a/...st/java/uk/gov/laa/ccms/data/api/controller/ScopeLimitationControllerIntegrationTest.java b/...st/java/uk/gov/laa/ccms/data/api/controller/ScopeLimitationControllerIntegrationTest.java
@@ -1,21 +1,19 @@
 package uk.gov.laa.ccms.data.api.controller;
 
+import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.AFTER_TEST_METHOD;
 import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.BEFORE_TEST_METHOD;
 import static org.springframework.test.context.jdbc.SqlMergeMode.MergeMode.MERGE;
 
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.jdbc.Sql;
-import org.springframework.test.context.jdbc.SqlConfig;
-import org.springframework.test.context.jdbc.SqlConfig.ErrorMode;
-import org.springframework.test.context.jdbc.SqlConfig.TransactionMode;
 import org.springframework.test.context.jdbc.SqlMergeMode;
 import uk.gov.laa.ccms.caab.api.CaabApiApplication;
 import uk.gov.laa.ccms.data.api.IntegrationTestInterface;
 
 @SpringBootTest(classes = CaabApiApplication.class)
 @SqlMergeMode(MERGE)
-@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_drop_schema.sql", config = @SqlConfig(transactionMode = TransactionMode.ISOLATED, errorMode = ErrorMode.CONTINUE_ON_ERROR))
-@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_create_schema.sql", config = @SqlConfig(transactionMode = TransactionMode.ISOLATED))
+@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_create_schema.sql")
+@Sql(executionPhase = AFTER_TEST_METHOD, scripts = "/sql/application_tables_drop_schema.sql")
 public class ScopeLimitationControllerIntegrationTest
     extends BaseScopeLimitiationControllerIntegrationTest
     implements IntegrationTestInterface {

diff --git a/...egrationTest/java/uk/gov/laa/ccms/data/api/service/ApplicationServiceIntegrationTest.java b/...egrationTest/java/uk/gov/laa/ccms/data/api/service/ApplicationServiceIntegrationTest.java
@@ -1,21 +1,19 @@
 package uk.gov.laa.ccms.data.api.service;
 
+import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.AFTER_TEST_METHOD;
 import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.BEFORE_TEST_METHOD;
 import static org.springframework.test.context.jdbc.SqlMergeMode.MergeMode.MERGE;
 
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.jdbc.Sql;
-import org.springframework.test.context.jdbc.SqlConfig;
-import org.springframework.test.context.jdbc.SqlConfig.ErrorMode;
-import org.springframework.test.context.jdbc.SqlConfig.TransactionMode;
 import org.springframework.test.context.jdbc.SqlMergeMode;
 import uk.gov.laa.ccms.caab.api.CaabApiApplication;
 import uk.gov.laa.ccms.data.api.IntegrationTestInterface;
 
 @SpringBootTest(classes = CaabApiApplication.class)
 @SqlMergeMode(MERGE)
-@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_drop_schema.sql", config = @SqlConfig(transactionMode = TransactionMode.ISOLATED, errorMode = ErrorMode.CONTINUE_ON_ERROR))
-@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_create_schema.sql", config = @SqlConfig(transactionMode = TransactionMode.ISOLATED))
+@Sql(executionPhase = BEFORE_TEST_METHOD, scripts = "/sql/application_tables_create_schema.sql")
+@Sql(executionPhase = AFTER_TEST_METHOD, scripts = "/sql/application_tables_drop_schema.sql")
 public class ApplicationServiceIntegrationTest extends
     BaseApplicationServiceIntegrationTest implements
     IntegrationTestInterface {