diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-08-12 10:34:39 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-08-12 10:34:39 +0000 |
commit | 38285e0e1147042b519957958083e537e6d90fc9 (patch) | |
tree | 317bcc846acb2bc8365ca2aedb76d9066152de40 /vespa-athenz | |
parent | 104f7547cb92ab39251308f15ddc45d515a48ae2 (diff) |
Minor unification of tests.
Diffstat (limited to 'vespa-athenz')
-rw-r--r-- | vespa-athenz/src/test/java/com/yahoo/vespa/athenz/api/AthenzDomainTest.java | 4 | ||||
-rw-r--r-- | vespa-athenz/src/test/java/com/yahoo/vespa/athenz/utils/SiaUtilsTest.java | 15 |
2 files changed, 7 insertions, 12 deletions
diff --git a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/api/AthenzDomainTest.java b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/api/AthenzDomainTest.java index 2a35fe63d5c..3ce9a8b3431 100644 --- a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/api/AthenzDomainTest.java +++ b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/api/AthenzDomainTest.java @@ -5,10 +5,8 @@ import org.junit.Test; import java.util.function.Supplier; -import static org.hamcrest.CoreMatchers.startsWith; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -49,7 +47,7 @@ public class AthenzDomainTest { AthenzDomain domain = domainCreator.get(); fail("Expected IllegalArgumentException for domain: " + domain.getName()); } catch (IllegalArgumentException e) { - assertThat(e.getMessage(), startsWith("Not a valid domain name")); + assertTrue(e.getMessage().startsWith("Not a valid domain name")); } } diff --git a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/utils/SiaUtilsTest.java b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/utils/SiaUtilsTest.java index 0e6aff1eeca..85ce3641226 100644 --- a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/utils/SiaUtilsTest.java +++ b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/utils/SiaUtilsTest.java @@ -12,11 +12,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.List; -import static java.util.Collections.emptyList; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * @author bjorncs @@ -29,7 +26,7 @@ public class SiaUtilsTest { @Test public void it_finds_all_identity_names_from_files_in_sia_keys_directory() throws IOException { Path siaRoot = tempDirectory.getRoot().toPath(); - assertThat(SiaUtils.findSiaServices(siaRoot), is(emptyList())); + assertTrue(SiaUtils.findSiaServices(siaRoot).isEmpty()); Files.createDirectory(siaRoot.resolve("keys")); AthenzService fooService = new AthenzService("my.domain.foo"); Files.createFile(SiaUtils.getPrivateKeyFile(siaRoot, fooService)); @@ -37,9 +34,9 @@ public class SiaUtilsTest { Files.createFile(SiaUtils.getPrivateKeyFile(siaRoot, barService)); List<AthenzIdentity> siaIdentities = SiaUtils.findSiaServices(siaRoot); - assertThat(siaIdentities.size(), equalTo(2)); - assertThat(siaIdentities, hasItem(fooService)); - assertThat(siaIdentities, hasItem(barService)); + assertEquals(2, siaIdentities.size()); + assertTrue(siaIdentities.contains(fooService)); + assertTrue(siaIdentities.contains(barService)); } } |