Avoid hamcrest/deprecated assertThat.

4 files changed, 15 insertions, 25 deletions

diff --git a/security-utils/pom.xml b/security-utils/pom.xml
index 39a52fb12db..55b4b190f97 100644
--- a/security-utils/pom.xml
+++ b/security-utils/pom.xml
@@ -40,11 +40,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>testutil</artifactId>
       <version>${project.version}</version>
diff --git a/security-utils/src/test/java/com/yahoo/security/KeyUtilsTest.java b/security-utils/src/test/java/com/yahoo/security/KeyUtilsTest.java
index b0d587bb19a..f6f48d8b1b8 100644
--- a/security-utils/src/test/java/com/yahoo/security/KeyUtilsTest.java
+++ b/security-utils/src/test/java/com/yahoo/security/KeyUtilsTest.java
@@ -7,10 +7,9 @@ import java.security.KeyPair;
 import java.security.PrivateKey;
 import java.security.PublicKey;
 
-import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author bjorncs
@@ -55,8 +54,8 @@ public class KeyUtilsTest {
     public void can_serialize_and_deserialize_rsa_publickey_using_pem_format() {
         KeyPair keyPair = KeyUtils.generateKeypair(KeyAlgorithm.RSA);
         String pem = KeyUtils.toPem(keyPair.getPublic());
-        assertThat(pem, containsString("BEGIN PUBLIC KEY"));
-        assertThat(pem, containsString("END PUBLIC KEY"));
+        assertTrue(pem.contains("BEGIN PUBLIC KEY"));
+        assertTrue(pem.contains("END PUBLIC KEY"));
         PublicKey deserializedKey = KeyUtils.fromPemEncodedPublicKey(pem);
         assertEquals(keyPair.getPublic(), deserializedKey);
         assertEquals(KeyAlgorithm.RSA.getAlgorithmName(), deserializedKey.getAlgorithm());
@@ -66,8 +65,8 @@ public class KeyUtilsTest {
     public void can_serialize_and_deserialize_ec_publickey_using_pem_format() {
         KeyPair keyPair = KeyUtils.generateKeypair(KeyAlgorithm.EC);
         String pem = KeyUtils.toPem(keyPair.getPublic());
-        assertThat(pem, containsString("BEGIN PUBLIC KEY"));
-        assertThat(pem, containsString("END PUBLIC KEY"));
+        assertTrue(pem.contains("BEGIN PUBLIC KEY"));
+        assertTrue(pem.contains("END PUBLIC KEY"));
         PublicKey deserializedKey = KeyUtils.fromPemEncodedPublicKey(pem);
         assertEquals(keyPair.getPublic(), deserializedKey);
         assertEquals(KeyAlgorithm.EC.getAlgorithmName(), deserializedKey.getAlgorithm());
@@ -76,8 +75,8 @@ public class KeyUtilsTest {
     private static void testPrivateKeySerialization(KeyAlgorithm keyAlgorithm, KeyFormat keyFormat, String pemLabel) {
         KeyPair keyPair = KeyUtils.generateKeypair(keyAlgorithm);
         String pem = KeyUtils.toPem(keyPair.getPrivate(), keyFormat);
-        assertThat(pem, containsString("BEGIN " + pemLabel));
-        assertThat(pem, containsString("END " + pemLabel));
+        assertTrue(pem.contains("BEGIN " + pemLabel));
+        assertTrue(pem.contains("END " + pemLabel));
         PrivateKey deserializedKey = KeyUtils.fromPemEncodedPrivateKey(pem);
         assertEquals(keyPair.getPrivate(), deserializedKey);
         assertEquals(keyAlgorithm.getAlgorithmName(), deserializedKey.getAlgorithm());
diff --git a/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrUtilsTest.java b/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrUtilsTest.java
index ff0076b9cc4..32b8dfc5bcd 100644
--- a/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrUtilsTest.java
+++ b/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrUtilsTest.java
@@ -6,9 +6,8 @@ import org.junit.Test;
 import javax.security.auth.x500.X500Principal;
 import java.security.KeyPair;
 
-import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author bjorncs
@@ -22,8 +21,8 @@ public class Pkcs10CsrUtilsTest {
         Pkcs10Csr csr = Pkcs10CsrBuilder.fromKeypair(subject, keypair, SignatureAlgorithm.SHA512_WITH_ECDSA).build();
         String pem = Pkcs10CsrUtils.toPem(csr);
         Pkcs10Csr deserializedCsr = Pkcs10CsrUtils.fromPem(pem);
-        assertThat(pem, containsString("BEGIN CERTIFICATE REQUEST"));
-        assertThat(pem, containsString("END CERTIFICATE REQUEST"));
+        assertTrue(pem.contains("BEGIN CERTIFICATE REQUEST"));
+        assertTrue(pem.contains("END CERTIFICATE REQUEST"));
         assertEquals(subject, deserializedCsr.getSubject());
     }
 
diff --git a/security-utils/src/test/java/com/yahoo/security/X509CertificateUtilsTest.java b/security-utils/src/test/java/com/yahoo/security/X509CertificateUtilsTest.java
index 7075179234e..b2e800542b8 100644
--- a/security-utils/src/test/java/com/yahoo/security/X509CertificateUtilsTest.java
+++ b/security-utils/src/test/java/com/yahoo/security/X509CertificateUtilsTest.java
@@ -13,12 +13,9 @@ import java.util.Arrays;
 import java.util.List;
 
 import static com.yahoo.security.SubjectAlternativeName.Type.DNS_NAME;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.Matchers.is;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -32,8 +29,8 @@ public class X509CertificateUtilsTest {
         X509Certificate cert = TestUtils.createCertificate(keypair, subject);
         assertEquals(subject, cert.getSubjectX500Principal());
         String pem = X509CertificateUtils.toPem(cert);
-        assertThat(pem, containsString("BEGIN CERTIFICATE"));
-        assertThat(pem, containsString("END CERTIFICATE"));
+        assertTrue(pem.contains("BEGIN CERTIFICATE"));
+        assertTrue(pem.contains("END CERTIFICATE"));
         X509Certificate deserializedCert = X509CertificateUtils.fromPem(pem);
         assertEquals(subject, deserializedCert.getSubjectX500Principal());
     }
@@ -70,8 +67,8 @@ public class X509CertificateUtilsTest {
                 .build();
 
         List<SubjectAlternativeName> sans = X509CertificateUtils.getSubjectAlternativeNames(cert);
-        assertThat(sans.size(), is(1));
-        assertThat(sans.get(0), equalTo(san));
+        assertEquals(1, sans.size());
+        assertEquals(san, sans.get(0));
     }
 
     @Test