Maintenance/use more junit5 features

chaos-monkey-spring-boot/src/test/java/de/codecentric/spring/boot/chaos/monkey/ChaosDemoApplicationDefaultProfileTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,54 +15,42 @@
  */
 package de.codecentric.spring.boot.chaos.monkey;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import de.codecentric.spring.boot.chaos.monkey.component.ChaosMonkeyRequestScope;
+import de.codecentric.spring.boot.chaos.monkey.configuration.AssaultProperties;
+import de.codecentric.spring.boot.chaos.monkey.configuration.WatcherProperties;
 import de.codecentric.spring.boot.demo.chaos.monkey.ChaosDemoApplication;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.core.env.Environment;
 import org.springframework.test.context.TestPropertySource;
 
 /** @author Benjamin Wilms */
 @SpringBootTest(classes = ChaosDemoApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @TestPropertySource("classpath:application-test-default-profile.properties")
 class ChaosDemoApplicationDefaultProfileTest {
-
-    @Autowired(required = false)
-    private ChaosMonkeyRequestScope chaosMonkeyRequestScope;
-
     @Autowired
-    private Environment env;
+    private AssaultProperties assaultProperties;
 
-    @Test
-    void contextLoads() {
-        assertNull(chaosMonkeyRequestScope);
-    }
+    @Autowired
+    private WatcherProperties watcherProperties;
 
     @Test
     void checkEnvWatcherController() {
-        assertThat(env.getProperty("chaos.monkey.watcher.controller")).isEqualTo("true");
-    }
-
-    @Test
-    void checkEnvAssaultLatencyRangeStart() {
-        assertThat(env.getProperty("chaos.monkey.assaults.latency-range-start")).isEqualTo("100");
+        assertTrue(watcherProperties.isController());
     }
 
     @Test
-    void checkEnvAssaultLatencyRangeEnd() {
-        assertThat(env.getProperty("chaos.monkey.assaults.latency-range-end")).isEqualTo("200");
+    void checkEnvAssaultLatencyRange() {
+        assertAll(() -> assertEquals(100, assaultProperties.getLatencyRangeStart()), () -> assertEquals(200, assaultProperties.getLatencyRangeEnd()));
     }
 
     @Test
     void checkEnvCustomServiceWatcherList() {
-        List<String> stringList = env.getProperty("chaos.monkey.assaults.watchedCustomServices", List.class);
-        assertThat(stringList).hasSize(2);
-        assertThat(stringList.get(0)).isEqualTo("com.example.chaos.monkey.chaosdemo.controller.HelloController.sayHello");
-        assertThat(stringList.get(1)).isEqualTo("com.example.chaos.monkey.chaosdemo.controller.HelloController.sayGoodbye");
+        assertEquals(List.of("com.example.chaos.monkey.chaosdemo.controller.HelloController.sayHello",
+                "com.example.chaos.monkey.chaosdemo.controller.HelloController.sayGoodbye"), assaultProperties.getWatchedCustomServices());
     }
 }

chaos-monkey-spring-boot/src/test/java/de/codecentric/spring/boot/chaos/monkey/assaults/LatencyAssaultRangeTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,67 +16,60 @@
 package de.codecentric.spring.boot.chaos.monkey.assaults;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 import de.codecentric.spring.boot.chaos.monkey.component.MetricEventPublisher;
 import de.codecentric.spring.boot.chaos.monkey.component.MetricType;
 import de.codecentric.spring.boot.chaos.monkey.configuration.AssaultProperties;
 import de.codecentric.spring.boot.chaos.monkey.configuration.ChaosMonkeySettings;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.assertj.core.api.AbstractIntegerAssert;
+
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
+import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.context.ApplicationEventPublisher;
 
 @ExtendWith(MockitoExtension.class)
 class LatencyAssaultRangeTest {
+    ChaosMonkeySettings chaosMonkeySettings;
 
     @Captor
-    private ArgumentCaptor<AtomicInteger> captorTimeoutValue;
+    ArgumentCaptor<AtomicInteger> captorTimeoutValue;
 
-    @Test
-    void fixedLatencyIsPossible() {
-        final int fixedLatency = 1000;
+    @Mock
+    MetricEventPublisher metricEventPublisher;
 
-        assertThatLatencyConfiguration(fixedLatency, fixedLatency).isEqualTo(fixedLatency);
+    @BeforeEach
+    void setUp() {
+        this.chaosMonkeySettings = new ChaosMonkeySettings();
+        AssaultProperties assaultProperties = new AssaultProperties();
+        assaultProperties.setLatencyRangeStart(1000);
+        chaosMonkeySettings.setAssaultProperties(assaultProperties);
     }
 
     @Test
-    void latencyRangeIsPossible() {
-        final int latencyRangeStart = 1000;
-        final int latencyRangeEnd = 5000;
-
-        assertThatLatencyConfiguration(latencyRangeStart, latencyRangeEnd).isBetween(latencyRangeStart, latencyRangeEnd);
-    }
-
-    private AbstractIntegerAssert<?> assertThatLatencyConfiguration(int latencyRangeStart, int latencyRangeEnd) {
-        final AssaultProperties assaultProperties = new AssaultProperties();
-        assaultProperties.setLatencyRangeStart(latencyRangeStart);
-        assaultProperties.setLatencyRangeEnd(latencyRangeEnd);
+    void fixedLatencyIsPossible() {
+        chaosMonkeySettings.getAssaultProperties().setLatencyRangeEnd(1000);
 
-        final ChaosMonkeySettings chaosMonkeySettings = mock(ChaosMonkeySettings.class);
-        when(chaosMonkeySettings.getAssaultProperties()).thenReturn(assaultProperties);
+        LatencyAssault latencyAssault = new LatencyAssault(chaosMonkeySettings, metricEventPublisher);
+        latencyAssault.attack();
 
-        final ApplicationEventPublisher publisher = mock(ApplicationEventPublisher.class);
-        doNothing().when(publisher).publishEvent(any(ApplicationEvent.class));
+        verify(metricEventPublisher).publishMetricEvent(eq(MetricType.LATENCY_ASSAULT), captorTimeoutValue.capture());
+        assertThat(captorTimeoutValue.getValue().get()).isEqualTo(1000);
+    }
 
-        final MetricEventPublisher metricEventPublisher = spy(new MetricEventPublisher());
-        metricEventPublisher.setApplicationEventPublisher(publisher);
+    @Test
+    void latencyRangeIsPossible() {
+        chaosMonkeySettings.getAssaultProperties().setLatencyRangeEnd(5000);
 
-        final LatencyAssault latencyAssault = new LatencyAssault(chaosMonkeySettings, metricEventPublisher);
+        LatencyAssault latencyAssault = new LatencyAssault(chaosMonkeySettings, metricEventPublisher);
         latencyAssault.attack();
 
         verify(metricEventPublisher).publishMetricEvent(eq(MetricType.LATENCY_ASSAULT), captorTimeoutValue.capture());
-        return assertThat(captorTimeoutValue.getValue().get());
+        assertThat(captorTimeoutValue.getValue().get()).isBetween(1000, 5000);
     }
 }

chaos-monkey-spring-boot/src/test/java/de/codecentric/spring/boot/chaos/monkey/assaults/LatencyAssaultTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package de.codecentric.spring.boot.chaos.monkey.assaults;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.when;
 
+import de.codecentric.spring.boot.chaos.monkey.component.MetricEventPublisher;
 import de.codecentric.spring.boot.chaos.monkey.configuration.AssaultProperties;
 import de.codecentric.spring.boot.chaos.monkey.configuration.ChaosMonkeySettings;
 import org.junit.jupiter.api.Test;
@@ -29,32 +29,23 @@
 @ExtendWith(MockitoExtension.class)
 class LatencyAssaultTest {
 
-    @Mock
-    private ChaosMonkeySettings chaosMonkeySettings;
-
-    @Mock
-    private AssaultProperties assaultProperties;
-
     @Test
-    void threadSleepHasBeenCalled() {
-        int latencyRangeStart = 100;
-        int latencyRangeEnd = 200;
-        TestLatencyAssaultExecutor executor = new TestLatencyAssaultExecutor();
+    void threadSleepHasBeenCalled(@Mock MetricEventPublisher publisher) {
+        AssaultProperties assaultProperties = new AssaultProperties();
+        assaultProperties.setLatencyRangeStart(100);
+        assaultProperties.setLatencyRangeEnd(200);
+        ChaosMonkeySettings chaosMonkeySettings = new ChaosMonkeySettings();
+        chaosMonkeySettings.setAssaultProperties(assaultProperties);
 
-        when(assaultProperties.getLatencyRangeStart()).thenReturn(latencyRangeStart);
-        when(assaultProperties.getLatencyRangeEnd()).thenReturn(latencyRangeEnd);
-        when(chaosMonkeySettings.getAssaultProperties()).thenReturn(assaultProperties);
-
-        LatencyAssault latencyAssault = new LatencyAssault(chaosMonkeySettings, null, executor);
+        TestLatencyAssaultExecutor executor = new TestLatencyAssaultExecutor();
+        LatencyAssault latencyAssault = new LatencyAssault(chaosMonkeySettings, publisher, executor);
         latencyAssault.attack();
 
         assertTrue(executor.executed);
-        String assertionMessage = "Latency not in range 100-200, actual latency: " + executor.duration;
-        assertTrue(executor.duration >= latencyRangeStart, assertionMessage);
-        assertTrue(executor.duration <= latencyRangeEnd, assertionMessage);
+        assertTrue(executor.duration >= 100 && executor.duration <= 200, "Latency not in range 100-200, actual latency: " + executor.duration);
     }
 
-    class TestLatencyAssaultExecutor implements ChaosMonkeyLatencyAssaultExecutor {
+    static class TestLatencyAssaultExecutor implements ChaosMonkeyLatencyAssaultExecutor {
 
         private long duration;
 

chaos-monkey-spring-boot/src/test/java/de/codecentric/spring/boot/chaos/monkey/component/ChaosMonkeyRequestScopeTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -100,7 +100,7 @@ void allAssaultsActiveExpectLatencyAttack() {
 
             chaosMonkeyRequestScope.callChaosMonkey(null, null);
 
-            verify(latencyAssault, times(1)).attack();
+            verify(latencyAssault).attack();
         }
 
         @Test
@@ -111,7 +111,7 @@ void allAssaultsActiveExpectExceptionAttack() {
 
             chaosMonkeyRequestScope.callChaosMonkey(null, null);
 
-            verify(exceptionAssault, times(1)).attack();
+            verify(exceptionAssault).attack();
         }
 
         @Test
@@ -121,7 +121,7 @@ void isLatencyAssaultActive() {
 
             chaosMonkeyRequestScope.callChaosMonkey(null, null);
 
-            verify(latencyAssault, times(1)).attack();
+            verify(latencyAssault).attack();
         }
 
         @Test
@@ -131,7 +131,7 @@ void isExceptionAssaultActive() {
 
             chaosMonkeyRequestScope.callChaosMonkey(null, null);
 
-            verify(exceptionAssault, times(1)).attack();
+            verify(exceptionAssault).attack();
         }
 
         @Test
@@ -142,7 +142,7 @@ void isExceptionAndLatencyAssaultActiveExpectExceptionAttack() {
 
             chaosMonkeyRequestScope.callChaosMonkey(null, null);
 
-            verify(exceptionAssault, times(1)).attack();
+            verify(exceptionAssault).attack();
         }
 
         @Test
@@ -154,7 +154,7 @@ void isExceptionAndLatencyAssaultActiveExpectLatencyAttack() {
 
             chaosMonkeyRequestScope.callChaosMonkey(null, null);
 
-            verify(latencyAssault, times(1)).attack();
+            verify(latencyAssault).attack();
         }
 
         @Test
@@ -164,7 +164,7 @@ void isExceptionActiveExpectExceptionAttack() {
 
             chaosMonkeyRequestScope.callChaosMonkey(null, null);
 
-            verify(exceptionAssault, times(1)).attack();
+            verify(exceptionAssault).attack();
         }
 
         @Test
@@ -174,7 +174,7 @@ void isLatencyActiveExpectLatencyAttack() {
 
             chaosMonkeyRequestScope.callChaosMonkey(null, null);
 
-            verify(latencyAssault, times(1)).attack();
+            verify(latencyAssault).attack();
         }
 
         @Test
@@ -221,7 +221,7 @@ void chaosMonkeyIsCalledWhenServiceIsWatched() {
 
             chaosMonkeyRequestScope.callChaosMonkey(null, customService);
 
-            verify(latencyAssault, times(1)).attack();
+            verify(latencyAssault).attack();
             verify(exceptionAssault, never()).attack();
         }
 
@@ -238,7 +238,7 @@ void chaosMonkeyIsCalledWhenServiceIsWatchedWhenSimpleNameIsMethodReference() {
             String simpleName = customRepository + ".findAll";
             chaosMonkeyRequestScope.callChaosMonkey(null, simpleName);
 
-            verify(latencyAssault, times(1)).attack();
+            verify(latencyAssault).attack();
             verify(exceptionAssault, never()).attack();
         }
 
@@ -255,7 +255,7 @@ void chaosMonkeyIsCalledWhenServiceIsWatchedWhenSimpleNameIsPackageReference() {
             String simpleName = packageName + "CrudRepository.findAll";
             chaosMonkeyRequestScope.callChaosMonkey(null, simpleName);
 
-            verify(latencyAssault, times(1)).attack();
+            verify(latencyAssault).attack();
             verify(exceptionAssault, never()).attack();
         }
 
@@ -292,6 +292,6 @@ void assaultShouldBeDeterministicIfConfigured() {
         customScope.callChaosMonkey(null, "foo");
         verify(customAssault, never()).attack();
         customScope.callChaosMonkey(null, "foo");
-        verify(customAssault, times(1)).attack();
+        verify(customAssault).attack();
     }
 }