diff --git a/pom.xml b/pom.xml
index c2d3ea0..da9bb34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,19 +122,19 @@
org.junit.jupiter
junit-jupiter
- 5.5.1
+ 5.5.2
test
org.junit.jupiter
junit-jupiter-migrationsupport
- 5.5.1
+ 5.5.2
test
org.hamcrest
- hamcrest-junit
- 2.0.0.0
+ hamcrest
+ 2.1
test
@@ -146,13 +146,36 @@
org.mockito
mockito-core
- 3.0.0
+ 3.1.0
test
+
+
+ net.bytebuddy
+ byte-buddy
+
+
+ net.bytebuddy
+ byte-buddy-agent
+
+
org.mockito
mockito-inline
- 3.0.0
+ 3.1.0
+ test
+
+
+
+ net.bytebuddy
+ byte-buddy
+ 1.9.16
+ test
+
+
+ net.bytebuddy
+ byte-buddy-agent
+ 1.9.16
test
diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java
index 58ac6e3..3fc4461 100644
--- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java
+++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java
@@ -39,11 +39,9 @@ import static org.apache.commons.io.FileUtils.copyDirectory;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*;
import static org.hamcrest.core.Is.is;
-import static org.hamcrest.junit.MatcherAssume.assumeThat;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.*;
/**
* JUnit test for HTTP Vault connector.
@@ -292,7 +290,7 @@ public class HTTPVaultConnectorTest {
} catch (VaultConnectorException e) {
fail("Written secret could not be read.");
}
- assumeThat(res, is(notNullValue()));
+ assumeTrue(res != null);
/* Delete secret */
try {
@@ -333,7 +331,7 @@ public class HTTPVaultConnectorTest {
} catch (VaultConnectorException e) {
fail("Written secret could not be read.");
}
- assumeThat(res, is(notNullValue()));
+ assumeTrue(res != null);
/* Revoke secret */
try {
@@ -460,7 +458,7 @@ public class HTTPVaultConnectorTest {
try {
MetadataResponse res = connector.readSecretMetadata(MOUNT_KV2, SECRET2_KEY);
maxVersions = res.getMetadata().getMaxVersions();
- assumeThat("Unexpected maximum number of versions", res.getMetadata().getMaxVersions(), is(10));
+ assumeTrue(res.getMetadata().getMaxVersions() == 10, "Unexpected maximum number of versions");
} catch (VaultConnectorException e) {
fail("Reading secret metadata failed: " + e.getMessage());
}
diff --git a/src/test/java/de/stklcode/jvault/connector/model/AppRoleSecretTest.java b/src/test/java/de/stklcode/jvault/connector/model/AppRoleSecretTest.java
index deaacf6..fbabb32 100644
--- a/src/test/java/de/stklcode/jvault/connector/model/AppRoleSecretTest.java
+++ b/src/test/java/de/stklcode/jvault/connector/model/AppRoleSecretTest.java
@@ -29,8 +29,8 @@ import java.util.Map;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*;
-import static org.hamcrest.junit.MatcherAssume.assumeThat;
import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
/**
@@ -143,17 +143,17 @@ public class AppRoleSecretTest {
/* Test fields, that should not be written to JSON */
setPrivateField(secret, "accessor", "TEST_ACCESSOR");
- assumeThat(secret.getAccessor(), is("TEST_ACCESSOR"));
+ assumeTrue("TEST_ACCESSOR".equals(secret.getAccessor()));
setPrivateField(secret, "creationTime", "TEST_CREATION");
- assumeThat(secret.getCreationTime(), is("TEST_CREATION"));
+ assumeTrue("TEST_CREATION".equals(secret.getCreationTime()));
setPrivateField(secret, "expirationTime", "TEST_EXPIRATION");
- assumeThat(secret.getExpirationTime(), is("TEST_EXPIRATION"));
+ assumeTrue("TEST_EXPIRATION".equals(secret.getExpirationTime()));
setPrivateField(secret, "lastUpdatedTime", "TEST_UPDATETIME");
- assumeThat(secret.getLastUpdatedTime(), is("TEST_UPDATETIME"));
+ assumeTrue("TEST_UPDATETIME".equals(secret.getLastUpdatedTime()));
setPrivateField(secret, "numUses", 678);
- assumeThat(secret.getNumUses(), is(678));
+ assumeTrue(secret.getNumUses() == 678);
setPrivateField(secret, "ttl", 12345);
- assumeThat(secret.getTtl(), is(12345));
+ assumeTrue(secret.getTtl() == 12345);
try {
secretJson = mapper.writeValueAsString(secret);
} catch (JsonProcessingException e) {