Merge remote-tracking branch 'origin/maintenance/integration-test-refactor' into maintenance/integration-test-refactor

Author: csikb

README.md

@@ -1,5 +1,6 @@
 # RobonAUT Server
 ![CircleCI](https://circleci.com/gh/BSStudio/robonaut-server/tree/main.svg?style=svg)
+[![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=BSStudio/robonaut-server)](https://dependabot.com)
 ***
 [RobonAUT](http://robonaut.aut.bme.hu/) is an annual robot competition organized by the Faculty of Electrical Engineering and Informatics of Budapest University of Technology and Economics, dating back more than a decade.
 The event is livestreamed by BSS, one of the university student-operated video studios.
@@ -41,4 +42,5 @@ The required environment variables can be found here:
 For MongoDB and RabbitMQ specific variables visit Spring Boot documentations.
 
 ## Documentation
-To access the documentation run the application and navigate to the root `/`.
+
+To access the documentation run the application and navigate to `http://localhost:8080/`.

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id 'org.springframework.boot' version '2.4.1' apply false
-    id 'io.spring.dependency-management' version '1.0.10.RELEASE' apply false
+    id 'org.springframework.boot' version '2.4.2' apply false
+    id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
     id 'java'
     id 'idea'
     id 'checkstyle'

messaging/src/main/java/hu/bsstudio/robonaut/configuration/RabbitConfiguration.java

@@ -56,7 +56,7 @@ public Jackson2JsonMessageConverter jackson2JsonMessageConverter() {
     }
 
     @Bean
-    public ConnectionNameStrategy cns() {
+    public ConnectionNameStrategy connectionNameStrategy() {
         return new SimplePropertyValueConnectionNameStrategy("spring.application.name");
     }
 }

service/src/main/java/hu/bsstudio/robonaut/race/speed/timer/BroadcastingSpeedTimerService.java

@@ -17,8 +17,8 @@ public class BroadcastingSpeedTimerService implements SpeedTimerService {
     private final SpeedTimerService service;
 
     @Override
-    public Mono<SpeedTimer> startTimer() {
-        return service.startTimer()
+    public Mono<SpeedTimer> startTimer(final SpeedTimer speedTimer) {
+        return service.startTimer(speedTimer)
             .doOnNext(this::sendTimerInformation);
     }
 

service/src/main/java/hu/bsstudio/robonaut/race/speed/timer/DefaultSpeedTimerService.java

@@ -8,16 +8,15 @@
 @RequiredArgsConstructor
 public class DefaultSpeedTimerService implements SpeedTimerService {
 
-    private static final int TIMER_INITIAL_VALUE = 0;
-
     @Override
-    public Mono<SpeedTimer> startTimer() {
-        return Mono.just(new SpeedTimer(TIMER_INITIAL_VALUE, TimerAction.START));
+    public Mono<SpeedTimer> startTimer(final SpeedTimer speedTimer) {
+        return Mono.just(speedTimer)
+            .filter(timer -> timer.getTimerAction() == TimerAction.START);
     }
 
     @Override
     public Mono<SpeedTimer> stopTimerAt(final SpeedTimer speedTimer) {
         return Mono.just(speedTimer)
-            .filter(timer -> timer.getTimerAction().equals(TimerAction.STOP));
+            .filter(timer -> timer.getTimerAction() == TimerAction.STOP);
     }
 }

service/src/main/java/hu/bsstudio/robonaut/race/speed/timer/SpeedTimerService.java

@@ -4,7 +4,7 @@
 import reactor.core.publisher.Mono;
 
 public interface SpeedTimerService {
-    Mono<SpeedTimer> startTimer();
+    Mono<SpeedTimer> startTimer(final SpeedTimer speedTimer);
 
     Mono<SpeedTimer> stopTimerAt(final SpeedTimer speedTimer);
 }

service/src/test/java/hu/bsstudio/robonaut/race/speed/timer/BroadcastingSpeedTimerServiceTest.java

@@ -32,10 +32,10 @@ void setUp() {
 
     @Test
     void shouldReturnSpeedTimerFromUnderLyingServiceAndSendItWhenTimerIsStarted() {
-        when(mockService.startTimer())
+        when(mockService.startTimer(SPEED_TIMER))
             .thenReturn(Mono.just(SPEED_TIMER));
 
-        final var result = underTest.startTimer();
+        final var result = underTest.startTimer(SPEED_TIMER);
 
         StepVerifier.create(result)
             .expectNext(SPEED_TIMER)

service/src/test/java/hu/bsstudio/robonaut/race/speed/timer/DefaultSpeedTimerServiceTest.java

@@ -8,6 +8,9 @@
 
 final class DefaultSpeedTimerServiceTest {
 
+    private static final SpeedTimer SPEED_TIMER_START = new SpeedTimer(2020, TimerAction.START);
+    private static final SpeedTimer SPEED_TIMER_STOP = new SpeedTimer(2020, TimerAction.STOP);
+
     private DefaultSpeedTimerService underTest;
 
     @BeforeEach
@@ -16,30 +19,38 @@ void setUp() {
     }
 
     @Test
-    void shouldReturnTimerWithZeroInitialValueWhenTimerIsStarted() {
-        final var result = underTest.startTimer();
+    void shouldReturnTimerOnStart() {
+
+        final var result = underTest.startTimer(SPEED_TIMER_START);
+
+        StepVerifier.create(result)
+            .expectNext(SPEED_TIMER_START)
+            .verifyComplete();
+    }
+
+    @Test
+    void shouldReturnEmptyWhenActionDoesNotMatchOnStart() {
+
+        final var result = underTest.startTimer(SPEED_TIMER_STOP);
 
         StepVerifier.create(result)
-            .expectNext(new SpeedTimer(0, TimerAction.START))
             .verifyComplete();
     }
 
     @Test
     void shouldReturnTimerOnStop() {
-        final var speedTimer = new SpeedTimer(2020, TimerAction.STOP);
 
-        final var result = underTest.stopTimerAt(speedTimer);
+        final var result = underTest.stopTimerAt(SPEED_TIMER_STOP);
 
         StepVerifier.create(result)
-            .expectNext(speedTimer)
+            .expectNext(SPEED_TIMER_STOP)
             .verifyComplete();
     }
 
     @Test
-    void shouldReturnEmptyWhenActionDoesNotMatch() {
-        final var speedTimer = new SpeedTimer(2020, TimerAction.START);
+    void shouldReturnEmptyWhenActionDoesNotMatchOnStop() {
 
-        final var result = underTest.stopTimerAt(speedTimer);
+        final var result = underTest.stopTimerAt(SPEED_TIMER_START);
 
         StepVerifier.create(result)
             .verifyComplete();

web/src/main/java/hu/bsstudio/robonaut/speed/StartSpeedTimerHandler.java

@@ -17,7 +17,8 @@ public class StartSpeedTimerHandler implements HandlerFunction<ServerResponse> {
 
     @Override
     public Mono<ServerResponse> handle(final ServerRequest request) {
-        final var speedTimer = service.startTimer();
+        final var speedTimer = request.bodyToMono(SpeedTimer.class)
+            .flatMap(service::startTimer);
         return ServerResponse.ok().body(speedTimer, SpeedTimer.class);
     }
 }