summaryrefslogtreecommitdiffstats
path: root/docker-api
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-08-12 10:34:39 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-08-12 10:34:39 +0000
commit38285e0e1147042b519957958083e537e6d90fc9 (patch)
tree317bcc846acb2bc8365ca2aedb76d9066152de40 /docker-api
parent104f7547cb92ab39251308f15ddc45d515a48ae2 (diff)
Minor unification of tests.
Diffstat (limited to 'docker-api')
-rw-r--r--docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java5
-rw-r--r--docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/ProcessResultTest.java13
2 files changed, 9 insertions, 9 deletions
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());
}
}