Created integration test for FrameReader.

alexec · alexec · commit ebaba3588bd6 · 2015-05-03T09:43:24.000+01:00
diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -0,0 +1,63 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.DockerClient;
+
+import java.io.File;
+
+/**
+ * Start and stop a single container for testing.
+ */
+public class DockerfileFixture implements AutoCloseable {
+
+    private final DockerClient dockerClient;
+    private String directory;
+    private String repository;
+    private String containerId;
+
+    public DockerfileFixture(DockerClient dockerClient, String directory) {
+        this.dockerClient = dockerClient;
+        this.directory = directory;
+    }
+
+    public void open() throws Exception {
+
+        dockerClient
+                .buildImageCmd(new File("src/test/resources", directory))
+                .withNoCache() // remove alternatives, cause problems
+                .exec()
+                .close();
+
+        repository = dockerClient
+                .listImagesCmd()
+                .exec()
+                .get(0)
+                .getRepoTags()[0];
+
+        containerId = dockerClient
+                .createContainerCmd(repository)
+                .exec()
+                .getId();
+
+        dockerClient
+                .startContainerCmd(containerId)
+                .exec();
+    }
+
+    @Override
+    public void close() throws Exception {
+
+        dockerClient
+                .removeContainerCmd(containerId)
+                .withForce() // stop too
+                .exec();
+
+        dockerClient
+                .removeImageCmd(repository)
+                .withForce()
+                .exec();
+    }
+
+    public String getContainerId() {
+        return containerId;
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -0,0 +1,58 @@
+package com.github.dockerjava.core.command;
+
+
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.StreamType;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.InputStream;
+
+@Test(groups = "integration")
+public class FrameReaderITest extends AbstractDockerClientTest {
+
+    private DockerfileFixture dockerfileFixture;
+
+    @BeforeMethod
+    @Override
+    public void beforeTest() {
+        super.beforeTest();
+        dockerfileFixture = new DockerfileFixture(dockerClient, "frameReaderDockerfile");
+    }
+
+    @BeforeMethod
+    public void createAndStartDockerContainer() throws Exception {
+        dockerfileFixture.open();
+    }
+
+    @AfterMethod
+    public void deleteDockerContainerImage() throws Exception {
+        dockerfileFixture.close();
+    }
+
+    @AfterMethod
+    @Override
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @Test
+    public void canCloseFrameReaderAndReadExpectedLinens() throws Exception {
+
+        InputStream log = dockerClient
+                .logContainerCmd(dockerfileFixture.getContainerId())
+                .withStdOut()
+                .withStdErr()
+                .withFollowStream()
+                .withTailAll()
+                .exec();
+
+        try (FrameReader reader = new FrameReader(log)) {
+            assertEquals(reader.readFrame(), new Frame(StreamType.STDOUT, String.format("to stdout%n").getBytes()));
+            assertEquals(reader.readFrame(), new Frame(StreamType.STDERR, String.format("to stderr%n").getBytes()));
+            assertNull(reader.readFrame());
+        }
+    }
+}
diff --git a/src/test/resources/frameReaderDockerfile/Dockerfile b/src/test/resources/frameReaderDockerfile/Dockerfile
@@ -0,0 +1,10 @@
+FROM busybox:latest
+
+# log to stdout and stderr so we can make sure logging with FrameReader works
+
+RUN echo '#! /bin/sh' > cmd.sh
+RUN echo 'echo "to stdout"' >> cmd.sh
+RUN echo 'echo "to stderr" > /dev/stderr' >> cmd.sh
+RUN chmod +x cmd.sh
+
+CMD ["./cmd.sh"]
