Skip to content

Fix LiquibaseLoaderIntegrationTest #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix LiquibaseLoaderIntegrationTest #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions api/src/test/java/org/openmrs/module/initializer/api/LiquibaseLoaderIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions api/src/test/java/org/openmrs/module/initializer/api/UtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...g/openmrs/module/initializer/liquibase/DeleteDomainChecksumsChangesetIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down