From c35760d0ab38f3952c9cc357a159d4ade6977346 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Sat, 13 Apr 2024 13:39:40 +0200 Subject: [PATCH] test: use assertInstanceOf() where applicable --- .../jvault/connector/HTTPVaultConnectorBuilderTest.java | 2 +- .../java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java | 2 +- .../de/stklcode/jvault/connector/HTTPVaultConnectorTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorBuilderTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorBuilderTest.java index f8e282c..9135787 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorBuilderTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorBuilderTest.java @@ -136,7 +136,7 @@ class HTTPVaultConnectorBuilderTest { () -> HTTPVaultConnector.builder().fromEnv(), "Creation with unknown cert path failed" ); - assertTrue(e.getCause() instanceof NoSuchFileException); + assertInstanceOf(NoSuchFileException.class, e.getCause()); assertEquals(VAULT_CACERT, ((NoSuchFileException) e.getCause()).getFile()); return null; diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java index 7558c83..fe4461e 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java @@ -909,7 +909,7 @@ class HTTPVaultConnectorIT { assertFalse(res.getAuth().isRenewable(), "Root token should not be renewable"); assertFalse(res.getAuth().isOrphan(), "Root token should not be orphan"); - // Starting with Vault 1.0 a warning "custom ID uses weaker SHA1.." is given. + // Starting with Vault 1.0 a warning "custom ID uses weaker SHA1..." is given. // Starting with Vault 1.11 a second warning "Endpoint ignored unrecognized parameters" is given. assertFalse(res.getWarnings().isEmpty(), "Token creation did not return expected warning"); diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index 7b9a1a3..a86f998 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -91,7 +91,7 @@ class HTTPVaultConnectorTest { "Querying health status succeeded on invalid instance" ); assertEquals("Unable to connect to Vault server", e.getMessage(), "Unexpected exception message"); - assertTrue(e.getCause() instanceof IOException, "Unexpected cause"); + assertInstanceOf(IOException.class, e.getCause(), "Unexpected cause"); // Now simulate a failing request that succeeds on second try. connector = HTTPVaultConnector.builder(wireMock.url("/")).withNumberOfRetries(1).withTimeout(250).build();