From 9e7914f8fc60d4eabb930439ebfc1a8c1e1b376a Mon Sep 17 00:00:00 2001 From: Mark Goodrich Date: Tue, 27 Sep 2022 17:30:43 -0400 Subject: [PATCH] Fix Liquibase Loader Test --- .../initializer/api/LiquibaseLoaderIntegrationTest.java | 8 +------- .../org/openmrs/module/initializer/api/UtilsTest.java | 6 +++--- .../DeleteDomainChecksumsChangesetIntegrationTest.java | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/api/src/test/java/org/openmrs/module/initializer/api/LiquibaseLoaderIntegrationTest.java b/api/src/test/java/org/openmrs/module/initializer/api/LiquibaseLoaderIntegrationTest.java index 824dcea70..e953b65d8 100644 --- a/api/src/test/java/org/openmrs/module/initializer/api/LiquibaseLoaderIntegrationTest.java +++ b/api/src/test/java/org/openmrs/module/initializer/api/LiquibaseLoaderIntegrationTest.java @@ -15,6 +15,7 @@ import org.openmrs.api.context.Context; import org.openmrs.module.initializer.DomainBaseModuleContextSensitiveTest; import org.openmrs.module.initializer.api.loaders.LiquibaseLoader; +import org.openmrs.util.DatabaseUpdater; import org.springframework.beans.factory.annotation.Autowired; import static org.hamcrest.Matchers.nullValue; @@ -25,15 +26,8 @@ public class LiquibaseLoaderIntegrationTest extends DomainBaseModuleContextSensi @Autowired private LiquibaseLoader loader; - @Before - public void setup() { - System.setProperty("useInMemoryDatabase", "true"); - } - @Test public void load_shouldLoadStructuredLiquibaseChangesets() throws Exception { - // TODO This test fails on GitHub Actions but the failure cannot be reproduced so for now, skip it - assumeThat(System.getenv("GITHUB_ENV"), nullValue()); // Replay loader.load(); diff --git a/api/src/test/java/org/openmrs/module/initializer/api/UtilsTest.java b/api/src/test/java/org/openmrs/module/initializer/api/UtilsTest.java index 929530212..27b9e2112 100644 --- a/api/src/test/java/org/openmrs/module/initializer/api/UtilsTest.java +++ b/api/src/test/java/org/openmrs/module/initializer/api/UtilsTest.java @@ -288,7 +288,7 @@ public void unProxy_shouldReturnOriginalClassName() { Assert.assertEquals("EncounterType", Utils.unProxy("EncounterType_$$_javassist_26")); Assert.assertEquals("EncounterType", Utils.unProxy("EncounterType")); } - + @Test public void fetchConcept_shouldFetchConceptByUuid() { ConceptService cs = mock(ConceptService.class); @@ -300,7 +300,7 @@ public void fetchConcept_shouldFetchConceptByUuid() { when(cs.getConceptByName("concept:lookup")).thenReturn(nameConcept); Assert.assertEquals(uuidConcept, Utils.fetchConcept("concept:lookup", cs)); } - + @Test public void fetchConcept_shouldFetchConceptByMapping() { ConceptService cs = mock(ConceptService.class); @@ -311,7 +311,7 @@ public void fetchConcept_shouldFetchConceptByMapping() { when(cs.getConceptByName("concept:lookup")).thenReturn(nameConcept); Assert.assertEquals(mappingConcept, Utils.fetchConcept("concept:lookup", cs)); } - + @Test public void fetchConcept_shouldFetchConceptByName() { ConceptService cs = mock(ConceptService.class); diff --git a/api/src/test/java/org/openmrs/module/initializer/liquibase/DeleteDomainChecksumsChangesetIntegrationTest.java b/api/src/test/java/org/openmrs/module/initializer/liquibase/DeleteDomainChecksumsChangesetIntegrationTest.java index d2863aaca..60c0cc551 100644 --- a/api/src/test/java/org/openmrs/module/initializer/liquibase/DeleteDomainChecksumsChangesetIntegrationTest.java +++ b/api/src/test/java/org/openmrs/module/initializer/liquibase/DeleteDomainChecksumsChangesetIntegrationTest.java @@ -58,8 +58,8 @@ private Liquibase getLiquibase(String filename) throws Exception { Database liquibaseConnection = DatabaseFactory.getInstance() .findCorrectDatabaseImplementation(new JdbcConnection(getConnection())); - liquibaseConnection.setDatabaseChangeLogTableName("LIQUIBASECHANGELOG"); - liquibaseConnection.setDatabaseChangeLogLockTableName("LIQUIBASECHANGELOGLOCK"); + liquibaseConnection.setDatabaseChangeLogTableName("LIQUIBASECHANGELOG_TEST"); + liquibaseConnection.setDatabaseChangeLogLockTableName("LIQUIBASECHANGELOGLOCK_TEST"); return new Liquibase(filename, new ClassLoaderResourceAccessor(getClass().getClassLoader()), liquibaseConnection); }