Maintenance/use more junit5 features

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

@@ -15,54 +15,47 @@
  */
 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/LatencyAssaultTest.java

@@ -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

@@ -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();
     }
 }

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

@@ -85,7 +85,7 @@ void shouldNotScheduleNewTasksAfterUnrelatedUpdate() {
         when(registrar.scheduleCronTask(any())).thenReturn(oldTask);
 
         ChaosMonkeyScheduler cms = new ChaosMonkeyScheduler(registrar, config, Collections.singletonList(memoryAssault));
-        verify(registrar, times(1)).scheduleCronTask(argThat(hasScheduleLike(schedule)));
+        verify(registrar).scheduleCronTask(argThat(hasScheduleLike("*/1 * * * * ?")));
 
         reset(registrar);
 

chaos-monkey-spring-boot/src/test/java/de/codecentric/spring/boot/chaos/monkey/configuration/toggles/DefaultChaosToggleNameMapperTest.java

@@ -32,11 +32,11 @@ public void setup() {
 
     @Test
     public void chaosTypeCanBeNull() {
-        assertEquals(sut.mapName(null, "com.example.MyController.hello"), "toggle.prefix.unknown");
+        assertEquals("toggle.prefix.unknown", sut.mapName(null, "com.example.MyController.hello"));
     }
 
     @Test
     public void chaosTypeNameIsUsedAsSuffix() {
-        assertEquals(sut.mapName(ChaosTarget.REPOSITORY, "com.example.MyController.hello"), "toggle.prefix.repository");
+        assertEquals("toggle.prefix.repository", sut.mapName(ChaosTarget.REPOSITORY, "com.example.MyController.hello"));
     }
 }

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

@@ -19,7 +19,6 @@
 
 import de.codecentric.spring.boot.chaos.monkey.configuration.ChaosMonkeySettings;
 import de.codecentric.spring.boot.demo.chaos.monkey.ChaosDemoApplication;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -34,21 +33,9 @@
 @TestPropertySource("classpath:test-chaos-monkey-endpoints-disabled.properties")
 class ChaosMonkeyRequestScopeRestEndpointDisabledIntegrationTest {
 
-    @LocalServerPort
-    private int serverPort;
-
-    @Autowired
-    private TestRestTemplate testRestTemplate;
-
-    private String baseUrl;
-
-    @BeforeEach
-    void setUp() {
-        baseUrl = "http://localhost:" + this.serverPort + "/actuator/chaosmonkey";
-    }
-
     @Test
-    void getConfiguration() {
+    void getConfiguration(@LocalServerPort int serverPort, @Autowired TestRestTemplate testRestTemplate) {
+        String baseUrl = "http://localhost:" + serverPort + "/actuator/chaosmonkey";
         ResponseEntity<ChaosMonkeySettings> chaosMonkeySettingsResult = testRestTemplate.getForEntity(baseUrl, ChaosMonkeySettings.class);
 
         assertEquals(HttpStatus.NOT_FOUND, chaosMonkeySettingsResult.getStatusCode());

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

@@ -45,10 +45,6 @@
 @SpringBootTest(classes = ChaosDemoApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @TestPropertySource("classpath:application-test-chaos-monkey-profile.properties")
 class ChaosMonkeyRequestScopeRestEndpointIntegrationTest {
-
-    @LocalServerPort
-    private int serverPort;
-
     @Autowired
     private ChaosMonkeySettings chaosMonkeySettings;
 
@@ -60,8 +56,8 @@ class ChaosMonkeyRequestScopeRestEndpointIntegrationTest {
     private String baseUrl;
 
     @BeforeEach
-    void setUp() {
-        baseUrl = "http://localhost:" + this.serverPort + "/actuator/chaosmonkey";
+    void setUp(@LocalServerPort int serverPort) {
+        baseUrl = "http://localhost:" + serverPort + "/actuator/chaosmonkey";
         objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
     }
 

chaos-monkey-spring-boot/src/test/java/de/codecentric/spring/boot/chaos/monkey/watcher/advice/ChaosMonkeyDefaultAdviceTest.java

@@ -26,7 +26,6 @@
 import de.codecentric.spring.boot.chaos.monkey.component.ChaosTarget;
 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.WatcherProperties;
 import de.codecentric.spring.boot.demo.chaos.monkey.component.DemoComponent;
 import org.aopalliance.aop.Advice;
 import org.junit.jupiter.api.BeforeEach;

chaos-monkey-spring-boot/src/test/java/de/codecentric/spring/boot/chaos/monkey/watcher/advice/ChaosMonkeyPointcutAdvisorIntegrationTest.java

@@ -16,7 +16,7 @@
 package de.codecentric.spring.boot.chaos.monkey.watcher.advice;
 
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
 import de.codecentric.spring.boot.chaos.monkey.component.ChaosMonkeyRequestScope;
@@ -84,15 +84,15 @@ class ChaosMonkeyPointcutAdvisorIntegrationTest {
     @Test
     public void chaosMonkeyIsCalledWhenComponentIsNotFinal() {
         demoComponent.sayHello();
-        verify(chaosMonkeyRequestScopeMock, times(1)).callChaosMonkey(ChaosTarget.COMPONENT, demoComponentSimpleName);
-        verify(metricsMock, times(1)).publishMetricEvent(demoComponentPointcutName, MetricType.COMPONENT);
+        verify(chaosMonkeyRequestScopeMock).callChaosMonkey(ChaosTarget.COMPONENT, demoComponentSimpleName);
+        verify(metricsMock).publishMetricEvent(demoComponentPointcutName, MetricType.COMPONENT);
     }
 
     @Test
     public void chaosMonkeyIsNotCalledWhenComponentIsFinal() {
         finalDemoComponent.sayHello();
-        verify(chaosMonkeyRequestScopeMock, times(0)).callChaosMonkey(ChaosTarget.COMPONENT, finalDemoComponentSimpleName);
-        verify(metricsMock, times(0)).publishMetricEvent(finalDemoComponentPointcutName, MetricType.COMPONENT);
+        verify(chaosMonkeyRequestScopeMock, never()).callChaosMonkey(ChaosTarget.COMPONENT, finalDemoComponentSimpleName);
+        verify(metricsMock, never()).publishMetricEvent(finalDemoComponentPointcutName, MetricType.COMPONENT);
     }
 
     @Test
@@ -101,16 +101,16 @@ public void chaosMonkeyDoesNotProxyIgnoredSpringInterfaces() {
         applicationListenerComponent.onApplicationEvent(mock(ApplicationEvent.class));
         factoryBeanComponent.getObject();
 
-        verify(chaosMonkeyRequestScopeMock, times(0)).callChaosMonkey(null, beanPostProcessorComponentSimpleName);
-        verify(metricsMock, times(0)).publishMetricEvent(beanPostProcessorComponentPointcutName, MetricType.COMPONENT);
+        verify(chaosMonkeyRequestScopeMock, never()).callChaosMonkey(null, beanPostProcessorComponentSimpleName);
+        verify(metricsMock, never()).publishMetricEvent(beanPostProcessorComponentPointcutName, MetricType.COMPONENT);
 
-        verify(chaosMonkeyRequestScopeMock, times(0)).callChaosMonkey(null, applicationListenerComponentSimpleName);
-        verify(metricsMock, times(0)).publishMetricEvent(applicationListenerComponentPointcutName, MetricType.COMPONENT);
+        verify(chaosMonkeyRequestScopeMock, never()).callChaosMonkey(null, applicationListenerComponentSimpleName);
+        verify(metricsMock, never()).publishMetricEvent(applicationListenerComponentPointcutName, MetricType.COMPONENT);
 
-        verify(chaosMonkeyRequestScopeMock, times(0)).callChaosMonkey(null, beanFactorySingletonComponentSimpleName);
-        verify(chaosMonkeyRequestScopeMock, times(0)).callChaosMonkey(null, beanFactoryObjectTypeComponentSimpleName);
-        verify(metricsMock, times(0)).publishMetricEvent(beanFactorySingletonComponentPointcutName, MetricType.COMPONENT);
-        verify(metricsMock, times(0)).publishMetricEvent(beanFactoryObjectTypeComponentPointcutName, MetricType.COMPONENT);
+        verify(chaosMonkeyRequestScopeMock, never()).callChaosMonkey(null, beanFactorySingletonComponentSimpleName);
+        verify(chaosMonkeyRequestScopeMock, never()).callChaosMonkey(null, beanFactoryObjectTypeComponentSimpleName);
+        verify(metricsMock, never()).publishMetricEvent(beanFactorySingletonComponentPointcutName, MetricType.COMPONENT);
+        verify(metricsMock, never()).publishMetricEvent(beanFactoryObjectTypeComponentPointcutName, MetricType.COMPONENT);
     }
 
     @Configuration

chaos-monkey-spring-boot/src/test/java/de/codecentric/spring/boot/chaos/monkey/watcher/advice/SpringBootHealthIndicatorAdviceIntegrationTest.java

@@ -40,9 +40,7 @@ class HealthIndicatorEnabledIntegrationTest {
 
         @Test
         public void testIndicatorsAreDown() {
-            this.healthIndicators.forEach(healthIndicator -> {
-                assertThat(healthIndicator.getHealth(Boolean.TRUE).getStatus()).isEqualTo(Health.down().build().getStatus());
-            });
+            healthIndicators.forEach(healthIndicator -> assertThat(healthIndicator.getHealth(Boolean.TRUE).getStatus()).isEqualTo(Health.down().build().getStatus()));
         }
     }
 
@@ -57,9 +55,7 @@ class HealthIndicatorDisabledIntegrationTest {
 
         @Test
         public void testIndicatorsAreUp() {
-            this.healthIndicators.forEach(healthIndicator -> {
-                assertThat(healthIndicator.getHealth(Boolean.TRUE).getStatus()).isEqualTo(Health.up().build().getStatus());
-            });
+            healthIndicators.forEach(healthIndicator -> assertThat(healthIndicator.getHealth(Boolean.TRUE).getStatus()).isEqualTo(Health.up().build().getStatus()));
         }
     }
 }