update sql script setup

ministryofjustice · Jul 22, 2024 · 626d1e2 · 626d1e2
1 parent 9eb6486
commit 626d1e2
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/.../uk/gov/laa/ccms/data/api/controller/NotificationAttachmentControllerIntegrationTest.java b/.../uk/gov/laa/ccms/data/api/controller/NotificationAttachmentControllerIntegrationTest.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 NotificationAttachmentControllerIntegrationTest extends BaseNotificationAttachmentControllerIntegrationTest implements
     IntegrationTestInterface {