test: convert eligible integration tests to @Transactional

dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/dataapproval/DataApprovalServiceCategoryOptionGroupTest.java

@@ -74,10 +74,12 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author Jim Grace
  */
+@Transactional
 class DataApprovalServiceCategoryOptionGroupTest extends PostgresIntegrationTestBase {
   private static final String ACCESS_NONE = "--------";
 
@@ -630,6 +632,9 @@ void setUp() {
     settingsService.put("keyIgnoreAnalyticsApprovalYearThreshold", 0);
     settingsService.put("keyAcceptanceRequiredForApproval", true);
     settingsService.clearCurrentSettings();
+
+    // flush so the raw-SQL data-approval reads see the setup metadata
+    entityManager.flush();
   }
 
   @AfterEach
@@ -738,6 +743,7 @@ private boolean approve(
     setUser(user);
     try {
       dataApprovalService.approveData(Arrays.asList(da));
+      entityManager.flush();
       return true;
     } catch (DataApprovalException ex) {
       return false;
@@ -766,6 +772,7 @@ private boolean unapprove(
     setUser(user);
     try {
       dataApprovalService.unapproveData(Arrays.asList(da));
+      entityManager.flush();
       return true;
     } catch (DataApprovalException ex) {
       return false;
@@ -794,6 +801,7 @@ private boolean accept(
     setUser(user);
     try {
       dataApprovalService.acceptData(Arrays.asList(da));
+      entityManager.flush();
       return true;
     } catch (DataApprovalException ex) {
       return false;
@@ -822,6 +830,7 @@ private boolean unaccept(
     setUser(user);
     try {
       dataApprovalService.unacceptData(Arrays.asList(da));
+      entityManager.flush();
       return true;
     } catch (DataApprovalException ex) {
       return false;

dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/dataapproval/DataApprovalStoreUserTest.java

@@ -50,10 +50,12 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author Jim Grace
  */
+@Transactional
 class DataApprovalStoreUserTest extends PostgresIntegrationTestBase {
 
   @Autowired private DataApprovalStore dataApprovalStore;
@@ -145,6 +147,8 @@ void testGetDataApprovalStatuses() {
     categoryService.addCategoryCombo(catComboA);
     CategoryOptionCombo catOptionComboA = createCategoryOptionCombo(catComboA, catOptionA);
     categoryService.addCategoryOptionCombo(catOptionComboA);
+    // flush so the raw-SQL data-approval status query sees the session writes
+    entityManager.flush();
     List<DataApprovalStatus> statuses =
         dataApprovalStore.getDataApprovalStatuses(
             workflowA,

dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/datastatistics/DataStatisticsEventStoreTest.java

@@ -47,11 +47,13 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author Yrjan A. F. Fraschetti
  * @author Julie Hill Roa
  */
+@Transactional
 class DataStatisticsEventStoreTest extends PostgresIntegrationTestBase {
   @Autowired private DataStatisticsEventStore dataStatisticsEventStore;
 
@@ -95,6 +97,9 @@ void setUp() {
 
     // Add one dashboard.
     assertTrue(dashboardService.saveDashboard(dashboard) != 0);
+
+    // flush so the raw-SQL statistics-store reads see the session writes
+    entityManager.flush();
   }
 
   @Test

dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/db/sql/PostgreSqlBuilderInheritanceIntegrationTest.java

@@ -41,7 +41,9 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.transaction.annotation.Transactional;
 
+@Transactional
 class PostgreSqlBuilderInheritanceIntegrationTest extends PostgresIntegrationTestBase {
   @Autowired private JdbcTemplate jdbcTemplate;
 

dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/merge/orgunit/handler/DataOrgUnitMergeHandlerTest.java

@@ -60,10 +60,12 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author Lars Helge Overland
  */
+@Transactional
 class DataOrgUnitMergeHandlerTest extends PostgresIntegrationTestBase {
 
   @Autowired private CategoryService categoryService;
@@ -127,6 +129,8 @@ void setUp() {
     CategoryCombo ccA = categoryService.getDefaultCategoryCombo();
     dwA = new DataApprovalWorkflow("DataApprovalWorkflowA", monthly, ccA, Sets.newHashSet(dlA));
     idObjectManager.save(dwA);
+    // flush so the raw-SQL count/merge queries see the setup metadata
+    entityManager.flush();
   }
 
   @Test
@@ -194,5 +198,7 @@ private void addDataValues(DataValue... values) {
 
   private void addDataApprovals(DataApproval... dataApprovals) {
     Stream.of(dataApprovals).forEach(dataApprovalService::addDataApproval);
+    // flush so the raw-SQL data-approval count/merge queries see the session writes
+    entityManager.flush();
   }
 }

dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/predictor/PredictorServiceTest.java

@@ -57,10 +57,12 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author Lars Helge Overland
  */
+@Transactional
 class PredictorServiceTest extends PostgresIntegrationTestBase {
 
   @Autowired private PredictorService predictorService;
@@ -434,6 +436,8 @@ void testGetAllPredictorGroup() {
   @Test
   void testCannotDeleteCategoryOptionComboUsedByPredictor() {
     setUpPredictorGroups();
+    // flush so the raw-SQL deletion-veto query sees the predictor rows
+    entityManager.flush();
     DeleteNotAllowedException ex =
         assertThrows(
             DeleteNotAllowedException.class,

dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/program/ProgramStageDataElementServiceTest.java

@@ -49,10 +49,12 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author Chau Thu Tran
  */
+@Transactional
 class ProgramStageDataElementServiceTest extends PostgresIntegrationTestBase {
 
   @Autowired private ProgramStageDataElementService programStageDataElementService;
@@ -182,6 +184,8 @@ void testRemoveReferencedDataElement() {
     programStageDataElementService.addProgramStageDataElement(stageDataElementA);
     stageA.getProgramStageDataElements().addAll(Set.of(stageDataElementA));
     programStageService.updateProgramStage(stageA);
+    // flush so the raw-SQL deletion-veto query sees the program-stage-data-element link
+    entityManager.flush();
     assertThrows(
         DeleteNotAllowedException.class, () -> dataElementService.deleteDataElement(dataElementA));
   }
@@ -197,6 +201,8 @@ void testGetProgramStageDataElementsWithSyncFiltering() {
     programStageDataElementService.addProgramStageDataElement(stageDataElementB);
     programStageDataElementService.addProgramStageDataElement(stageDataElementC);
     programStageDataElementService.addProgramStageDataElement(stageDataElementD);
+    // flush so the raw-SQL store read sees the newly added program-stage-data-elements
+    entityManager.flush();
 
     Map<String, Set<String>> result =
         programStageDataElementService