don't mix assertNotNull with assertThat

codecentric · Nov 30, 2024 · 2d33998 · 2d33998
1 parent 0909bed
commit 2d33998
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...pring/boot/chaos/monkey/endpoints/ChaosMonkeyRequestScopeRestEndpointIntegrationTest.java b/...pring/boot/chaos/monkey/endpoints/ChaosMonkeyRequestScopeRestEndpointIntegrationTest.java
@@ -241,7 +241,7 @@ void getStatusIsEnabled() {
         ResponseEntity<ChaosMonkeyStatusResponseDto> result = testRestTemplate.getForEntity(baseUrl + "/status", ChaosMonkeyStatusResponseDto.class);
 
         assertThat(result.getStatusCode()).isEqualTo(HttpStatus.OK);
-        assertNotNull(result.getBody());
+        assertThat(result.getBody()).isNotNull();
         assertThat(result.getBody().isEnabled()).isTrue();
     }
 
@@ -252,7 +252,7 @@ void getStatusIsDisabled() {
         ResponseEntity<ChaosMonkeyStatusResponseDto> result = testRestTemplate.getForEntity(baseUrl + "/status", ChaosMonkeyStatusResponseDto.class);
 
         assertThat(result.getStatusCode()).isEqualTo(HttpStatus.OK);
-        assertNotNull(result.getBody());
+        assertThat(result.getBody()).isNotNull();
         assertThat(result.getBody().isEnabled()).isFalse();
     }
 
@@ -264,7 +264,7 @@ void postToEnableChaosMonkey() {
         ResponseEntity<ChaosMonkeyStatusResponseDto> result = testRestTemplate.postForEntity(baseUrl + "/enable", null,
                 ChaosMonkeyStatusResponseDto.class);
 
-        assertEquals(HttpStatus.OK, result.getStatusCode());
+        assertThat(result.getStatusCode()).isEqualTo(HttpStatus.OK);
         assertThat(Objects.requireNonNull(result.getBody()).isEnabled()).isTrue();
         assertThat(Objects.requireNonNull(result.getBody()).getEnabledAt()).isAfterOrEqualTo(enabledAt);
     }
@@ -275,7 +275,7 @@ void postToDisableChaosMonkey() {
         ResponseEntity<ChaosMonkeyStatusResponseDto> result = testRestTemplate.postForEntity(baseUrl + "/disable", null,
                 ChaosMonkeyStatusResponseDto.class);
 
-        assertEquals(HttpStatus.OK, result.getStatusCode());
+        assertThat(result.getStatusCode()).isEqualTo(HttpStatus.OK);
         assertThat(Objects.requireNonNull(result.getBody()).isEnabled()).isEqualTo(false);
         assertThat(Objects.requireNonNull(result.getBody()).getDisabledAt()).isNull();
     }
@@ -288,7 +288,7 @@ void postToDisableAfterEnableChaosMonkey() {
         ResponseEntity<ChaosMonkeyStatusResponseDto> result = testRestTemplate.postForEntity(baseUrl + "/disable", null,
                 ChaosMonkeyStatusResponseDto.class);
 
-        assertEquals(HttpStatus.OK, result.getStatusCode());
+        assertThat(result.getStatusCode()).isEqualTo(HttpStatus.OK);
         assertThat(Objects.requireNonNull(result.getBody()).isEnabled()).isEqualTo(false);
         assertThat(Objects.requireNonNull(result.getBody()).getDisabledAt()).isAfterOrEqualTo(disabledAt);
     }