Skip to content

Use JUnit TemporaryFolder rule in CompressArchiveUtilTest #1210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KostyaSha merged 1 commit into from
Jul 5, 2019
Merged

Use JUnit TemporaryFolder rule in CompressArchiveUtilTest #1210

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 17 additions & 28 deletions src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
import com.github.dockerjava.core.util.CompressArchiveUtil;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;

import java.io.BufferedInputStream;
import java.io.File;
Expand All @@ -22,30 +23,24 @@

public class CompressArchiveUtilTest {

@Rule
public TemporaryFolder tempFolder = new TemporaryFolder();

@Test
public void testExecutableFlagIsPreserved() throws Exception {
File executableFile = createExecutableFile();
File archive = CompressArchiveUtil.archiveTARFiles(executableFile.getParentFile(), asList(executableFile),
File executableFile = tempFolder.newFile("executableFile.sh");
executableFile.setExecutable(true);
assertThat(executableFile.canExecute(), is(true));

File archive = CompressArchiveUtil.archiveTARFiles(tempFolder.getRoot(), asList(executableFile),
"archive");
File expectedFile = extractFileByName(archive, "executableFile.sh", "executableFile.sh.result");

assertThat("should be executable", expectedFile.canExecute());
expectedFile.delete();
archive.delete();
}

private File createExecutableFile() throws IOException {
File baseDir = new File(FileUtils.getTempDirectoryPath());
File executableFile = new File(baseDir, "executableFile.sh");
executableFile.createNewFile();
executableFile.setExecutable(true);
assertThat(executableFile.canExecute(), is(true));
return executableFile;
}

private File extractFileByName(File archive, String filenameToExtract, String outputName) throws IOException {
File baseDir = new File(FileUtils.getTempDirectoryPath());
File expectedFile = new File(baseDir, outputName);
File expectedFile = new File(tempFolder.newFolder(), outputName);
expectedFile.delete();
assertThat(expectedFile.exists(), is(false));

Expand All @@ -71,26 +66,23 @@ private File extractFileByName(File archive, String filenameToExtract, String ou

@Test
public void testSymbolicLinkDir() throws IOException {
Path uploadDir = Files.createTempDirectory("upload");
Path linkTarget = Files.createTempDirectory("ink-target");
Path uploadDir = tempFolder.newFolder("upload").toPath();
Path linkTarget = tempFolder.newFolder("link-target").toPath();
Path tmpFile = Files.createTempFile(linkTarget, "link-dir", "rand");
Files.createSymbolicLink(uploadDir.resolve("link-folder"), linkTarget);
Path tarGzFile = Files.createTempFile("docker-java", ".tar.gz");
Path tarGzFile = tempFolder.newFile("docker-java.tar.gz").toPath();
//follow link only works for childrenOnly=false
CompressArchiveUtil.tar(uploadDir, tarGzFile, true, false);
File expectedFile = extractFileByName(tarGzFile.toFile(), tmpFile.toFile().getName(), "foo1");
assertThat(expectedFile.canRead(), is(true));
uploadDir.toFile().delete();
linkTarget.toFile().delete();
tarGzFile.toFile().delete();
}

@Test
public void testSymbolicLinkFile() throws IOException {
Path uploadDir = Files.createTempDirectory("upload");
Path tmpFile = Files.createTempFile("src", "");
Path uploadDir = tempFolder.newFolder("upload").toPath();
Path tmpFile = tempFolder.newFile("src").toPath();
Files.createSymbolicLink(uploadDir.resolve("link-file"), tmpFile);
Path tarGzFile = Files.createTempFile("docker-java", ".tar.gz");
Path tarGzFile = tempFolder.newFile("docker-java.tar.gz").toPath();
boolean childrenOnly = false;
CompressArchiveUtil.tar(uploadDir, tarGzFile, true, childrenOnly);
File expectedFile = extractFileByName(tarGzFile.toFile(), "link-file", "foo1");
Expand All @@ -99,8 +91,5 @@ public void testSymbolicLinkFile() throws IOException {
CompressArchiveUtil.tar(uploadDir, tarGzFile, true, childrenOnly);
extractFileByName(tarGzFile.toFile(), "link-file", "foo1");
assertThat(expectedFile.canRead(), is(true));
uploadDir.toFile().delete();
tmpFile.toFile().delete();
tarGzFile.toFile().delete();
}
}