From ce48933cbd16a8b38f3626826bffc19f7ff6d86b Mon Sep 17 00:00:00 2001 From: Tim Chamberlain Date: Fri, 23 Sep 2022 16:21:38 -0500 Subject: [PATCH] SPRINT-12: fixed style issue and broken tests --- .../core/actions/values/QValueFormatter.java | 40 +++++++++---------- .../QuickSightChartRendererTest.java | 32 +++++++++++++-- 2 files changed, 48 insertions(+), 24 deletions(-) diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/QValueFormatter.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/QValueFormatter.java index 16e92910..6f2574a5 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/QValueFormatter.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/QValueFormatter.java @@ -70,26 +70,6 @@ public class QValueFormatter - /******************************************************************************* - ** - *******************************************************************************/ - public String formatDate(LocalDate date) - { - return (dateFormatter.format(date)); - } - - - - /******************************************************************************* - ** - *******************************************************************************/ - public String formatDateTime(LocalDateTime dateTime) - { - return (dateTimeFormatter.format(dateTime)); - } - - - /******************************************************************************* ** *******************************************************************************/ @@ -149,6 +129,26 @@ public class QValueFormatter + /******************************************************************************* + ** + *******************************************************************************/ + public String formatDate(LocalDate date) + { + return (dateFormatter.format(date)); + } + + + + /******************************************************************************* + ** + *******************************************************************************/ + public String formatDateTime(LocalDateTime dateTime) + { + return (dateTimeFormatter.format(dateTime)); + } + + + /******************************************************************************* ** Make a string from a table's recordLabelFormat and fields, for a given record. *******************************************************************************/ diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/dashboard/QuickSightChartRendererTest.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/dashboard/QuickSightChartRendererTest.java index 415d849c..0a46d237 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/dashboard/QuickSightChartRendererTest.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/dashboard/QuickSightChartRendererTest.java @@ -25,6 +25,8 @@ package com.kingsrook.qqq.backend.core.actions.dashboard; import java.net.UnknownHostException; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.model.actions.widgets.RenderWidgetInput; +import com.kingsrook.qqq.backend.core.model.metadata.dashboard.QWidgetMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.dashboard.QuickSightChartMetaData; import com.kingsrook.qqq.backend.core.utils.TestUtils; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -42,7 +44,8 @@ class QuickSightChartRendererTest @Test void testWrongMetaDataClass() throws QException { - assertThatThrownBy(() -> new QuickSightChartRenderer().render(new RenderWidgetInput(TestUtils.defineInstance()))) + RenderWidgetInput input = getInput().withWidgetMetaData(new QWidgetMetaData()); + assertThatThrownBy(() -> new QuickSightChartRenderer().render(input)) .hasRootCauseInstanceOf(ClassCastException.class); } @@ -54,7 +57,8 @@ class QuickSightChartRendererTest @Test void testNoCredentials() throws QException { - assertThatThrownBy(() -> new QuickSightChartRenderer().render(new RenderWidgetInput(TestUtils.defineInstance()))) + RenderWidgetInput input = getInput().withWidgetMetaData(new QuickSightChartMetaData()); + assertThatThrownBy(() -> new QuickSightChartRenderer().render(input)) .hasRootCauseInstanceOf(NullPointerException.class); } @@ -66,8 +70,28 @@ class QuickSightChartRendererTest @Test void testBadCredentials() throws QException { - assertThatThrownBy(() -> new QuickSightChartRenderer().render(new RenderWidgetInput(TestUtils.defineInstance()) - )).hasRootCauseInstanceOf(UnknownHostException.class); + RenderWidgetInput input = getInput().withWidgetMetaData( + new QuickSightChartMetaData() + .withName("test") + .withAccessKey("FAIL") + .withSecretKey("FAIL") + .withRegion("FAIL") + .withAccountId("FAIL") + ); + assertThatThrownBy(() -> new QuickSightChartRenderer().render(input)) + .hasRootCauseInstanceOf(UnknownHostException.class); + } + + + + /******************************************************************************* + ** + *******************************************************************************/ + + private RenderWidgetInput getInput() + { + return (new RenderWidgetInput(TestUtils.defineInstance()).withSession(TestUtils.getMockSession())); + } }