diff --git a/cameleer-server-app/src/test/java/com/cameleer/server/app/controller/ApplicationConfigControllerIT.java b/cameleer-server-app/src/test/java/com/cameleer/server/app/controller/ApplicationConfigControllerIT.java index e518c94f..2cd134eb 100644 --- a/cameleer-server-app/src/test/java/com/cameleer/server/app/controller/ApplicationConfigControllerIT.java +++ b/cameleer-server-app/src/test/java/com/cameleer/server/app/controller/ApplicationConfigControllerIT.java @@ -16,7 +16,10 @@ import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.annotation.DirtiesContext.ClassMode; +import java.util.List; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; @@ -25,6 +28,7 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; +@DirtiesContext(classMode = ClassMode.AFTER_CLASS) class ApplicationConfigControllerIT extends AbstractPostgresIT { /** @@ -158,6 +162,10 @@ class ApplicationConfigControllerIT extends AbstractPostgresIT { void putConfig_unknownApplyValue_returns400() { ResponseEntity response = putConfig("BOGUS"); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST); + + int auditCount = jdbcTemplate.queryForObject( + "SELECT COUNT(*) FROM audit_log WHERE target = ?", Integer.class, appSlug); + assertThat(auditCount).isZero(); } @Test @@ -168,10 +176,11 @@ class ApplicationConfigControllerIT extends AbstractPostgresIT { assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); - String action = jdbcTemplate.queryForObject( - "SELECT action FROM audit_log WHERE target = ? ORDER BY timestamp DESC LIMIT 1", + List actions = jdbcTemplate.queryForList( + "SELECT action FROM audit_log WHERE target = ? ORDER BY timestamp DESC", String.class, appSlug); - assertThat(action).isEqualTo("stage_app_config"); + assertThat(actions).hasSize(1); + assertThat(actions.get(0)).isEqualTo("stage_app_config"); } @Test @@ -182,9 +191,10 @@ class ApplicationConfigControllerIT extends AbstractPostgresIT { assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); - String action = jdbcTemplate.queryForObject( - "SELECT action FROM audit_log WHERE target = ? ORDER BY timestamp DESC LIMIT 1", + List actions = jdbcTemplate.queryForList( + "SELECT action FROM audit_log WHERE target = ? ORDER BY timestamp DESC", String.class, appSlug); - assertThat(action).isEqualTo("update_app_config"); + assertThat(actions).hasSize(1); + assertThat(actions.get(0)).isEqualTo("update_app_config"); } }