test: use assertDoesNotThrow instead of try-catch-fail for createFull()
This commit is contained in:
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
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.AbstractModelTest;
|
||||||
import de.stklcode.jvault.connector.model.AppRole;
|
import de.stklcode.jvault.connector.model.AppRole;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
@@ -67,12 +66,10 @@ class AppRoleResponseTest extends AbstractModelTest<AppRoleResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected AppRoleResponse createFull() {
|
protected AppRoleResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(RES_JSON, AppRoleResponse.class);
|
() -> objectMapper.readValue(RES_JSON, AppRoleResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
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.AbstractModelTest;
|
||||||
import de.stklcode.jvault.connector.model.AuthBackend;
|
import de.stklcode.jvault.connector.model.AuthBackend;
|
||||||
import de.stklcode.jvault.connector.model.response.embedded.AuthMethod;
|
import de.stklcode.jvault.connector.model.response.embedded.AuthMethod;
|
||||||
@@ -90,12 +89,10 @@ class AuthMethodsResponseTest extends AbstractModelTest<AuthMethodsResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected AuthMethodsResponse createFull() {
|
protected AuthMethodsResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(RES_JSON, AuthMethodsResponse.class);
|
() -> objectMapper.readValue(RES_JSON, AuthMethodsResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
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.AbstractModelTest;
|
||||||
import de.stklcode.jvault.connector.model.response.embedded.AuthData;
|
import de.stklcode.jvault.connector.model.response.embedded.AuthData;
|
||||||
import de.stklcode.jvault.connector.model.response.embedded.MfaConstraintAny;
|
import de.stklcode.jvault.connector.model.response.embedded.MfaConstraintAny;
|
||||||
@@ -101,12 +100,10 @@ class AuthResponseTest extends AbstractModelTest<AuthResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected AuthResponse createFull() {
|
protected AuthResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(RES_JSON, AuthResponse.class);
|
() -> objectMapper.readValue(RES_JSON, AuthResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
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.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -49,12 +48,10 @@ class CredentialsResponseTest extends AbstractModelTest<CredentialsResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected CredentialsResponse createFull() {
|
protected CredentialsResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(JSON, CredentialsResponse.class);
|
() -> objectMapper.readValue(JSON, CredentialsResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
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.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -42,12 +41,10 @@ class ErrorResponseTest extends AbstractModelTest<ErrorResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected ErrorResponse createFull() {
|
protected ErrorResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(JSON, ErrorResponse.class);
|
() -> objectMapper.readValue(JSON, ErrorResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
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.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -67,12 +66,10 @@ class HealthResponseTest extends AbstractModelTest<HealthResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected HealthResponse createFull() {
|
protected HealthResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(RES_JSON, HealthResponse.class);
|
() -> objectMapper.readValue(RES_JSON, HealthResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
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.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -38,12 +37,10 @@ class HelpResponseTest extends AbstractModelTest<HelpResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected HelpResponse createFull() {
|
protected HelpResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(JSON, HelpResponse.class);
|
() -> objectMapper.readValue(JSON, HelpResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
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.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -95,12 +94,10 @@ class MetaSecretResponseTest extends AbstractModelTest<MetaSecretResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected MetaSecretResponse createFull() {
|
protected MetaSecretResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(SECRET_JSON_V2, MetaSecretResponse.class);
|
() -> objectMapper.readValue(SECRET_JSON_V2, MetaSecretResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
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.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -80,12 +79,10 @@ class MetadataResponseTest extends AbstractModelTest<MetadataResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected MetadataResponse createFull() {
|
protected MetadataResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(META_JSON, MetadataResponse.class);
|
() -> objectMapper.readValue(META_JSON, MetadataResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -17,7 +17,6 @@
|
|||||||
package de.stklcode.jvault.connector.model.response;
|
package de.stklcode.jvault.connector.model.response;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import de.stklcode.jvault.connector.exception.InvalidResponseException;
|
import de.stklcode.jvault.connector.exception.InvalidResponseException;
|
||||||
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
@@ -60,12 +59,10 @@ class PlainSecretResponseTest extends AbstractModelTest<PlainSecretResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected PlainSecretResponse createFull() {
|
protected PlainSecretResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(SECRET_JSON, PlainSecretResponse.class);
|
() -> objectMapper.readValue(SECRET_JSON, PlainSecretResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
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.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -83,12 +82,10 @@ class SealResponseTest extends AbstractModelTest<SealResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected SealResponse createFull() {
|
protected SealResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(RES_UNSEALED, SealResponse.class);
|
() -> objectMapper.readValue(RES_UNSEALED, SealResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
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.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -52,12 +51,10 @@ class SecretListResponseTest extends AbstractModelTest<SecretListResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected SecretListResponse createFull() {
|
protected SecretListResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(JSON, SecretListResponse.class);
|
() -> objectMapper.readValue(JSON, SecretListResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
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.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -48,12 +47,10 @@ class SecretVersionResponseTest extends AbstractModelTest<SecretVersionResponse>
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected SecretVersionResponse createFull() {
|
protected SecretVersionResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(META_JSON, SecretVersionResponse.class);
|
() -> objectMapper.readValue(META_JSON, SecretVersionResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
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.AbstractModelTest;
|
||||||
import de.stklcode.jvault.connector.model.response.embedded.TokenData;
|
import de.stklcode.jvault.connector.model.response.embedded.TokenData;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
@@ -96,12 +95,10 @@ class TokenResponseTest extends AbstractModelTest<TokenResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected TokenResponse createFull() {
|
protected TokenResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(RES_JSON, TokenResponse.class);
|
() -> objectMapper.readValue(RES_JSON, TokenResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
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.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -39,8 +38,8 @@ class TransitResponseTest extends AbstractModelTest<TransitResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected TransitResponse createFull() {
|
protected TransitResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(
|
() -> objectMapper.readValue(
|
||||||
json(
|
json(
|
||||||
"\"ciphertext\": \"" + CIPHERTEXT + "\", " +
|
"\"ciphertext\": \"" + CIPHERTEXT + "\", " +
|
||||||
"\"plaintext\": \"" + PLAINTEXT + "\", " +
|
"\"plaintext\": \"" + PLAINTEXT + "\", " +
|
||||||
|
@@ -1,6 +1,5 @@
|
|||||||
package de.stklcode.jvault.connector.model.response.embedded;
|
package de.stklcode.jvault.connector.model.response.embedded;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -62,12 +61,10 @@ class MountConfigTest extends AbstractModelTest<MountConfig> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected MountConfig createFull() {
|
protected MountConfig createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(RES_JSON, MountConfig.class);
|
() -> objectMapper.readValue(RES_JSON, MountConfig.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user