Add new unit test case for ENV substitution

mocleiri · mocleiri · commit e6666f8b77c5 · 2014-07-08T09:50:46.000-04:00
diff --git a/src/test/java/com/github/dockerjava/client/command/BuildImageCmdTest.java b/src/test/java/com/github/dockerjava/client/command/BuildImageCmdTest.java
@@ -12,6 +12,8 @@
 import java.io.IOException;
 import java.io.StringWriter;
 import java.lang.reflect.Method;
+import java.net.URI;
+import java.net.URISyntaxException;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
@@ -113,6 +115,7 @@ public void testDockerBuilderAddFolder() throws DockerException,
 		dockerfileBuild(baseDir, "Successfully executed testAddFolder.sh");
 	}
 
+	
 	private String dockerfileBuild(File baseDir, String expectedText)
 			throws DockerException, IOException {
 
@@ -222,4 +225,12 @@ public void testNetCatDockerfileBuilder() throws DockerException,
 		dockerClient.stopContainerCmd(container.getId()).withTimeout(0).exec();
 
 	}
+	
+	@Test
+	public void testAddAndCopySubstitution () throws DockerException, IOException {
+			File baseDir = new File(Thread.currentThread().getContextClassLoader()
+					.getResource("testENVSubstitution").getFile());
+			dockerfileBuild(baseDir, "Successfully executed testAddFolder.sh");
+
+	}
 }
diff --git a/src/test/resources/testENVSubstitution/Dockerfile b/src/test/resources/testENVSubstitution/Dockerfile
@@ -0,0 +1,11 @@
+FROM      ubuntu
+
+# Copy testrun.sh files into the container
+
+ENV variable abc123
+ADD ./testrun.sh /tmp/
+ADD	./subst-file-$variable.txt     /tmp/
+COPY ./subst-file-2-${variable}.txt     /tmp/
+RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
+
+CMD ["testrun.sh"]
diff --git a/src/test/resources/testENVSubstitution/subst-file-2-abc123.txt b/src/test/resources/testENVSubstitution/subst-file-2-abc123.txt
@@ -0,0 +1 @@
+Old File
diff --git a/src/test/resources/testENVSubstitution/subst-file-abc123.txt b/src/test/resources/testENVSubstitution/subst-file-abc123.txt
@@ -0,0 +1 @@
+Old File
diff --git a/src/test/resources/testENVSubstitution/testrun.sh b/src/test/resources/testENVSubstitution/testrun.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+echo "Hello Word" > hello.txt
+echo "hello.txt Created"
+
+TEST_FILE=/tmp/subst-file-abc123.txt
+TEST_FILE_2=/tmp/subst-file-2-abc123.txt
+
+if test -f $TEST_FILE
+then
+
+	if test -f $TEST_FILE_2
+	then
+  		exit 0
+	else
+		echo "$TEST_FILE_2 does not exist"
+  		exit 1
+	fi
+
+else
+
+	echo "$TEST_FILE does not exist"
+  	exit 1
+  
+fi
+
