From 247e419e0701367e7ae7d4399eba04ad208aa11a Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Fri, 9 Sep 2022 15:19:57 -0500 Subject: [PATCH] Updated for new assumptions re: fieldSection labels --- .../core/instances/QInstanceEnricherTest.java | 28 +++++++++++++++++-- .../instances/QInstanceValidatorTest.java | 5 ++-- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/instances/QInstanceEnricherTest.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/instances/QInstanceEnricherTest.java index c86e9fca..8da8bfc7 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/instances/QInstanceEnricherTest.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/instances/QInstanceEnricherTest.java @@ -24,10 +24,13 @@ package com.kingsrook.qqq.backend.core.instances; import java.util.ArrayList; import java.util.Collections; +import java.util.List; 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.tables.QFieldSection; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.tables.Tier; import com.kingsrook.qqq.backend.core.utils.TestUtils; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -96,6 +99,27 @@ class QInstanceEnricherTest + /******************************************************************************* + ** Test that a fieldSection missing a label gets the default label applied (name w/ UC-first). + ** + *******************************************************************************/ + @Test + public void test_nullFieldSectionLabelComesFromName() + { + QInstance qInstance = TestUtils.defineInstance(); + QTableMetaData personTable = qInstance.getTable("person"); + personTable.setSections(List.of(new QFieldSection() + .withName("test") + .withTier(Tier.T1) + .withFieldNames(new ArrayList<>(personTable.getFields().keySet())) + )); + + new QInstanceEnricher().enrich(qInstance); + assertEquals("Test", personTable.getSections().get(0).getLabel()); + } + + + /******************************************************************************* ** *******************************************************************************/ @@ -175,12 +199,12 @@ class QInstanceEnricherTest assertNull(table.getRecordLabelFormat()); qInstance = TestUtils.defineInstance(); - table = qInstance.getTable("person").withRecordLabelFormat(null).withRecordLabelFields("firstName"); + table = qInstance.getTable("person").withRecordLabelFormat(null).withRecordLabelFields("firstName"); new QInstanceEnricher().enrich(qInstance); assertEquals("%s", table.getRecordLabelFormat()); qInstance = TestUtils.defineInstance(); - table = qInstance.getTable("person").withRecordLabelFormat(null).withRecordLabelFields("firstName", "lastName"); + table = qInstance.getTable("person").withRecordLabelFormat(null).withRecordLabelFields("firstName", "lastName"); new QInstanceEnricher().enrich(qInstance); assertEquals("%s %s", table.getRecordLabelFormat()); } diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/instances/QInstanceValidatorTest.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/instances/QInstanceValidatorTest.java index 9a4e2f9e..47260de7 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/instances/QInstanceValidatorTest.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/instances/QInstanceValidatorTest.java @@ -46,8 +46,8 @@ import com.kingsrook.qqq.backend.core.model.metadata.possiblevalues.QPossibleVal import com.kingsrook.qqq.backend.core.model.metadata.possiblevalues.QPossibleValueSource; import com.kingsrook.qqq.backend.core.model.metadata.tables.QFieldSection; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; -import com.kingsrook.qqq.backend.core.model.metadata.tables.automation.TableAutomationAction; import com.kingsrook.qqq.backend.core.model.metadata.tables.Tier; +import com.kingsrook.qqq.backend.core.model.metadata.tables.automation.TableAutomationAction; import com.kingsrook.qqq.backend.core.utils.TestUtils; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -479,7 +479,7 @@ class QInstanceValidatorTest .withBackendName(TestUtils.DEFAULT_BACKEND_NAME) .withSection(new QFieldSection("section1", null, new QIcon("person"), Tier.T1, List.of("id"))) .withField(new QFieldMetaData("id", QFieldType.INTEGER)); - assertValidationFailureReasons((qInstance) -> qInstance.addTable(table), "Missing a label"); + assertValidationSuccess((qInstance) -> qInstance.addTable(table)); } @@ -825,6 +825,7 @@ class QInstanceValidatorTest } + /******************************************************************************* ** *******************************************************************************/