From 7b3cafe348da87cc30d491a884d4da6c0d37db1d Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Wed, 28 May 2025 08:54:34 -0500 Subject: [PATCH] Test fixes --- .../javalin/QJavalinImplementationTest.java | 4 +-- .../javalin/specs/SpecTestBase.java | 34 +++---------------- 2 files changed, 6 insertions(+), 32 deletions(-) diff --git a/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementationTest.java b/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementationTest.java index 588fa284..ba9f2d02 100644 --- a/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementationTest.java +++ b/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementationTest.java @@ -563,7 +563,7 @@ class QJavalinImplementationTest extends QJavalinTestBase .withQueryWithoutLimitDefault(3) .withQueryWithoutLimitLogLevel(Level.WARN); - QCollectingLogger collectingLogger = QLogger.activateCollectingLoggerForClass(QJavalinImplementation.class); + QCollectingLogger collectingLogger = QLogger.activateCollectingLoggerForClass(QJavalinUtils.class); String filterJson = """ {"criteria":[]}"""; @@ -583,7 +583,7 @@ class QJavalinImplementationTest extends QJavalinTestBase } finally { - QLogger.activateCollectingLoggerForClass(QJavalinImplementation.class); + QLogger.activateCollectingLoggerForClass(QJavalinUtils.class); resetMetaDataQueryWithoutLimitSettings(); } } diff --git a/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/middleware/javalin/specs/SpecTestBase.java b/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/middleware/javalin/specs/SpecTestBase.java index afc3ac42..1670e549 100644 --- a/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/middleware/javalin/specs/SpecTestBase.java +++ b/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/middleware/javalin/specs/SpecTestBase.java @@ -32,6 +32,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.session.QSystemUserSession; import com.kingsrook.qqq.backend.core.modules.backend.implementations.memory.MemoryRecordStore; import com.kingsrook.qqq.backend.javalin.TestUtils; +import com.kingsrook.qqq.middleware.javalin.specs.v1.MiddlewareVersionV1; import io.javalin.Javalin; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; @@ -167,7 +168,9 @@ public abstract class SpecTestBase ***************************************************************************/ protected AbstractMiddlewareVersion getMiddlewareVersion() { - return new TestMiddlewareVersion(); + // todo - when we introduce v2, idk... + // there is getVersion method in the specs, i guess we could switch on that... + return new MiddlewareVersionV1(); } @@ -182,35 +185,6 @@ public abstract class SpecTestBase - /*************************************************************************** - ** - ***************************************************************************/ - private static class TestMiddlewareVersion extends AbstractMiddlewareVersion - { - - /*************************************************************************** - ** - ***************************************************************************/ - @Override - public String getVersion() - { - return "test"; - } - - - - /*************************************************************************** - ** - ***************************************************************************/ - @Override - public List> getEndpointSpecs() - { - return List.of(); - } - } - - - /******************************************************************************* ** *******************************************************************************/