Paused and Resumed events are now sent (as audio elements) to the bro…

…wser.
jitterted · May 1, 2024 · 164ccef · 164ccef
1 parent c6bd254
commit 164ccef
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/src/main/java/com/jitterted/mobreg/application/EnsembleTimerHolder.java b/src/main/java/com/jitterted/mobreg/application/EnsembleTimerHolder.java
@@ -102,8 +102,8 @@ public boolean hasTimerFor(EnsembleId ensembleId) {
     public boolean isTimerRunningFor(EnsembleId ensembleId) {
         requireTimerToExistFor(ensembleId);
         return ensembleTimers
-                .get(ensembleId)
-                .state() == CountdownTimer.TimerState.RUNNING;
+                       .get(ensembleId)
+                       .state() == CountdownTimer.TimerState.RUNNING;
     }
 
     public void startTimerFor(EnsembleId ensembleId, Instant timeStarted) {
@@ -154,6 +154,7 @@ public void pauseTimerFor(EnsembleId ensembleId) {
 
         ensembleTimer.pause();
 
+        broadcaster.sendEvent(EnsembleTimer.TimerEvent.PAUSED);
         broadcaster.sendCurrentTimer(ensembleTimer);
     }
 
@@ -162,6 +163,7 @@ public void resumeTimerFor(EnsembleId ensembleId) {
 
         ensembleTimer.resume();
 
+        broadcaster.sendEvent(EnsembleTimer.TimerEvent.RESUMED);
         broadcaster.sendCurrentTimer(ensembleTimer);
     }
 

diff --git a/src/test/java/com/jitterted/mobreg/adapter/in/web/admin/EnsembleTimerHolderTest.java b/src/test/java/com/jitterted/mobreg/adapter/in/web/admin/EnsembleTimerHolderTest.java
@@ -224,7 +224,7 @@ void onTickWhileRunningBroadcastsCurrentTimerState() {
         }
 
         @Test
-        void onTimerPauseBroadcastsPauseState() {
+        void onTimerPauseBroadcastsPauseStateAndPausedEvent() {
             BroadcastFixture fixture = createBroadcasterWithStartedEnsembleTimer(
                     458,
                     CountdownTimer.TimerState.PAUSED,
@@ -235,10 +235,11 @@ void onTimerPauseBroadcastsPauseState() {
             fixture.ensembleTimerHolder().pauseTimerFor(EnsembleId.of(458));
 
             fixture.mockBroadcaster().verifyTimerStateSent();
+            fixture.mockBroadcaster().verifyPausedEventSent();
         }
 
         @Test
-        void onTimerResumeBroadcastsRunningState() {
+        void onTimerResumeBroadcastsRunningStateAndSendsResumedEvent() {
             BroadcastFixture fixture = createBroadcasterWithStartedEnsembleTimer(
                     218,
                     CountdownTimer.TimerState.RUNNING,
@@ -250,6 +251,7 @@ void onTimerResumeBroadcastsRunningState() {
             fixture.ensembleTimerHolder().resumeTimerFor(EnsembleId.of(218));
 
             fixture.mockBroadcaster().verifyTimerStateSent();
+            fixture.mockBroadcaster().verifyResumedEventSent();
         }
 
         @Test
@@ -364,6 +366,7 @@ void reset() {
                 lastState = null;
                 lastEnsembleId = null;
                 lastTimeRemaining = null;
+                lastEventSent = null;
             }
 
             private void verifyTimerStateSent() {
@@ -382,10 +385,22 @@ private void verifyTimerStateSent() {
             }
 
             public void verifyFinishedEventSent() {
+                verifyLastEventSent(EnsembleTimer.TimerEvent.FINISHED);
+            }
+
+            public void verifyPausedEventSent() {
+                verifyLastEventSent(EnsembleTimer.TimerEvent.PAUSED);
+            }
+
+            public void verifyResumedEventSent() {
+                verifyLastEventSent(EnsembleTimer.TimerEvent.RESUMED);
+            }
+
+            private void verifyLastEventSent(EnsembleTimer.TimerEvent timerEvent) {
                 assertThat(lastEventSent)
-                        .as("Expected last sendEvent() to be called with FINISHED, but wasn't.")
+                        .as("Expected last sendEvent() to be called with " + timerEvent + ", but wasn't.")
                         .isNotNull()
-                        .isEqualByComparingTo(EnsembleTimer.TimerEvent.FINISHED);
+                        .isEqualByComparingTo(timerEvent);
             }
         }
     }