From 6142b8e703f9b90016e13b9d85310ff4de8eced5 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Mon, 29 Aug 2022 14:29:01 -0500 Subject: [PATCH] Update tests to run w/ h2 instead of mysql --- .../sampleapp/SampleMetaDataProviderTest.java | 36 ++++++++++++++++--- .../ClonePeopleTransformStepTest.java | 30 ++++++++++++++++ 2 files changed, 61 insertions(+), 5 deletions(-) diff --git a/qqq-sample-project/src/test/java/com/kingsrook/sampleapp/SampleMetaDataProviderTest.java b/qqq-sample-project/src/test/java/com/kingsrook/sampleapp/SampleMetaDataProviderTest.java index 08b5c6ea..07cf4872 100644 --- a/qqq-sample-project/src/test/java/com/kingsrook/sampleapp/SampleMetaDataProviderTest.java +++ b/qqq-sample-project/src/test/java/com/kingsrook/sampleapp/SampleMetaDataProviderTest.java @@ -45,11 +45,11 @@ import com.kingsrook.qqq.backend.module.rdbms.jdbc.ConnectionManager; import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnOs; -import org.junit.jupiter.api.condition.OS; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -58,9 +58,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /******************************************************************************* ** *******************************************************************************/ -@DisabledOnOs(OS.LINUX) // uses database; not available in CI at this time... -class SampleMetaDataProviderTest +public class SampleMetaDataProviderTest { + private static boolean originalUseMysqlValue = false; + + /******************************************************************************* ** @@ -73,11 +75,35 @@ class SampleMetaDataProviderTest + /******************************************************************************* + ** + *******************************************************************************/ + @BeforeAll + static void beforeAll() throws Exception + { + originalUseMysqlValue = SampleMetaDataProvider.USE_MYSQL; + SampleMetaDataProvider.USE_MYSQL = false; + SampleMetaDataProviderTest.primeTestDatabase("prime-test-database.sql"); + } + + + + /******************************************************************************* + ** + *******************************************************************************/ + @AfterAll + static void afterAll() + { + SampleMetaDataProvider.USE_MYSQL = originalUseMysqlValue; + } + + + /******************************************************************************* ** *******************************************************************************/ @SuppressWarnings("unchecked") - private void primeTestDatabase(String sqlFileName) throws Exception + public static void primeTestDatabase(String sqlFileName) throws Exception { ConnectionManager connectionManager = new ConnectionManager(); try(Connection connection = connectionManager.getConnection(SampleMetaDataProvider.defineRdbmsBackend())) diff --git a/qqq-sample-project/src/test/java/com/kingsrook/sampleapp/processes/clonepeople/ClonePeopleTransformStepTest.java b/qqq-sample-project/src/test/java/com/kingsrook/sampleapp/processes/clonepeople/ClonePeopleTransformStepTest.java index 1cddcaf1..e27131a6 100644 --- a/qqq-sample-project/src/test/java/com/kingsrook/sampleapp/processes/clonepeople/ClonePeopleTransformStepTest.java +++ b/qqq-sample-project/src/test/java/com/kingsrook/sampleapp/processes/clonepeople/ClonePeopleTransformStepTest.java @@ -13,6 +13,9 @@ import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryOutput; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.session.QSession; import com.kingsrook.sampleapp.SampleMetaDataProvider; +import com.kingsrook.sampleapp.SampleMetaDataProviderTest; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -22,6 +25,33 @@ import static org.assertj.core.api.Assertions.assertThat; *******************************************************************************/ class ClonePeopleTransformStepTest { + private static boolean originalUseMysqlValue = false; + + + + /******************************************************************************* + ** + *******************************************************************************/ + @BeforeAll + static void beforeAll() throws Exception + { + originalUseMysqlValue = SampleMetaDataProvider.USE_MYSQL; + SampleMetaDataProvider.USE_MYSQL = false; + SampleMetaDataProviderTest.primeTestDatabase("prime-test-database.sql"); + } + + + + /******************************************************************************* + ** + *******************************************************************************/ + @AfterAll + static void afterAll() + { + SampleMetaDataProvider.USE_MYSQL = originalUseMysqlValue; + } + + /******************************************************************************* **