Skip to content
This repository has been archived by the owner on Mar 21, 2022. It is now read-only.

Clean up DockerHostTest #445

Merged
merged 1 commit into from May 25, 2016
Merged

Clean up DockerHostTest #445

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 5 additions & 8 deletions src/test/java/com/spotify/docker/client/DockerHostTest.java
View file
Open in desktop
Expand Up @@ -24,9 +24,9 @@

import java.net.URI;

import static com.google.common.base.Strings.isNullOrEmpty;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.nullValue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

Expand Down Expand Up @@ -98,7 +98,7 @@ public void testCertPathFromEnv() throws Exception {
DockerHost.setSystemDelegate(systemDelegate);

assertThat(DockerHost.certPathFromEnv(), equalTo("foo"));
assertThat(DockerHost.certPathFromEnv(), equalTo(null));
assertThat(DockerHost.certPathFromEnv(), nullValue());
}

@Test
Expand Down Expand Up @@ -126,7 +126,7 @@ public void testFromTcpSocketNoCert() throws Exception {
assertThat(dockerHost.bindURI(), equalTo(new URI(tcpSocket)));
assertThat(dockerHost.port(), equalTo(2375));
assertThat(dockerHost.address(), equalTo("127.0.0.1"));
assertThat(dockerHost.dockerCertPath(), equalTo(null));
assertThat(dockerHost.dockerCertPath(), nullValue());
}

@Test
Expand All @@ -151,7 +151,6 @@ public void testFromEnv() throws Exception {
final String dockerHostEnvVar = DockerHost.defaultDockerEndpoint();
final boolean isUnixSocket = dockerHostEnvVar.startsWith("unix://");
final URI dockerHostUri = new URI(dockerHostEnvVar);
final String dockerCertPathEnvVar = null;

final String dockerHostAndPort;
final URI dockerHostHttpUri;
Expand All @@ -166,9 +165,7 @@ public void testFromEnv() throws Exception {
dockerHostHost = "localhost";
} else {
dockerHostAndPort = dockerHostUri.getHost() + ":" + dockerHostUri.getPort();
dockerHostHttpUri = isNullOrEmpty(dockerCertPathEnvVar) ?
new URI("http://" + dockerHostAndPort) :
new URI("https://" + dockerHostAndPort);
dockerHostHttpUri = new URI("http://" + dockerHostAndPort);
dockerTcpUri = new URI("tcp://" + dockerHostAndPort);
dockerHostPort = dockerHostUri.getPort();
dockerHostHost = dockerHostUri.getHost();
Expand All @@ -180,6 +177,6 @@ public void testFromEnv() throws Exception {
assertThat(dockerHost.bindURI(), equalTo(dockerTcpUri));
assertThat(dockerHost.port(), equalTo(dockerHostPort));
assertThat(dockerHost.address(), equalTo(dockerHostHost));
assertThat(dockerHost.dockerCertPath(), equalTo(dockerCertPathEnvVar));
assertThat(dockerHost.dockerCertPath(), nullValue());
}
}