From 1d309afbea8639fbf8a2c0b8c4e5f2b5f1f62805 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Sat, 5 Aug 2023 11:42:26 -0500 Subject: [PATCH] Update test utils meta data - add qqqTable --- .../backend/javalin/QJavalinAccessLoggerTest.java | 12 ++++++------ .../QJavalinImplementationAuthenticationTest.java | 6 +++--- .../qqq/backend/javalin/QJavalinTestBase.java | 3 ++- .../com/kingsrook/qqq/backend/javalin/TestUtils.java | 5 ++++- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/QJavalinAccessLoggerTest.java b/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/QJavalinAccessLoggerTest.java index 380df252..836632dd 100644 --- a/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/QJavalinAccessLoggerTest.java +++ b/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/QJavalinAccessLoggerTest.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; import java.util.concurrent.TimeUnit; -import com.kingsrook.qqq.backend.core.exceptions.QInstanceValidationException; +import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.model.actions.processes.ProcessSummaryLine; import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessOutput; import com.kingsrook.qqq.backend.core.model.actions.processes.Status; @@ -52,7 +52,7 @@ class QJavalinAccessLoggerTest ** *******************************************************************************/ @Test - void testDefaultOn() throws QInstanceValidationException + void testDefaultOn() throws QException { QInstance qInstance = TestUtils.defineInstance(); new QJavalinImplementation(qInstance, new QJavalinMetaData()); @@ -74,7 +74,7 @@ class QJavalinAccessLoggerTest ** *******************************************************************************/ @Test - void testTurnedOffByCode() throws QInstanceValidationException + void testTurnedOffByCode() throws QException { QInstance qInstance = TestUtils.defineInstance(); new QJavalinImplementation(qInstance, new QJavalinMetaData() @@ -97,7 +97,7 @@ class QJavalinAccessLoggerTest ** *******************************************************************************/ @Test - void testTurnedOffBySystemPropertyWithJavalinMetaData() throws QInstanceValidationException + void testTurnedOffBySystemPropertyWithJavalinMetaData() throws QException { System.setProperty(DISABLED_PROPERTY, "true"); QInstance qInstance = TestUtils.defineInstance(); @@ -114,7 +114,7 @@ class QJavalinAccessLoggerTest ** *******************************************************************************/ @Test - void testTurnedOffBySystemPropertyWithoutJavalinMetaData() throws QInstanceValidationException + void testTurnedOffBySystemPropertyWithoutJavalinMetaData() throws QException { System.setProperty(DISABLED_PROPERTY, "true"); QInstance qInstance = TestUtils.defineInstance(); @@ -131,7 +131,7 @@ class QJavalinAccessLoggerTest ** *******************************************************************************/ @Test - void testFilter() throws QInstanceValidationException + void testFilter() throws QException { QInstance qInstance = TestUtils.defineInstance(); new QJavalinImplementation(qInstance, new QJavalinMetaData() diff --git a/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementationAuthenticationTest.java b/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementationAuthenticationTest.java index 8f93da37..67007a52 100644 --- a/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementationAuthenticationTest.java +++ b/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementationAuthenticationTest.java @@ -27,7 +27,7 @@ import java.util.Base64; import java.util.List; import java.util.concurrent.TimeUnit; import com.kingsrook.qqq.backend.core.context.QContext; -import com.kingsrook.qqq.backend.core.exceptions.QInstanceValidationException; +import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.metadata.authentication.TableBasedAuthenticationMetaData; @@ -61,7 +61,7 @@ public class QJavalinImplementationAuthenticationTest extends QJavalinTestBase ** *******************************************************************************/ @BeforeEach - public void beforeEach() throws QInstanceValidationException + public void beforeEach() throws QException { Unirest.config().reset().enableCookieManagement(false); setupTableBasedAuthenticationInstance(); @@ -188,7 +188,7 @@ public class QJavalinImplementationAuthenticationTest extends QJavalinTestBase /******************************************************************************* ** *******************************************************************************/ - static void setupTableBasedAuthenticationInstance() throws QInstanceValidationException + static void setupTableBasedAuthenticationInstance() throws QException { QInstance qInstance = TestUtils.defineInstance(); TableBasedAuthenticationMetaData tableBasedAuthenticationMetaData = new TableBasedAuthenticationMetaData(); diff --git a/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/QJavalinTestBase.java b/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/QJavalinTestBase.java index 2eb91ff1..7da167b5 100644 --- a/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/QJavalinTestBase.java +++ b/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/QJavalinTestBase.java @@ -22,6 +22,7 @@ package com.kingsrook.qqq.backend.javalin; +import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QInstanceValidationException; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.modules.backend.implementations.memory.MemoryRecordStore; @@ -60,7 +61,7 @@ public class QJavalinTestBase ** *******************************************************************************/ @BeforeAll - public static void beforeAll() throws QInstanceValidationException + public static void beforeAll() throws QException { qJavalinImplementation = new QJavalinImplementation(TestUtils.defineInstance()); QJavalinProcessHandler.setAsyncStepTimeoutMillis(250); diff --git a/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/TestUtils.java b/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/TestUtils.java index 0245e235..a6346e38 100644 --- a/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/TestUtils.java +++ b/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/TestUtils.java @@ -68,6 +68,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.tables.AssociatedScript; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.model.savedfilters.SavedFiltersMetaDataProvider; import com.kingsrook.qqq.backend.core.model.scripts.ScriptsMetaDataProvider; +import com.kingsrook.qqq.backend.core.model.tables.QQQTablesMetaDataProvider; import com.kingsrook.qqq.backend.core.processes.implementations.mock.MockBackendStep; import com.kingsrook.qqq.backend.module.rdbms.jdbc.ConnectionManager; import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager; @@ -138,7 +139,7 @@ public class TestUtils ** Define the q-instance for testing (h2 rdbms and 'person' table) ** *******************************************************************************/ - public static QInstance defineInstance() + public static QInstance defineInstance() throws QException { QInstance qInstance = new QInstance(); qInstance.setAuthentication(defineAuthentication()); @@ -154,6 +155,8 @@ public class TestUtils qInstance.addPossibleValueSource(definePossibleValueSourcePerson()); defineWidgets(qInstance); + new QQQTablesMetaDataProvider().defineAll(qInstance, BACKEND_NAME_MEMORY, BACKEND_NAME_MEMORY, null); + qInstance.addBackend(defineMemoryBackend()); try {