From fb8c6ac80d130eda4c95b893fa7223a754a3f06d Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Mon, 25 Jul 2022 13:23:15 -0500 Subject: [PATCH] Updated for updated deps --- .../qqq/backend/module/filesystem/TestUtils.java | 11 ++++++----- .../model/metadata/FilesystemBackendMetaDataTest.java | 5 ++--- .../s3/model/metadata/S3BackendMetaDataTest.java | 5 ++--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java index 6dbef157..fd7d0714 100644 --- a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java +++ b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java @@ -26,13 +26,14 @@ import java.io.File; import java.io.IOException; import com.kingsrook.qqq.backend.core.exceptions.QInstanceValidationException; import com.kingsrook.qqq.backend.core.instances.QInstanceValidator; -import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationType; +import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType; -import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.model.session.QSession; import com.kingsrook.qqq.backend.core.modules.authentication.MockAuthenticationModule; +import com.kingsrook.qqq.backend.core.modules.authentication.metadata.QAuthenticationMetaData; import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.Cardinality; import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.RecordFormat; import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemBackendMetaData; @@ -135,7 +136,7 @@ public class TestUtils { return new QAuthenticationMetaData() .withName("mock") - .withType("mock"); + .withType(QAuthenticationType.MOCK); } @@ -219,9 +220,9 @@ public class TestUtils /******************************************************************************* ** *******************************************************************************/ - public static QSession getMockSession() + public static QSession getMockSession() throws QInstanceValidationException { MockAuthenticationModule mockAuthenticationModule = new MockAuthenticationModule(); - return (mockAuthenticationModule.createSession(null)); + return (mockAuthenticationModule.createSession(defineInstance(), null)); } } diff --git a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/model/metadata/FilesystemBackendMetaDataTest.java b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/model/metadata/FilesystemBackendMetaDataTest.java index 7c6515f6..e293c89a 100644 --- a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/model/metadata/FilesystemBackendMetaDataTest.java +++ b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/model/metadata/FilesystemBackendMetaDataTest.java @@ -70,8 +70,7 @@ class FilesystemBackendMetaDataTest String json = qInstanceAdapter.qInstanceToJsonIncludingBackend(qInstance); QInstance deserialized = qInstanceAdapter.jsonToQInstanceIncludingBackends(json); - assertThat(deserialized).usingRecursiveComparison() - .ignoringFields("hasBeenValidated") // note, this field is @JsonIgnore - .isEqualTo(qInstance); + assertThat(deserialized.getBackends()).usingRecursiveComparison() + .isEqualTo(qInstance.getBackends()); } } \ No newline at end of file diff --git a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/model/metadata/S3BackendMetaDataTest.java b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/model/metadata/S3BackendMetaDataTest.java index 58b57634..001fc6cb 100644 --- a/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/model/metadata/S3BackendMetaDataTest.java +++ b/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/model/metadata/S3BackendMetaDataTest.java @@ -70,8 +70,7 @@ class S3BackendMetaDataTest String json = qInstanceAdapter.qInstanceToJsonIncludingBackend(qInstance); QInstance deserialized = qInstanceAdapter.jsonToQInstanceIncludingBackends(json); - assertThat(deserialized).usingRecursiveComparison() - .ignoringFields("hasBeenValidated") // note, this field is @JsonIgnore - .isEqualTo(qInstance); + assertThat(deserialized.getBackends()).usingRecursiveComparison() + .isEqualTo(qInstance.getBackends()); } } \ No newline at end of file