From ce110b3806c229c00b28bcc7c66d07b188193de2 Mon Sep 17 00:00:00 2001 From: Ruhanga Date: Mon, 9 Jun 2025 07:57:33 +0000 Subject: [PATCH] ADDR-139: Fix random test failures on Amazon Corretto images --- .../addresshierarchy/AddressHierarchyActivatorTest.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/api/src/test/java/org/openmrs/module/addresshierarchy/AddressHierarchyActivatorTest.java b/api/src/test/java/org/openmrs/module/addresshierarchy/AddressHierarchyActivatorTest.java index 419ce38..c61216b 100644 --- a/api/src/test/java/org/openmrs/module/addresshierarchy/AddressHierarchyActivatorTest.java +++ b/api/src/test/java/org/openmrs/module/addresshierarchy/AddressHierarchyActivatorTest.java @@ -11,6 +11,7 @@ import org.openmrs.module.addresshierarchy.service.AddressHierarchyService; import org.openmrs.test.BaseModuleContextSensitiveTest; import org.openmrs.test.Verifies; +import org.openmrs.test.SkipBaseSetup; import org.openmrs.util.OpenmrsConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.DirtiesContext; @@ -22,6 +23,7 @@ import java.util.Properties; import java.util.Set; +@SkipBaseSetup @DirtiesContext public class AddressHierarchyActivatorTest extends BaseModuleContextSensitiveTest { @@ -31,7 +33,12 @@ public class AddressHierarchyActivatorTest extends BaseModuleContextSensitiveTes private AddressHierarchyActivator activator; @Before - public void setup() { + public void setup() throws Exception { + + initializeInMemoryDatabase(); + executeDataSet(INITIAL_XML_DATASET_PACKAGE_PATH); + executeDataSet(EXAMPLE_XML_DATASET_PACKAGE_PATH); + authenticate(); Context.getAdministrationService().saveGlobalProperty(new GlobalProperty(AddressHierarchyConstants.GLOBAL_PROP_INITIALIZE_ADDRESS_HIERARCHY_CACHE_ON_STARTUP, "true"));