From bcbb3a0926c4bbc8df34876b5aba040896573a23 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Sun, 13 Jul 2025 18:17:48 +0200 Subject: [PATCH] test: use assertDoesNotThrow instead of try-catch-fail for createFull() --- .../connector/model/response/AppRoleResponseTest.java | 11 ++++------- .../model/response/AuthMethodsResponseTest.java | 11 ++++------- .../connector/model/response/AuthResponseTest.java | 11 ++++------- .../model/response/CredentialsResponseTest.java | 11 ++++------- .../connector/model/response/ErrorResponseTest.java | 11 ++++------- .../connector/model/response/HealthResponseTest.java | 11 ++++------- .../connector/model/response/HelpResponseTest.java | 11 ++++------- .../model/response/MetaSecretResponseTest.java | 11 ++++------- .../model/response/MetadataResponseTest.java | 11 ++++------- .../model/response/PlainSecretResponseTest.java | 11 ++++------- .../connector/model/response/SealResponseTest.java | 11 ++++------- .../model/response/SecretListResponseTest.java | 11 ++++------- .../model/response/SecretVersionResponseTest.java | 11 ++++------- .../connector/model/response/TokenResponseTest.java | 11 ++++------- .../connector/model/response/TransitResponseTest.java | 5 ++--- .../model/response/embedded/MountConfigTest.java | 11 ++++------- 16 files changed, 62 insertions(+), 108 deletions(-) diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/AppRoleResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/AppRoleResponseTest.java index 52d9901..2f6657e 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/AppRoleResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/AppRoleResponseTest.java @@ -16,7 +16,6 @@ package de.stklcode.jvault.connector.model.response; -import com.fasterxml.jackson.core.JsonProcessingException; import de.stklcode.jvault.connector.model.AbstractModelTest; import de.stklcode.jvault.connector.model.AppRole; import org.junit.jupiter.api.Test; @@ -67,12 +66,10 @@ class AppRoleResponseTest extends AbstractModelTest { @Override protected AppRoleResponse createFull() { - try { - return objectMapper.readValue(RES_JSON, AppRoleResponse.class); - } catch (JsonProcessingException e) { - fail("Creation of full model instance failed", e); - return null; - } + return assertDoesNotThrow( + () -> objectMapper.readValue(RES_JSON, AppRoleResponse.class), + "Creation of full model instance failed" + ); } /** diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/AuthMethodsResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/AuthMethodsResponseTest.java index a74a0aa..b2d5238 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/AuthMethodsResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/AuthMethodsResponseTest.java @@ -16,7 +16,6 @@ package de.stklcode.jvault.connector.model.response; -import com.fasterxml.jackson.core.JsonProcessingException; import de.stklcode.jvault.connector.model.AbstractModelTest; import de.stklcode.jvault.connector.model.AuthBackend; import de.stklcode.jvault.connector.model.response.embedded.AuthMethod; @@ -90,12 +89,10 @@ class AuthMethodsResponseTest extends AbstractModelTest { @Override protected AuthMethodsResponse createFull() { - try { - return objectMapper.readValue(RES_JSON, AuthMethodsResponse.class); - } catch (JsonProcessingException e) { - fail("Creation of full model instance failed", e); - return null; - } + return assertDoesNotThrow( + () -> objectMapper.readValue(RES_JSON, AuthMethodsResponse.class), + "Creation of full model instance failed" + ); } /** diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/AuthResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/AuthResponseTest.java index e3c84bf..d466f3d 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/AuthResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/AuthResponseTest.java @@ -16,7 +16,6 @@ package de.stklcode.jvault.connector.model.response; -import com.fasterxml.jackson.core.JsonProcessingException; import de.stklcode.jvault.connector.model.AbstractModelTest; import de.stklcode.jvault.connector.model.response.embedded.AuthData; import de.stklcode.jvault.connector.model.response.embedded.MfaConstraintAny; @@ -101,12 +100,10 @@ class AuthResponseTest extends AbstractModelTest { @Override protected AuthResponse createFull() { - try { - return objectMapper.readValue(RES_JSON, AuthResponse.class); - } catch (JsonProcessingException e) { - fail("Creation of full model instance failed", e); - return null; - } + return assertDoesNotThrow( + () -> objectMapper.readValue(RES_JSON, AuthResponse.class), + "Creation of full model instance failed" + ); } @Test diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/CredentialsResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/CredentialsResponseTest.java index 07308eb..3502cf5 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/CredentialsResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/CredentialsResponseTest.java @@ -16,7 +16,6 @@ package de.stklcode.jvault.connector.model.response; -import com.fasterxml.jackson.core.JsonProcessingException; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -49,12 +48,10 @@ class CredentialsResponseTest extends AbstractModelTest { @Override protected CredentialsResponse createFull() { - try { - return objectMapper.readValue(JSON, CredentialsResponse.class); - } catch (JsonProcessingException e) { - fail("Creation of full model instance failed", e); - return null; - } + return assertDoesNotThrow( + () -> objectMapper.readValue(JSON, CredentialsResponse.class), + "Creation of full model instance failed" + ); } /** diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/ErrorResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/ErrorResponseTest.java index 1df60f4..c809348 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/ErrorResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/ErrorResponseTest.java @@ -16,7 +16,6 @@ package de.stklcode.jvault.connector.model.response; -import com.fasterxml.jackson.core.JsonProcessingException; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -42,12 +41,10 @@ class ErrorResponseTest extends AbstractModelTest { @Override protected ErrorResponse createFull() { - try { - return objectMapper.readValue(JSON, ErrorResponse.class); - } catch (JsonProcessingException e) { - fail("Creation of full model instance failed", e); - return null; - } + return assertDoesNotThrow( + () -> objectMapper.readValue(JSON, ErrorResponse.class), + "Creation of full model instance failed" + ); } /** diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/HealthResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/HealthResponseTest.java index 8a28826..0df614d 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/HealthResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/HealthResponseTest.java @@ -16,7 +16,6 @@ package de.stklcode.jvault.connector.model.response; -import com.fasterxml.jackson.core.JsonProcessingException; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -67,12 +66,10 @@ class HealthResponseTest extends AbstractModelTest { @Override protected HealthResponse createFull() { - try { - return objectMapper.readValue(RES_JSON, HealthResponse.class); - } catch (JsonProcessingException e) { - fail("Creation of full model instance failed", e); - return null; - } + return assertDoesNotThrow( + () -> objectMapper.readValue(RES_JSON, HealthResponse.class), + "Creation of full model instance failed" + ); } /** diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/HelpResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/HelpResponseTest.java index 3ed50ac..05026d7 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/HelpResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/HelpResponseTest.java @@ -16,7 +16,6 @@ package de.stklcode.jvault.connector.model.response; -import com.fasterxml.jackson.core.JsonProcessingException; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -38,12 +37,10 @@ class HelpResponseTest extends AbstractModelTest { @Override protected HelpResponse createFull() { - try { - return objectMapper.readValue(JSON, HelpResponse.class); - } catch (JsonProcessingException e) { - fail("Creation of full model instance failed", e); - return null; - } + return assertDoesNotThrow( + () -> objectMapper.readValue(JSON, HelpResponse.class), + "Creation of full model instance failed" + ); } /** diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/MetaSecretResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/MetaSecretResponseTest.java index b03f84b..129b6ba 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/MetaSecretResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/MetaSecretResponseTest.java @@ -16,7 +16,6 @@ package de.stklcode.jvault.connector.model.response; -import com.fasterxml.jackson.core.JsonProcessingException; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -95,12 +94,10 @@ class MetaSecretResponseTest extends AbstractModelTest { @Override protected MetaSecretResponse createFull() { - try { - return objectMapper.readValue(SECRET_JSON_V2, MetaSecretResponse.class); - } catch (JsonProcessingException e) { - fail("Creation of full model instance failed", e); - return null; - } + return assertDoesNotThrow( + () -> objectMapper.readValue(SECRET_JSON_V2, MetaSecretResponse.class), + "Creation of full model instance failed" + ); } /** diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/MetadataResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/MetadataResponseTest.java index 10475ab..e2bc51d 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/MetadataResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/MetadataResponseTest.java @@ -16,7 +16,6 @@ package de.stklcode.jvault.connector.model.response; -import com.fasterxml.jackson.core.JsonProcessingException; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -80,12 +79,10 @@ class MetadataResponseTest extends AbstractModelTest { @Override protected MetadataResponse createFull() { - try { - return objectMapper.readValue(META_JSON, MetadataResponse.class); - } catch (JsonProcessingException e) { - fail("Creation of full model instance failed", e); - return null; - } + return assertDoesNotThrow( + () -> objectMapper.readValue(META_JSON, MetadataResponse.class), + "Creation of full model instance failed" + ); } /** diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/PlainSecretResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/PlainSecretResponseTest.java index 6499f7b..2431ef0 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/PlainSecretResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/PlainSecretResponseTest.java @@ -17,7 +17,6 @@ package de.stklcode.jvault.connector.model.response; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.core.JsonProcessingException; import de.stklcode.jvault.connector.exception.InvalidResponseException; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -60,12 +59,10 @@ class PlainSecretResponseTest extends AbstractModelTest { @Override protected PlainSecretResponse createFull() { - try { - return objectMapper.readValue(SECRET_JSON, PlainSecretResponse.class); - } catch (JsonProcessingException e) { - fail("Creation of full model instance failed", e); - return null; - } + return assertDoesNotThrow( + () -> objectMapper.readValue(SECRET_JSON, PlainSecretResponse.class), + "Creation of full model instance failed" + ); } /** diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/SealResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/SealResponseTest.java index d85c012..7410259 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/SealResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/SealResponseTest.java @@ -16,7 +16,6 @@ package de.stklcode.jvault.connector.model.response; -import com.fasterxml.jackson.core.JsonProcessingException; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -83,12 +82,10 @@ class SealResponseTest extends AbstractModelTest { @Override protected SealResponse createFull() { - try { - return objectMapper.readValue(RES_UNSEALED, SealResponse.class); - } catch (JsonProcessingException e) { - fail("Creation of full model instance failed", e); - return null; - } + return assertDoesNotThrow( + () -> objectMapper.readValue(RES_UNSEALED, SealResponse.class), + "Creation of full model instance failed" + ); } /** diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/SecretListResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/SecretListResponseTest.java index 8c12c94..af4f45a 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/SecretListResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/SecretListResponseTest.java @@ -16,7 +16,6 @@ package de.stklcode.jvault.connector.model.response; -import com.fasterxml.jackson.core.JsonProcessingException; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -52,12 +51,10 @@ class SecretListResponseTest extends AbstractModelTest { @Override protected SecretListResponse createFull() { - try { - return objectMapper.readValue(JSON, SecretListResponse.class); - } catch (JsonProcessingException e) { - fail("Creation of full model instance failed", e); - return null; - } + return assertDoesNotThrow( + () -> objectMapper.readValue(JSON, SecretListResponse.class), + "Creation of full model instance failed" + ); } /** diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/SecretVersionResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/SecretVersionResponseTest.java index 663a57d..d590f7e 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/SecretVersionResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/SecretVersionResponseTest.java @@ -16,7 +16,6 @@ package de.stklcode.jvault.connector.model.response; -import com.fasterxml.jackson.core.JsonProcessingException; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -48,12 +47,10 @@ class SecretVersionResponseTest extends AbstractModelTest @Override protected SecretVersionResponse createFull() { - try { - return objectMapper.readValue(META_JSON, SecretVersionResponse.class); - } catch (JsonProcessingException e) { - fail("Creation of full model instance failed", e); - return null; - } + return assertDoesNotThrow( + () -> objectMapper.readValue(META_JSON, SecretVersionResponse.class), + "Creation of full model instance failed" + ); } /** diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/TokenResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/TokenResponseTest.java index 39c7add..0e09f33 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/TokenResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/TokenResponseTest.java @@ -16,7 +16,6 @@ package de.stklcode.jvault.connector.model.response; -import com.fasterxml.jackson.core.JsonProcessingException; import de.stklcode.jvault.connector.model.AbstractModelTest; import de.stklcode.jvault.connector.model.response.embedded.TokenData; import org.junit.jupiter.api.Test; @@ -96,12 +95,10 @@ class TokenResponseTest extends AbstractModelTest { @Override protected TokenResponse createFull() { - try { - return objectMapper.readValue(RES_JSON, TokenResponse.class); - } catch (JsonProcessingException e) { - fail("Creation of full model instance failed", e); - return null; - } + return assertDoesNotThrow( + () -> objectMapper.readValue(RES_JSON, TokenResponse.class), + "Creation of full model instance failed" + ); } /** diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/TransitResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/TransitResponseTest.java index f47efe7..0510e1c 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/TransitResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/TransitResponseTest.java @@ -16,7 +16,6 @@ package de.stklcode.jvault.connector.model.response; -import com.fasterxml.jackson.core.JsonProcessingException; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -39,8 +38,8 @@ class TransitResponseTest extends AbstractModelTest { @Override protected TransitResponse createFull() { - try { - return objectMapper.readValue( + return assertDoesNotThrow( + () -> objectMapper.readValue( json( "\"ciphertext\": \"" + CIPHERTEXT + "\", " + "\"plaintext\": \"" + PLAINTEXT + "\", " + diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/embedded/MountConfigTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/embedded/MountConfigTest.java index 4637068..10481e2 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/embedded/MountConfigTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/embedded/MountConfigTest.java @@ -1,6 +1,5 @@ package de.stklcode.jvault.connector.model.response.embedded; -import com.fasterxml.jackson.core.JsonProcessingException; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -62,12 +61,10 @@ class MountConfigTest extends AbstractModelTest { @Override protected MountConfig createFull() { - try { - return objectMapper.readValue(RES_JSON, MountConfig.class); - } catch (JsonProcessingException e) { - fail("Creation of full model instance failed", e); - return null; - } + return assertDoesNotThrow( + () -> objectMapper.readValue(RES_JSON, MountConfig.class), + "Creation of full model instance failed" + ); } /**