Skip to content

Commit af0a680

Browse files
committed
Use File#setExecutable
1 parent 3cb3379 commit af0a680

File tree

1 file changed

+5
-19
lines changed

1 file changed

+5
-19
lines changed

core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.github.dockerjava.core.command.InspectContainerCmdImpl;
1010
import com.github.dockerjava.core.command.ListContainersCmdImpl;
1111
import com.github.dockerjava.core.command.StartContainerCmdImpl;
12-
import com.google.common.collect.Sets;
1312
import lombok.RequiredArgsConstructor;
1413
import lombok.experimental.FieldDefaults;
1514
import org.junit.Rule;
@@ -31,14 +30,10 @@
3130
import java.io.File;
3231
import java.nio.file.Files;
3332
import java.nio.file.Path;
34-
import java.nio.file.attribute.PosixFilePermission;
35-
import java.nio.file.attribute.PosixFilePermissions;
3633
import java.util.ArrayList;
3734
import java.util.Collections;
38-
import java.util.HashSet;
3935
import java.util.List;
4036
import java.util.Map;
41-
import java.util.Set;
4237
import java.util.UUID;
4338
import java.util.concurrent.CompletableFuture;
4439
import java.util.concurrent.atomic.AtomicReference;
@@ -417,10 +412,8 @@ public void filePermissions() throws Exception {
417412

418413
long hash1 = container.hashCopiedFiles().getValue();
419414

420-
Set<PosixFilePermission> filePermissions = new HashSet<>(Files.getPosixFilePermissions(path));
421-
assertThat(filePermissions).doesNotContain(PosixFilePermission.OWNER_EXECUTE);
422-
filePermissions.add(PosixFilePermission.OWNER_EXECUTE);
423-
Files.setPosixFilePermissions(path, filePermissions);
415+
assertThat(path.toFile().canExecute()).isFalse();
416+
path.toFile().setExecutable(true);
424417

425418
assertThat(container.hashCopiedFiles().getValue()).isNotEqualTo(hash1);
426419
}
@@ -430,20 +423,13 @@ public void folderPermissions() throws Exception {
430423
Path tempDirectory = Files.createTempDirectory("reusable_test");
431424
MountableFile mountableFile = MountableFile.forHostPath(tempDirectory);
432425
assertThat(new File(mountableFile.getResolvedPath())).isDirectory();
433-
Path subDir = Files.createDirectory(
434-
tempDirectory.resolve("sub"),
435-
PosixFilePermissions.asFileAttribute(
436-
Sets.newHashSet(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_WRITE)
437-
)
438-
);
426+
Path subDir = Files.createDirectory(tempDirectory.resolve("sub"));
427+
subDir.toFile().setExecutable(false);
439428
container.withCopyFileToContainer(mountableFile, "/foo/bar/");
440429

441430
long hash1 = container.hashCopiedFiles().getValue();
442431

443-
Set<PosixFilePermission> permissions = new HashSet<>(Files.getPosixFilePermissions(subDir));
444-
assertThat(permissions).doesNotContain(PosixFilePermission.OWNER_EXECUTE);
445-
permissions.add(PosixFilePermission.OWNER_EXECUTE);
446-
Files.setPosixFilePermissions(subDir, permissions);
432+
subDir.toFile().setExecutable(true);
447433

448434
assertThat(container.hashCopiedFiles().getValue()).isNotEqualTo(hash1);
449435
}

0 commit comments

Comments
 (0)