From 38285e0e1147042b519957958083e537e6d90fc9 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Wed, 12 Aug 2020 10:34:39 +0000
Subject: Minor unification of tests.

---
 .../com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java    |  5 ++---
 .../com/yahoo/vespa/hosted/dockerapi/ProcessResultTest.java | 13 +++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'docker-api')

diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java
index 2f84f84249b..1ca6cd5662e 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java
@@ -21,9 +21,8 @@ import org.mockito.ArgumentMatchers;
 
 import java.util.OptionalLong;
 
-import static org.hamcrest.CoreMatchers.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;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -70,7 +69,7 @@ public class DockerImplTest {
 
         final ProcessResult result = docker.executeInContainerAsUser(
                 new ContainerName(containerId), "root", OptionalLong.empty(), command);
-        assertThat(result.getExitStatus(), is(exitCode));
+        assertEquals(exitCode, result.getExitStatus());
     }
 
     @Test
diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/ProcessResultTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/ProcessResultTest.java
index 0f1ad8a3466..590833151f2 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/ProcessResultTest.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/ProcessResultTest.java
@@ -3,21 +3,22 @@ package com.yahoo.vespa.hosted.dockerapi;
 
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class ProcessResultTest {
     @Test
     public void testBasicProperties() {
         ProcessResult processResult = new ProcessResult(0, "foo", "bar");
-        assertThat(processResult.getExitStatus(), is(0));
-        assertThat(processResult.getOutput(), is("foo"));
-        assertThat(processResult.isSuccess(), is(true));
+        assertEquals(0, processResult.getExitStatus());
+        assertEquals("foo", processResult.getOutput());
+        assertTrue(processResult.isSuccess());
     }
 
     @Test
     public void testSuccessFails() {
         ProcessResult processResult = new ProcessResult(1, "foo", "bar");
-        assertThat(processResult.isSuccess(), is(false));
+        assertFalse(processResult.isSuccess());
     }
 }
-- 
cgit v1.2.3