Skip to content

Commit 63d8579

Browse files
committed
Fix for issue 654 ... again, many of the types from Java package 'java.nio.file.attribute' are not fs agnostic; as we prefer not having fs specific conditions, we limit ourselvs to basic attribute
1 parent d537dd4 commit 63d8579

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222
import java.nio.charset.StandardCharsets;
2323
import java.nio.file.Files;
2424
import java.nio.file.Path;
25-
import java.nio.file.attribute.AclEntry;
26-
import java.nio.file.attribute.AclFileAttributeView;
2725
import java.util.ArrayList;
2826
import java.util.Arrays;
27+
import java.util.LinkedList;
2928
import java.util.List;
3029
import java.util.function.Consumer;
3130
import java.util.function.UnaryOperator;
@@ -169,9 +168,15 @@ protected void assertOnResources(FormatterFunc step, String unformattedPath, Str
169168
}
170169

171170
/** Reads file attributes from the output file and compares it to the attributes from the input file. */
172-
protected void assertFileAttributesEqual(File input, File output) throws IOException {
173-
List<AclEntry> inputAttributes = Files.getFileAttributeView(input.toPath(), AclFileAttributeView.class).getAcl();
174-
List<AclEntry> outputAttributes = Files.getFileAttributeView(output.toPath(), AclFileAttributeView.class).getAcl();
171+
protected void assertFileAttributesEqual(File input, File output) {
172+
List<Boolean> inputAttributes = new LinkedList<>();
173+
List<Boolean> outputAttributes = new LinkedList<>();
174+
inputAttributes.add(Files.isReadable(input.toPath()));
175+
inputAttributes.add(Files.isWritable(input.toPath()));
176+
inputAttributes.add(Files.isExecutable(input.toPath()));
177+
outputAttributes.add(Files.isReadable(output.toPath()));
178+
outputAttributes.add(Files.isWritable(output.toPath()));
179+
outputAttributes.add(Files.isExecutable(output.toPath()));
175180
Assertions.assertThat(outputAttributes).isEqualTo(inputAttributes);
176181
}
177182

0 commit comments

Comments
 (0)