http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/main/java/org/apache/camel/component/docker/ssl/NoImplSslConfig.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/ssl/NoImplSslConfig.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/ssl/NoImplSslConfig.java index ada29b6..c1e3184 100644 --- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/ssl/NoImplSslConfig.java +++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/ssl/NoImplSslConfig.java @@ -20,7 +20,6 @@ import java.security.KeyManagementException; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.UnrecoverableKeyException; - import javax.net.ssl.SSLContext; import com.github.dockerjava.core.SSLConfig;
http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerClientProfileRegistryTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerClientProfileRegistryTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerClientProfileRegistryTest.java index 01e56f7..158de7c 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerClientProfileRegistryTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerClientProfileRegistryTest.java @@ -29,8 +29,8 @@ import org.powermock.modules.junit4.PowerMockRunner; */ @RunWith(PowerMockRunner.class) public class DockerClientProfileRegistryTest extends CamelTestSupport { - - + + @Override protected CamelContext createCamelContext() throws Exception { CamelContext camelContext = super.createCamelContext(); @@ -40,24 +40,24 @@ public class DockerClientProfileRegistryTest extends CamelTestSupport { profile.setPort(2376); profile.setSecure(true); profile.setCertPath("/Users/cameluser/.boot2docker/certs/boot2docker-vm"); - + PropertyPlaceholderDelegateRegistry registry = (PropertyPlaceholderDelegateRegistry) camelContext.getRegistry(); - JndiRegistry jndiRegistry = (JndiRegistry)registry.getRegistry(); + JndiRegistry jndiRegistry = (JndiRegistry) registry.getRegistry(); jndiRegistry.bind("dockerProfile", profile); - - + + return camelContext; } - + @Test public void clientProfileTest() { DockerEndpoint endpoint = resolveMandatoryEndpoint(context(), "docker://info?clientProfile=#dockerProfile", DockerEndpoint.class); assertNotNull(endpoint.getConfiguration().getClientProfile()); - DockerClientProfile clientProfile = endpoint.getConfiguration().getClientProfile(); + DockerClientProfile clientProfile = endpoint.getConfiguration().getClientProfile(); assertEquals("192.168.59.103", clientProfile.getHost()); assertEquals((Integer) 2376, clientProfile.getPort()); assertTrue(clientProfile.isSecure()); - assertEquals("/Users/cameluser/.boot2docker/certs/boot2docker-vm" ,clientProfile.getCertPath()); + assertEquals("/Users/cameluser/.boot2docker/certs/boot2docker-vm", clientProfile.getCertPath()); } http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerClientProfileTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerClientProfileTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerClientProfileTest.java index 560b0bb..23a9a87 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerClientProfileTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerClientProfileTest.java @@ -17,13 +17,14 @@ package org.apache.camel.component.docker; import org.junit.Test; + import static org.junit.Assert.assertEquals; /** * Validates the {@link DockerClientProfile} */ public class DockerClientProfileTest { - + @Test public void clientProfileTest() { String host = "host"; @@ -34,8 +35,8 @@ public class DockerClientProfileTest { Integer requestTimeout = 40; boolean secure = true; String certPath = "/docker/cert/path"; - - + + DockerClientProfile clientProfile1 = new DockerClientProfile(); clientProfile1.setHost(host); clientProfile1.setEmail(email); @@ -45,7 +46,7 @@ public class DockerClientProfileTest { clientProfile1.setRequestTimeout(requestTimeout); clientProfile1.setSecure(secure); clientProfile1.setCertPath(certPath); - + DockerClientProfile clientProfile2 = new DockerClientProfile(); clientProfile2.setHost(host); clientProfile2.setEmail(email); @@ -55,7 +56,7 @@ public class DockerClientProfileTest { clientProfile2.setRequestTimeout(requestTimeout); clientProfile2.setSecure(secure); clientProfile2.setCertPath(certPath); - + assertEquals(clientProfile1, clientProfile2); } http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerConfigurationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerConfigurationTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerConfigurationTest.java index a07bac2..147bea5 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerConfigurationTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerConfigurationTest.java @@ -27,33 +27,33 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; public class DockerConfigurationTest { - + private DockerConfiguration configuration; - + @Before public void setupTest() { configuration = new DockerConfiguration(); } - + @Test public void testPropertyFromHeader() { String host = "camelhost"; - + Message message = new DefaultMessage(); message.setHeader(DockerConstants.DOCKER_HOST, host); - + String configurationProp = DockerHelper.getProperty(DockerConstants.DOCKER_HOST, configuration, message, String.class); assertEquals(host, configurationProp); } - + @Test public void testPropertyfromEndpointProperties() { String host = "camelhost"; - + Map<String, Object> parameters = new HashMap<String, Object>(); parameters.put(DockerHelper.transformFromHeaderName(DockerConstants.DOCKER_HOST), host); configuration.setParameters(parameters); - + Message message = new DefaultMessage(); String configurationProp = DockerHelper.getProperty(DockerConstants.DOCKER_HOST, configuration, message, String.class); assertEquals(host, configurationProp); http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerHelperTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerHelperTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerHelperTest.java index ae47c07..47d0614 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerHelperTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerHelperTest.java @@ -17,10 +17,11 @@ package org.apache.camel.component.docker; import org.junit.Test; + import static org.junit.Assert.assertEquals; public class DockerHelperTest { - + @Test public void transformHeaderTestFromHeader() { String headerField = DockerHelper.transformFromHeaderName(DockerConstants.DOCKER_REGISTRY); http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/RemoveImageCmdUriTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/RemoveImageCmdUriTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/RemoveImageCmdUriTest.java index 74a1fb2..9707b5e 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/RemoveImageCmdUriTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/RemoveImageCmdUriTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker; import java.util.Map; import com.github.dockerjava.api.command.RemoveImageCmd; - import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.docker.headers.BaseDockerHeaderTest; import org.junit.Test; @@ -35,33 +34,33 @@ public class RemoveImageCmdUriTest extends BaseDockerHeaderTest<RemoveImageCmd> private String imageId = "be29975e0098"; private Boolean noPrune = false; private Boolean force = true; - + @Mock private RemoveImageCmd mockObject; - + @Override protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { - + @Override public void configure() throws Exception { from("direct:in").to("docker://" + getOperation().toString() + "?imageId=" + imageId + "&noPrune=" + noPrune + "&force=" + force); - + } }; } - + @Test public void removeImageHeaderTest() { Map<String, Object> headers = getDefaultParameters(); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).removeImageCmd(imageId); Mockito.verify(mockObject, Mockito.times(0)).withNoPrune(); Mockito.verify(mockObject, Mockito.times(1)).withForce(); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AttachContainerCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AttachContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AttachContainerCmdHeaderTest.java index a976001..ae7765e 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AttachContainerCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AttachContainerCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.AttachContainerCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -31,20 +30,20 @@ import org.mockito.Mockito; * Validates Attach Container Request headers are applied properly */ public class AttachContainerCmdHeaderTest extends BaseDockerHeaderTest<AttachContainerCmd> { - + @Mock private AttachContainerCmd mockObject; - + @Test public void attachContainerHeaderTest() { - + String containerId = "9c09acd48a25"; boolean stdOut = true; boolean stdErr = true; boolean followStream = false; boolean logs = true; boolean timestamps = true; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_CONTAINER_ID, containerId); headers.put(DockerConstants.DOCKER_FOLLOW_STREAM, followStream); @@ -54,16 +53,15 @@ public class AttachContainerCmdHeaderTest extends BaseDockerHeaderTest<AttachCon headers.put(DockerConstants.DOCKER_LOGS, logs); - template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).attachContainerCmd(containerId); Mockito.verify(mockObject, Mockito.times(1)).withFollowStream(Matchers.eq(followStream)); Mockito.verify(mockObject, Mockito.times(1)).withLogs(Matchers.eq(logs)); Mockito.verify(mockObject, Mockito.times(1)).withStdErr(Matchers.eq(stdErr)); Mockito.verify(mockObject, Mockito.times(1)).withStdOut(Matchers.eq(stdOut)); Mockito.verify(mockObject, Mockito.times(1)).withTimestamps(Matchers.eq(timestamps)); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java index c3be8a4..2691781 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java @@ -31,35 +31,35 @@ import org.mockito.Mockito; * Validates Authentication Request headers are parsed properly */ public class AuthCmdHeaderTest extends BaseDockerHeaderTest<AuthCmd> { - + @Mock private AuthCmd mockObject; - + private String userName = "jdoe"; private String password = "password"; private String email = "j...@example.com"; private String serverAddress = "http://docker.io/v1";; - + @Test public void authHeaderTest() { String userName = "jdoe"; String password = "password"; String email = "j...@example.com"; String serverAddress = "http://docker.io/v1";; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_USERNAME, userName); headers.put(DockerConstants.DOCKER_PASSWORD, password); headers.put(DockerConstants.DOCKER_EMAIL, email); headers.put(DockerConstants.DOCKER_SERVER_ADDRESS, serverAddress); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).authCmd(); - Mockito.verify(mockObject, Mockito.times(1)).withAuthConfig((AuthConfig)Mockito.anyObject()); - + Mockito.verify(mockObject, Mockito.times(1)).withAuthConfig((AuthConfig) Mockito.anyObject()); + } - + @Override public DockerClientProfile getClientProfile() { DockerClientProfile clientProfile = super.getClientProfile(); @@ -67,7 +67,7 @@ public class AuthCmdHeaderTest extends BaseDockerHeaderTest<AuthCmd> { clientProfile.setPassword(password); clientProfile.setUsername(userName); clientProfile.setServerAddress(serverAddress); - + return clientProfile; } http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java index 2a86be7..c490317 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; import com.github.dockerjava.api.DockerClient; - import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.docker.DockerClientProfile; @@ -36,63 +35,62 @@ import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) public abstract class BaseDockerHeaderTest<T> extends CamelTestSupport { - + @Mock protected DockerClient dockerClient; - - protected DockerConfiguration dockerConfiguration; - + + protected DockerConfiguration dockerConfiguration; + @Mock T mockObject; - + @Override protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { - + @Override public void configure() throws Exception { from("direct:in").to("docker://" + getOperation().toString()); - + } }; - - } - + + } + @Before public void setupTest() { setupMocks(); } - + @Override protected CamelContext createCamelContext() throws Exception { CamelContext camelContext = super.createCamelContext(); dockerConfiguration = new DockerConfiguration(); dockerConfiguration.setParameters(getDefaultParameters()); - - + + dockerConfiguration.setClient(getClientProfile(), dockerClient); - + DockerComponent dockerComponent = new DockerComponent(dockerConfiguration); camelContext.addComponent("docker", dockerComponent); - - + return camelContext; } - - + + protected String getHost() { return "localhost"; } - + protected Integer getPort() { return 5000; } - + protected String getEmail() { return "doc...@camel.apache.org"; } - + protected Integer getMaxPerRouteConnections() { return 100; } @@ -104,7 +102,7 @@ public abstract class BaseDockerHeaderTest<T> extends CamelTestSupport { public T getMockObject() { return mockObject; } - + protected Map<String, Object> getDefaultParameters() { Map<String, Object> parameters = new HashMap<String, Object>(); parameters.put(DockerConstants.DOCKER_HOST, getHost()); @@ -115,7 +113,7 @@ public abstract class BaseDockerHeaderTest<T> extends CamelTestSupport { return parameters; } - + protected DockerClientProfile getClientProfile() { DockerClientProfile clientProfile = new DockerClientProfile(); clientProfile.setHost(getHost()); @@ -123,15 +121,15 @@ public abstract class BaseDockerHeaderTest<T> extends CamelTestSupport { clientProfile.setEmail(getEmail()); clientProfile.setMaxPerRouteConnections(getMaxPerRouteConnections()); clientProfile.setMaxTotalConnections(getMaxTotalConnections()); - + return clientProfile; } - - + + protected abstract void setupMocks(); - + protected abstract DockerOperation getOperation(); - - + + } http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BuildImageCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BuildImageCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BuildImageCmdHeaderTest.java index 4ee186a..558aa1f 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BuildImageCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BuildImageCmdHeaderTest.java @@ -22,7 +22,6 @@ import java.io.InputStream; import java.util.Map; import com.github.dockerjava.api.command.BuildImageCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -34,48 +33,48 @@ import org.mockito.Mockito; * Validates Build Image Request headers are parsed properly */ public class BuildImageCmdHeaderTest extends BaseDockerHeaderTest<BuildImageCmd> { - + @Mock private BuildImageCmd mockObject; - + @Mock private InputStream inputStream; - + @Mock private File file; - + private String repository = "docker/empty"; private boolean quiet = true; private boolean noCache = true; private boolean remove = true; private String tag = "1.0"; - + @Test public void buildImageFromInputStreamHeaderTest() { - + template.sendBodyAndHeaders("direct:in", inputStream, getHeaders()); - + Mockito.verify(dockerClient, Mockito.times(1)).buildImageCmd(Matchers.any(InputStream.class)); Mockito.verify(mockObject, Mockito.times(1)).withQuiet(quiet); Mockito.verify(mockObject, Mockito.times(1)).withNoCache(noCache); Mockito.verify(mockObject, Mockito.times(1)).withRemove(remove); Mockito.verify(mockObject, Mockito.times(1)).withTag(tag); - + } - + @Test public void buildImageFromFileHeaderTest() { - + template.sendBodyAndHeaders("direct:in", file, getHeaders()); - + Mockito.verify(dockerClient, Mockito.times(1)).buildImageCmd(Matchers.any(File.class)); Mockito.verify(mockObject, Mockito.times(1)).withQuiet(quiet); Mockito.verify(mockObject, Mockito.times(1)).withNoCache(noCache); Mockito.verify(mockObject, Mockito.times(1)).withRemove(remove); Mockito.verify(mockObject, Mockito.times(1)).withTag(tag); - + } - + @Override protected void setupMocks() { Mockito.when(dockerClient.buildImageCmd(Matchers.any(InputStream.class))).thenReturn(mockObject); @@ -87,7 +86,7 @@ public class BuildImageCmdHeaderTest extends BaseDockerHeaderTest<BuildImageCmd> protected DockerOperation getOperation() { return DockerOperation.BUILD_IMAGE; } - + private Map<String, Object> getHeaders() { Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_REPOSITORY, repository); @@ -95,7 +94,7 @@ public class BuildImageCmdHeaderTest extends BaseDockerHeaderTest<BuildImageCmd> headers.put(DockerConstants.DOCKER_NO_CACHE, noCache); headers.put(DockerConstants.DOCKER_TAG, tag); headers.put(DockerConstants.DOCKER_REMOVE, remove); - + return headers; } http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CommitContainerCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CommitContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CommitContainerCmdHeaderTest.java index 83621cd..c2e7045 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CommitContainerCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CommitContainerCmdHeaderTest.java @@ -16,14 +16,13 @@ */ package org.apache.camel.component.docker.headers; +import java.util.Map; + import com.github.dockerjava.api.command.CommitCmd; import com.github.dockerjava.api.model.ExposedPort; import com.github.dockerjava.api.model.ExposedPorts; import com.github.dockerjava.api.model.Volume; import com.github.dockerjava.api.model.Volumes; - -import java.util.Map; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -36,13 +35,13 @@ import org.mockito.Mockito; */ public class CommitContainerCmdHeaderTest extends BaseDockerHeaderTest<CommitCmd> { - + @Mock private CommitCmd mockObject; - + @Test public void commitContainerHeaderTest() { - + String containerId = "9c09acd48a25"; String env = "FOO=bar"; boolean attachStdErr = true; @@ -66,8 +65,8 @@ public class CommitContainerCmdHeaderTest extends BaseDockerHeaderTest<CommitCmd Volumes volumes = new Volumes(new Volume("/example")); boolean tty = true; String hostname = "dockerhostname"; - - + + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_CONTAINER_ID, containerId); headers.put(DockerConstants.DOCKER_ENV, env); @@ -92,9 +91,9 @@ public class CommitContainerCmdHeaderTest extends BaseDockerHeaderTest<CommitCmd headers.put(DockerConstants.DOCKER_OPEN_STD_IN, openStdIn); headers.put(DockerConstants.DOCKER_STD_IN_ONCE, stdInOnce); headers.put(DockerConstants.DOCKER_PORT_SPECS, portSpecs); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).commitCmd(containerId); Mockito.verify(mockObject, Mockito.times(1)).withEnv(env); Mockito.verify(mockObject, Mockito.times(1)).withAttachStderr(attachStdErr); @@ -118,7 +117,7 @@ public class CommitContainerCmdHeaderTest extends BaseDockerHeaderTest<CommitCmd Mockito.verify(mockObject, Mockito.times(1)).withOpenStdin(openStdIn); Mockito.verify(mockObject, Mockito.times(1)).withStdinOnce(stdInOnce); Mockito.verify(mockObject, Mockito.times(1)).withPortSpecs(portSpecs); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CopyFileContainerCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CopyFileContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CopyFileContainerCmdHeaderTest.java index 1591e7a..91862ff 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CopyFileContainerCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CopyFileContainerCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.CopyFileFromContainerCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -31,17 +30,17 @@ import org.mockito.Mockito; * Validates Copy File from Container Request headers are applied properly */ public class CopyFileContainerCmdHeaderTest extends BaseDockerHeaderTest<CopyFileFromContainerCmd> { - + @Mock private CopyFileFromContainerCmd mockObject; - + @Test public void copyFileFromContainerHeaderTest() { - + String containerId = "9c09acd48a25"; String resource = "/test"; String hostPath = "/test/test2"; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_CONTAINER_ID, containerId); headers.put(DockerConstants.DOCKER_RESOURCE, resource); @@ -49,10 +48,10 @@ public class CopyFileContainerCmdHeaderTest extends BaseDockerHeaderTest<CopyFil template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).copyFileFromContainerCmd(containerId, resource); Mockito.verify(mockObject, Mockito.times(1)).withHostPath(Matchers.eq(hostPath)); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateContainerCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateContainerCmdHeaderTest.java index 1680143..388f370 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateContainerCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateContainerCmdHeaderTest.java @@ -16,14 +16,13 @@ */ package org.apache.camel.component.docker.headers; +import java.util.Map; + import com.github.dockerjava.api.command.CreateContainerCmd; import com.github.dockerjava.api.model.Capability; import com.github.dockerjava.api.model.ExposedPort; import com.github.dockerjava.api.model.HostConfig; import com.github.dockerjava.api.model.Volume; - -import java.util.Map; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -36,13 +35,13 @@ import org.mockito.Mockito; */ public class CreateContainerCmdHeaderTest extends BaseDockerHeaderTest<CreateContainerCmd> { - + @Mock private CreateContainerCmd mockObject; - + @Test public void createContainerHeaderTest() { - + String image = "busybox"; ExposedPort exposedPort = ExposedPort.tcp(22); boolean tty = true; @@ -66,11 +65,11 @@ public class CreateContainerCmdHeaderTest extends BaseDockerHeaderTest<CreateCon HostConfig hostConfig = new HostConfig(); Capability capAdd = Capability.NET_BROADCAST; Capability capDrop = Capability.BLOCK_SUSPEND; - String[] entrypoint = new String[]{"sleep","9999"}; + String[] entrypoint = new String[]{"sleep", "9999"}; String portSpecs = "80"; String dns = "8.8.8.8"; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_IMAGE, image); headers.put(DockerConstants.DOCKER_EXPOSED_PORTS, exposedPort); @@ -99,9 +98,9 @@ public class CreateContainerCmdHeaderTest extends BaseDockerHeaderTest<CreateCon headers.put(DockerConstants.DOCKER_PORT_SPECS, portSpecs); headers.put(DockerConstants.DOCKER_DNS, dns); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).createContainerCmd(image); Mockito.verify(mockObject, Mockito.times(1)).withExposedPorts(Matchers.eq(exposedPort)); Mockito.verify(mockObject, Mockito.times(1)).withTty(Matchers.eq(tty)); @@ -128,7 +127,7 @@ public class CreateContainerCmdHeaderTest extends BaseDockerHeaderTest<CreateCon Mockito.verify(mockObject, Mockito.times(1)).withEntrypoint(entrypoint); Mockito.verify(mockObject, Mockito.times(1)).withPortSpecs(portSpecs); Mockito.verify(mockObject, Mockito.times(1)).withDns(dns); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateImageCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateImageCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateImageCmdHeaderTest.java index 464a2ca..4fc5b75 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateImageCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateImageCmdHeaderTest.java @@ -16,11 +16,10 @@ */ package org.apache.camel.component.docker.headers; -import com.github.dockerjava.api.command.CreateImageCmd; - import java.io.InputStream; import java.util.Map; +import com.github.dockerjava.api.command.CreateImageCmd; import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -32,27 +31,27 @@ import org.mockito.Mockito; * Validates Create Image Request headers are parsed properly */ public class CreateImageCmdHeaderTest extends BaseDockerHeaderTest<CreateImageCmd> { - + @Mock private CreateImageCmd mockObject; - + @Mock private InputStream inputStream; @Test public void createImageHeaderTest() { - + String repository = "docker/empty"; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_REPOSITORY, repository); - + template.sendBodyAndHeaders("direct:in", inputStream, headers); - + Mockito.verify(dockerClient, Mockito.times(1)).createImageCmd(Matchers.eq(repository), Matchers.any(InputStream.class)); - + } - + @Override protected void setupMocks() { Mockito.when(dockerClient.createImageCmd(Matchers.anyString(), Matchers.any(InputStream.class))).thenReturn(mockObject); http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/DiffContainerCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/DiffContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/DiffContainerCmdHeaderTest.java index 9e65897..141f1cc 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/DiffContainerCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/DiffContainerCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.ContainerDiffCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -34,22 +33,22 @@ public class DiffContainerCmdHeaderTest extends BaseDockerHeaderTest<ContainerDi @Mock private ContainerDiffCmd mockObject; - + @Test public void containerDiffHeaderTest() { - + String containerId = "9c09acd48a25"; String containerIdDiff = "0f9dfe8defa0"; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_CONTAINER_ID, containerId); headers.put(DockerConstants.DOCKER_CONTAINER_ID_DIFF, containerIdDiff); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).containerDiffCmd(containerId); Mockito.verify(mockObject, Mockito.times(1)).withContainerId(containerIdDiff); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecCreateCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecCreateCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecCreateCmdHeaderTest.java index 12925df..3a77338 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecCreateCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecCreateCmdHeaderTest.java @@ -16,10 +16,9 @@ */ package org.apache.camel.component.docker.headers; -import com.github.dockerjava.api.command.ExecCreateCmd; - import java.util.Map; +import com.github.dockerjava.api.command.ExecCreateCmd; import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -31,42 +30,41 @@ import org.mockito.Mockito; * Validates Exec Create Request headers are parsed properly */ public class ExecCreateCmdHeaderTest extends BaseDockerHeaderTest<ExecCreateCmd> { - + @Mock private ExecCreateCmd mockObject; - + @Test public void execCreateHeaderTest() { - + String containerId = "9c09acd48a25"; boolean tty = true; boolean stdErr = false; boolean stdOut = true; boolean stdIn = true; - - + + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_CONTAINER_ID, containerId); headers.put(DockerConstants.DOCKER_TTY, tty); - headers.put(DockerConstants.DOCKER_ATTACH_STD_ERR, stdErr); + headers.put(DockerConstants.DOCKER_ATTACH_STD_ERR, stdErr); headers.put(DockerConstants.DOCKER_ATTACH_STD_OUT, stdOut); headers.put(DockerConstants.DOCKER_ATTACH_STD_IN, stdIn); headers.put(DockerConstants.DOCKER_CMD, "date;whoami"); template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).execCreateCmd(Matchers.eq(containerId)); Mockito.verify(mockObject, Mockito.times(1)).withTty(Matchers.eq(tty)); Mockito.verify(mockObject, Mockito.times(1)).withAttachStderr(Matchers.eq(stdErr)); Mockito.verify(mockObject, Mockito.times(1)).withAttachStdout(Matchers.eq(stdOut)); Mockito.verify(mockObject, Mockito.times(1)).withAttachStdin(Matchers.eq(stdIn)); - Mockito.verify(mockObject, Mockito.times(1)).withCmd(new String[]{"date","whoami"}); + Mockito.verify(mockObject, Mockito.times(1)).withCmd(new String[]{"date", "whoami"}); - } - + @Override protected void setupMocks() { Mockito.when(dockerClient.execCreateCmd(Matchers.anyString())).thenReturn(mockObject); http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecStartCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecStartCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecStartCmdHeaderTest.java index 6498b22..8c753e2 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecStartCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecStartCmdHeaderTest.java @@ -16,10 +16,9 @@ */ package org.apache.camel.component.docker.headers; -import com.github.dockerjava.api.command.ExecStartCmd; - import java.util.Map; +import com.github.dockerjava.api.command.ExecStartCmd; import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -31,27 +30,27 @@ import org.mockito.Mockito; * Validates Exec Start Request headers are parsed properly */ public class ExecStartCmdHeaderTest extends BaseDockerHeaderTest<ExecStartCmd> { - + @Mock private ExecStartCmd mockObject; - + @Test public void execCreateHeaderTest() { - + String id = "1"; boolean tty = true; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_EXEC_ID, id); headers.put(DockerConstants.DOCKER_TTY, tty); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).execStartCmd(Matchers.eq(id)); Mockito.verify(mockObject, Mockito.times(1)).withTty(Matchers.eq(tty)); - + } - + @Override protected void setupMocks() { Mockito.when(dockerClient.execStartCmd(Matchers.anyString())).thenReturn(mockObject); http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InfoCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InfoCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InfoCmdHeaderTest.java index 85af45d..3cc36fd 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InfoCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InfoCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.InfoCmd; - import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; import org.mockito.Mock; @@ -32,16 +31,16 @@ public class InfoCmdHeaderTest extends BaseDockerHeaderTest<InfoCmd> { @Mock private InfoCmd mockObject; - + @Test public void infoHeaderTest() { - + Map<String, Object> headers = getDefaultParameters(); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).infoCmd(); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectContainerCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectContainerCmdHeaderTest.java index 2abe9e3..69b4d50 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectContainerCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectContainerCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.InspectContainerCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -31,21 +30,21 @@ import org.mockito.Mockito; * Validates Inspect Container Request headers are applied properly */ public class InspectContainerCmdHeaderTest extends BaseDockerHeaderTest<InspectContainerCmd> { - + @Mock private InspectContainerCmd mockObject; - + @Test public void inspectContainerHeaderTest() { - + String containerId = "9c09acd48a25"; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_CONTAINER_ID, containerId); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).inspectContainerCmd(containerId); } http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectImageCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectImageCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectImageCmdHeaderTest.java index a315fc4..d2aa4d7 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectImageCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectImageCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.InspectImageCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -34,26 +33,26 @@ public class InspectImageCmdHeaderTest extends BaseDockerHeaderTest<InspectImage @Mock private InspectImageCmd mockObject; - + @Test public void listImageHeaderTest() { - + String imageId = "be29975e0098"; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_IMAGE_ID, imageId); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).inspectImageCmd(Matchers.eq(imageId)); - + } @Override protected void setupMocks() { Mockito.when(dockerClient.inspectImageCmd(Matchers.anyString())).thenReturn(mockObject); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/KillContainerCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/KillContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/KillContainerCmdHeaderTest.java index 28a3012..8cd5266 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/KillContainerCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/KillContainerCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.KillContainerCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -31,25 +30,25 @@ import org.mockito.Mockito; * Validates Kill Container Request headers are applied properly */ public class KillContainerCmdHeaderTest extends BaseDockerHeaderTest<KillContainerCmd> { - + @Mock private KillContainerCmd mockObject; - + @Test public void stopContainerHeaderTest() { - + String containerId = "9c09acd48a25"; String signal = "signal"; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_CONTAINER_ID, containerId); headers.put(DockerConstants.DOCKER_SIGNAL, signal); template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).killContainerCmd(containerId); Mockito.verify(mockObject, Mockito.times(1)).withSignal(Matchers.eq(signal)); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListContainersCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListContainersCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListContainersCmdHeaderTest.java index 35a377d..7ff4f91 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListContainersCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListContainersCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.ListContainersCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -31,19 +30,19 @@ import org.mockito.Mockito; * Validates List Containers Request headers are applied properly */ public class ListContainersCmdHeaderTest extends BaseDockerHeaderTest<ListContainersCmd> { - + @Mock private ListContainersCmd mockObject; - + @Test public void listContainerHeaderTest() { - + boolean showSize = true; boolean showAll = false; int limit = 2; String since = "id1"; String before = "id2"; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_LIMIT, limit); headers.put(DockerConstants.DOCKER_SHOW_ALL, showAll); @@ -52,16 +51,15 @@ public class ListContainersCmdHeaderTest extends BaseDockerHeaderTest<ListContai headers.put(DockerConstants.DOCKER_BEFORE, before); - template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).listContainersCmd(); Mockito.verify(mockObject, Mockito.times(1)).withShowAll(Matchers.eq(showAll)); Mockito.verify(mockObject, Mockito.times(1)).withShowSize(Matchers.eq(showSize)); Mockito.verify(mockObject, Mockito.times(1)).withLimit(Matchers.eq(limit)); Mockito.verify(mockObject, Mockito.times(1)).withSince(Matchers.eq(since)); Mockito.verify(mockObject, Mockito.times(1)).withBefore(Matchers.eq(before)); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListImagesCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListImagesCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListImagesCmdHeaderTest.java index b2e6a91..df6051e 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListImagesCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListImagesCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.ListImagesCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -32,27 +31,27 @@ import org.mockito.Mockito; */ public class ListImagesCmdHeaderTest extends BaseDockerHeaderTest<ListImagesCmd> { - + @Mock private ListImagesCmd mockObject; - + @Test public void listImageHeaderTest() { - + String filter = "{\"dangling\":[\"true\"]}"; Boolean showAll = true; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_FILTER, filter); headers.put(DockerConstants.DOCKER_SHOW_ALL, showAll); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).listImagesCmd(); Mockito.verify(mockObject, Mockito.times(1)).withFilters(Matchers.eq(filter)); Mockito.verify(mockObject, Mockito.times(1)).withShowAll(Matchers.eq(showAll)); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/LogContainerCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/LogContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/LogContainerCmdHeaderTest.java index e427b35..2cf0e01 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/LogContainerCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/LogContainerCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.LogContainerCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -31,13 +30,13 @@ import org.mockito.Mockito; * Validates Log Container Request headers are applied properly */ public class LogContainerCmdHeaderTest extends BaseDockerHeaderTest<LogContainerCmd> { - + @Mock private LogContainerCmd mockObject; - + @Test public void logContainerHeaderTest() { - + String containerId = "9c09acd48a25"; boolean stdOut = true; boolean stdErr = true; @@ -45,7 +44,7 @@ public class LogContainerCmdHeaderTest extends BaseDockerHeaderTest<LogContainer boolean timestamps = false; boolean tailAll = true; int tail = 5; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_CONTAINER_ID, containerId); headers.put(DockerConstants.DOCKER_FOLLOW_STREAM, followStream); @@ -56,7 +55,7 @@ public class LogContainerCmdHeaderTest extends BaseDockerHeaderTest<LogContainer headers.put(DockerConstants.DOCKER_TAIL_ALL, tailAll); template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).logContainerCmd(containerId); Mockito.verify(mockObject, Mockito.times(1)).withFollowStream(Matchers.eq(followStream)); Mockito.verify(mockObject, Mockito.times(1)).withTail(Matchers.eq(tail)); @@ -64,7 +63,7 @@ public class LogContainerCmdHeaderTest extends BaseDockerHeaderTest<LogContainer Mockito.verify(mockObject, Mockito.times(1)).withStdErr(Matchers.eq(stdErr)); Mockito.verify(mockObject, Mockito.times(1)).withStdOut(Matchers.eq(stdOut)); Mockito.verify(mockObject, Mockito.times(1)).withTimestamps(Matchers.eq(timestamps)); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PauseContainerCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PauseContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PauseContainerCmdHeaderTest.java index d4a0b09..93c2083 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PauseContainerCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PauseContainerCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.PauseContainerCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -31,23 +30,23 @@ import org.mockito.Mockito; * Validates Pause Container Request headers are applied properly */ public class PauseContainerCmdHeaderTest extends BaseDockerHeaderTest<PauseContainerCmd> { - + @Mock private PauseContainerCmd mockObject; - + @Test public void pauseHeaderTest() { - + String containerId = "9c09acd48a25"; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_CONTAINER_ID, containerId); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).pauseContainerCmd(containerId); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PingCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PingCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PingCmdHeaderTest.java index aee158a..c1579ff 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PingCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PingCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.PingCmd; - import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; import org.mockito.Mock; @@ -32,15 +31,15 @@ public class PingCmdHeaderTest extends BaseDockerHeaderTest<PingCmd> { @Mock private PingCmd mockObject; - + @Test public void pingHeaderTest() { - + Map<String, Object> headers = getDefaultParameters(); template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).pingCmd(); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java index bf2a68b..b80b388 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.PullImageCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -31,29 +30,29 @@ import org.mockito.Mockito; * Validates Pull Image Request headers are applied properly */ public class PullImageCmdHeaderTest extends BaseDockerHeaderTest<PullImageCmd> { - + @Mock private PullImageCmd mockObject; - + @Test public void pullImageHeaderTest() { - + String repository = "docker/empty"; String tag = "1.0"; String registry = "registry"; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_REPOSITORY, repository); headers.put(DockerConstants.DOCKER_TAG, tag); headers.put(DockerConstants.DOCKER_REGISTRY, registry); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).pullImageCmd(repository); Mockito.verify(mockObject, Mockito.times(1)).withTag(Matchers.eq(tag)); Mockito.verify(mockObject, Mockito.times(1)).withRegistry(Matchers.eq(registry)); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java index 59091f1..3ed43dd 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.PushImageCmd; - import org.apache.camel.component.docker.DockerClientProfile; import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; @@ -32,10 +31,10 @@ import org.mockito.Mockito; * Validates Push Image Request headers are applied properly */ public class PushImageCmdHeaderTest extends BaseDockerHeaderTest<PushImageCmd> { - + @Mock private PushImageCmd mockObject; - + private String userName = "jdoe"; private String password = "password"; private String email = "j...@example.com"; @@ -43,11 +42,11 @@ public class PushImageCmdHeaderTest extends BaseDockerHeaderTest<PushImageCmd> { private String name = "imagename"; private String tag = "1.0"; - + @Test public void pushImageHeaderTest() { - - + + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_USERNAME, userName); headers.put(DockerConstants.DOCKER_PASSWORD, password); @@ -56,13 +55,13 @@ public class PushImageCmdHeaderTest extends BaseDockerHeaderTest<PushImageCmd> { headers.put(DockerConstants.DOCKER_NAME, name); headers.put(DockerConstants.DOCKER_TAG, tag); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).pushImageCmd(name); Mockito.verify(mockObject, Mockito.times(1)).withTag(tag); - + } @Override @@ -74,7 +73,7 @@ public class PushImageCmdHeaderTest extends BaseDockerHeaderTest<PushImageCmd> { protected DockerOperation getOperation() { return DockerOperation.PUSH_IMAGE; } - + @Override public DockerClientProfile getClientProfile() { DockerClientProfile clientProfile = super.getClientProfile(); @@ -82,9 +81,9 @@ public class PushImageCmdHeaderTest extends BaseDockerHeaderTest<PushImageCmd> { clientProfile.setPassword(password); clientProfile.setUsername(userName); clientProfile.setServerAddress(serverAddress); - + return clientProfile; - + } http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveContainerCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveContainerCmdHeaderTest.java index ff434da..95b8567 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveContainerCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveContainerCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.RemoveContainerCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -31,31 +30,30 @@ import org.mockito.Mockito; * Validates Remove Container Request headers are applied properly */ public class RemoveContainerCmdHeaderTest extends BaseDockerHeaderTest<RemoveContainerCmd> { - + @Mock private RemoveContainerCmd mockObject; - + @Test public void removeContainerHeaderTest() { - + String containerId = "9c09acd48a25"; boolean force = false; boolean removeVolumes = true; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_CONTAINER_ID, containerId); headers.put(DockerConstants.DOCKER_FORCE, force); headers.put(DockerConstants.DOCKER_REMOVE_VOLUMES, removeVolumes); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).removeContainerCmd(containerId); Mockito.verify(mockObject, Mockito.times(1)).withForce(Matchers.eq(force)); Mockito.verify(mockObject, Mockito.times(1)).withRemoveVolumes(Matchers.eq(removeVolumes)); - } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveImageCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveImageCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveImageCmdHeaderTest.java index cfa46e2..ad06a5f 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveImageCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveImageCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.RemoveImageCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -34,28 +33,27 @@ public class RemoveImageCmdHeaderTest extends BaseDockerHeaderTest<RemoveImageCm @Mock private RemoveImageCmd mockObject; - + @Test public void removeImageHeaderTest() { - + String imageId = "be29975e0098"; Boolean noPrune = false; Boolean force = true; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_IMAGE_ID, imageId); headers.put(DockerConstants.DOCKER_NO_PRUNE, noPrune); headers.put(DockerConstants.DOCKER_FORCE, force); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).removeImageCmd(imageId); Mockito.verify(mockObject, Mockito.times(0)).withNoPrune(); Mockito.verify(mockObject, Mockito.times(1)).withForce(); - - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RestartContainerCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RestartContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RestartContainerCmdHeaderTest.java index a0acd78..85fa363 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RestartContainerCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RestartContainerCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.RestartContainerCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -31,26 +30,26 @@ import org.mockito.Mockito; * Validates Restart Container Request headers are applied properly */ public class RestartContainerCmdHeaderTest extends BaseDockerHeaderTest<RestartContainerCmd> { - + @Mock private RestartContainerCmd mockObject; - + @Test public void restartContainerHeaderTest() { - + String containerId = "9c09acd48a25"; int timeout = 50; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_CONTAINER_ID, containerId); headers.put(DockerConstants.DOCKER_TIMEOUT, timeout); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).restartContainerCmd(containerId); Mockito.verify(mockObject, Mockito.times(1)).withtTimeout(Matchers.eq(timeout)); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/SearchImagesCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/SearchImagesCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/SearchImagesCmdHeaderTest.java index 27bb4b5..ce4d1db 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/SearchImagesCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/SearchImagesCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.SearchImagesCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -34,20 +33,20 @@ public class SearchImagesCmdHeaderTest extends BaseDockerHeaderTest<SearchImages @Mock private SearchImagesCmd mockObject; - + @Test public void searchImagesHeaderTest() { - + String term = "dockerTerm"; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_TERM, term); template.sendBodyAndHeaders("direct:in", "", headers); Mockito.verify(dockerClient, Mockito.times(1)).searchImagesCmd(Matchers.eq(term)); - - + + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StartContainerCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StartContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StartContainerCmdHeaderTest.java index e3e266f..17d3bbf 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StartContainerCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StartContainerCmdHeaderTest.java @@ -16,6 +16,8 @@ */ package org.apache.camel.component.docker.headers; +import java.util.Map; + import com.github.dockerjava.api.command.StartContainerCmd; import com.github.dockerjava.api.model.Bind; import com.github.dockerjava.api.model.Capability; @@ -27,9 +29,6 @@ import com.github.dockerjava.api.model.PortBinding; import com.github.dockerjava.api.model.Ports; import com.github.dockerjava.api.model.RestartPolicy; import com.github.dockerjava.api.model.Volume; - -import java.util.Map; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -41,19 +40,19 @@ import org.mockito.Mockito; * Validates Start Container Request headers are applied properly */ public class StartContainerCmdHeaderTest extends BaseDockerHeaderTest<StartContainerCmd> { - - @Mock - private StartContainerCmd mockObject; - + @Mock ExposedPort exposedPort; - + + @Mock + private StartContainerCmd mockObject; + @Test public void startContainerHeaderTest() { - + String containerId = "be29975e0098"; Volume vol = new Volume("/opt/webapp1"); - Bind[] binds = new Bind[]{new Bind("/opt/webapp1",vol)}; + Bind[] binds = new Bind[]{new Bind("/opt/webapp1", vol)}; boolean publishAllPorts = false; boolean privileged = false; String[] dns = new String[]{"8.8.8.8"}; @@ -65,9 +64,9 @@ public class StartContainerCmdHeaderTest extends BaseDockerHeaderTest<StartConta Capability capDrop = Capability.BLOCK_SUSPEND; Device[] devices = new Device[]{new Device("rwm", "/dev/nulo", "/dev/zero")}; RestartPolicy restartPolicy = RestartPolicy.noRestart(); - PortBinding[] portBindings = new PortBinding[]{new PortBinding(Ports.Binding(28768),ExposedPort.tcp(22))}; + PortBinding[] portBindings = new PortBinding[]{new PortBinding(Ports.Binding(28768), ExposedPort.tcp(22))}; Ports ports = new Ports(ExposedPort.tcp(22), Ports.Binding(11022)); - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_CONTAINER_ID, containerId); headers.put(DockerConstants.DOCKER_BINDS, binds); @@ -86,9 +85,9 @@ public class StartContainerCmdHeaderTest extends BaseDockerHeaderTest<StartConta headers.put(DockerConstants.DOCKER_PORT_BINDINGS, portBindings); headers.put(DockerConstants.DOCKER_PORTS, ports); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).startContainerCmd(containerId); Mockito.verify(mockObject, Mockito.times(1)).withBinds(binds); Mockito.verify(mockObject, Mockito.times(1)).withPublishAllPorts(publishAllPorts); @@ -105,7 +104,7 @@ public class StartContainerCmdHeaderTest extends BaseDockerHeaderTest<StartConta Mockito.verify(mockObject, Mockito.times(1)).withRestartPolicy(restartPolicy); Mockito.verify(mockObject, Mockito.times(1)).withPortBindings(portBindings); Mockito.verify(mockObject, Mockito.times(1)).withPortBindings(ports); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StopContainerCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StopContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StopContainerCmdHeaderTest.java index 03a3de3..9e1b351 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StopContainerCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StopContainerCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.StopContainerCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -31,26 +30,26 @@ import org.mockito.Mockito; * Validates Stop Container Request headers are applied properly */ public class StopContainerCmdHeaderTest extends BaseDockerHeaderTest<StopContainerCmd> { - + @Mock private StopContainerCmd mockObject; - + @Test public void stopContainerHeaderTest() { - + String containerId = "9c09acd48a25"; int timeout = 50; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_CONTAINER_ID, containerId); headers.put(DockerConstants.DOCKER_TIMEOUT, timeout); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).stopContainerCmd(containerId); Mockito.verify(mockObject, Mockito.times(1)).withTimeout(Matchers.eq(timeout)); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TagImageCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TagImageCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TagImageCmdHeaderTest.java index 577b6a0..0634ba3 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TagImageCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TagImageCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.TagImageCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -31,31 +30,31 @@ import org.mockito.Mockito; * Validates Tag Image Request headers are applied properly */ public class TagImageCmdHeaderTest extends BaseDockerHeaderTest<TagImageCmd> { - + @Mock private TagImageCmd mockObject; - + @Test public void tagImageHeaderTest() { - + String imageId = "be29975e0098"; String repository = "docker/empty"; String tag = "1.0"; boolean force = true; - - + + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_IMAGE_ID, imageId); headers.put(DockerConstants.DOCKER_REPOSITORY, repository); headers.put(DockerConstants.DOCKER_TAG, tag); headers.put(DockerConstants.DOCKER_FORCE, force); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).tagImageCmd(imageId, repository, tag); Mockito.verify(mockObject, Mockito.times(1)).withForce(force); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TopContainerCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TopContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TopContainerCmdHeaderTest.java index 95ee575..11d8d85 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TopContainerCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TopContainerCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.TopContainerCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -31,26 +30,26 @@ import org.mockito.Mockito; * Validates Top Container Request headers are applied properly */ public class TopContainerCmdHeaderTest extends BaseDockerHeaderTest<TopContainerCmd> { - + @Mock private TopContainerCmd mockObject; - + @Test public void topContainerHeaderTest() { - + String containerId = "9c09acd48a25"; String psArgs = "aux"; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_CONTAINER_ID, containerId); headers.put(DockerConstants.DOCKER_PS_ARGS, psArgs); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).topContainerCmd(containerId); Mockito.verify(mockObject, Mockito.times(1)).withPsArgs(Matchers.eq(psArgs)); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/UnpauseContainerCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/UnpauseContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/UnpauseContainerCmdHeaderTest.java index 7d93c2a..35a9bfa 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/UnpauseContainerCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/UnpauseContainerCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.UnpauseContainerCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -31,23 +30,23 @@ import org.mockito.Mockito; * Validates Unpause Container Request headers are applied properly */ public class UnpauseContainerCmdHeaderTest extends BaseDockerHeaderTest<UnpauseContainerCmd> { - + @Mock private UnpauseContainerCmd mockObject; - + @Test public void unpauseHeaderTest() { - + String containerId = "9c09acd48a25"; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_CONTAINER_ID, containerId); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).unpauseContainerCmd(containerId); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/VersionCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/VersionCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/VersionCmdHeaderTest.java index 820283e..7bfc948 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/VersionCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/VersionCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.VersionCmd; - import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; import org.mockito.Mock; @@ -32,16 +31,16 @@ public class VersionCmdHeaderTest extends BaseDockerHeaderTest<VersionCmd> { @Mock private VersionCmd mockObject; - + @Test public void pingHeaderTest() { - + Map<String, Object> headers = getDefaultParameters(); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).versionCmd(); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/WaitContainerCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/WaitContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/WaitContainerCmdHeaderTest.java index cc16c9e..a0aab61 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/WaitContainerCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/WaitContainerCmdHeaderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.WaitContainerCmd; - import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; @@ -31,23 +30,23 @@ import org.mockito.Mockito; * Validates Wait Container Request headers are applied properly */ public class WaitContainerCmdHeaderTest extends BaseDockerHeaderTest<WaitContainerCmd> { - + @Mock private WaitContainerCmd mockObject; - + @Test public void waitContainerHeaderTest() { - + String containerId = "9c09acd48a25"; - + Map<String, Object> headers = getDefaultParameters(); headers.put(DockerConstants.DOCKER_CONTAINER_ID, containerId); - + template.sendBodyAndHeaders("direct:in", "", headers); - + Mockito.verify(dockerClient, Mockito.times(1)).waitContainerCmd(containerId); - + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2f5626df/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTestIT.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTestIT.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTestIT.java index ee5e0aa..e6794be 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTestIT.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTestIT.java @@ -36,7 +36,7 @@ public class DockerProducerTestIT extends CamelTestSupport { template.sendBody("direct:in", ""); MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedMinimumMessageCount(1); + mock.expectedMinimumMessageCount(1); assertMockEndpointsSatisfied(60, TimeUnit.SECONDS); } @@ -46,9 +46,9 @@ public class DockerProducerTestIT extends CamelTestSupport { return new RouteBuilder() { public void configure() { from("direct:in") - .to("docker://imagelist?host=" + host + "&port=" + port + "&certPath=/Users/cameluser/.docker/boot2docker-vm&secure=true") - .log("${body}") - .to("mock:result"); + .to("docker://imagelist?host=" + host + "&port=" + port + "&certPath=/Users/cameluser/.docker/boot2docker-vm&secure=true") + .log("${body}") + .to("mock:result"); } }; }
