From e8a3b79bc077707c131fc8c587b25b80a6ee6b51 Mon Sep 17 00:00:00 2001 From: "Ted M. Young" Date: Wed, 6 Mar 2024 15:04:40 -0800 Subject: [PATCH] =?UTF-8?q?Added=20swapping=20out=20of=20the=20Button=20fo?= =?UTF-8?q?r=20Waiting=20to=20Start=20state.=CB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/out/websocket/TimerToHtmlTransformer.java | 10 +++++++--- .../out/websocket/TimerToHtmlTransformerTest.java | 11 ++++++++--- .../jitterted/mobreg/domain/EnsembleTimerFactory.java | 6 +++++- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/jitterted/mobreg/adapter/out/websocket/TimerToHtmlTransformer.java b/src/main/java/com/jitterted/mobreg/adapter/out/websocket/TimerToHtmlTransformer.java index 934479b..0711b88 100644 --- a/src/main/java/com/jitterted/mobreg/adapter/out/websocket/TimerToHtmlTransformer.java +++ b/src/main/java/com/jitterted/mobreg/adapter/out/websocket/TimerToHtmlTransformer.java @@ -16,10 +16,14 @@ public static String htmlFor(EnsembleTimer ensembleTimer) { // language=html private static String htmlForWaitingToStart(EnsembleTimer ensembleTimer) { return """ - + + """.formatted(ensembleTimer.ensembleId().id()) + htmlForTimerContainer(ensembleTimer); } diff --git a/src/test/java/com/jitterted/mobreg/adapter/out/websocket/TimerToHtmlTransformerTest.java b/src/test/java/com/jitterted/mobreg/adapter/out/websocket/TimerToHtmlTransformerTest.java index 9937241..5333112 100644 --- a/src/test/java/com/jitterted/mobreg/adapter/out/websocket/TimerToHtmlTransformerTest.java +++ b/src/test/java/com/jitterted/mobreg/adapter/out/websocket/TimerToHtmlTransformerTest.java @@ -1,5 +1,6 @@ package com.jitterted.mobreg.adapter.out.websocket; +import com.jitterted.mobreg.domain.EnsembleId; import com.jitterted.mobreg.domain.EnsembleTimer; import com.jitterted.mobreg.domain.EnsembleTimerFactory; import org.junit.jupiter.api.Test; @@ -12,15 +13,19 @@ class TimerToHtmlTransformerTest { @Test void waitingToStartTimerHtmlIsCorrect() { - EnsembleTimer ensembleTimer = EnsembleTimerFactory.createTimerWith4MinuteDuration(); + EnsembleTimer ensembleTimer = EnsembleTimerFactory.createTimerWith4MinuteDurationAndIdOf(EnsembleId.of(57)); String timerHtml = TimerToHtmlTransformer.htmlFor(ensembleTimer); assertThat(timerHtml) .isEqualTo(""" - +
diff --git a/src/test/java/com/jitterted/mobreg/domain/EnsembleTimerFactory.java b/src/test/java/com/jitterted/mobreg/domain/EnsembleTimerFactory.java index 7a04ad5..91a80ac 100644 --- a/src/test/java/com/jitterted/mobreg/domain/EnsembleTimerFactory.java +++ b/src/test/java/com/jitterted/mobreg/domain/EnsembleTimerFactory.java @@ -21,7 +21,11 @@ public static Fixture create4MinuteTimerInFinishedState() { } public static EnsembleTimer createTimerWith4MinuteDuration() { - return new EnsembleTimer(IRRELEVANT_ENSEMBLE_ID, + return createTimerWith4MinuteDurationAndIdOf(IRRELEVANT_ENSEMBLE_ID); + } + + public static EnsembleTimer createTimerWith4MinuteDurationAndIdOf(EnsembleId ensembleId) { + return new EnsembleTimer(ensembleId, IRRELEVANT_NAME, List.of(IRRELEVANT_MEMBER_ID1, IRRELEVANT_MEMBER_ID2, IRRELEVANT_MEMBER_ID3), Duration.ofMinutes(4));