import java.io.File;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
expected.isDirectory(), actual.isDirectory());
List<String> expectedFiles = Arrays.asList(expected.list());
- expectedFiles.sort(null);
+ Collections.sort(expectedFiles);
List<String> actualFiles = Arrays.asList(actual.list());
- actualFiles.sort(null);
+ Collections.sort(actualFiles);
assertEquals(errorMessage, expectedFiles, actualFiles);
for (int i = 0; i < actualFiles.size(); i++) {
String resultLine = resultLines.get(j);
boolean skip = false;
- for (Entry<String, List<String>> skipThose : skipCompare
- .entrySet()) {
- for (String skipStart : skipThose.getValue()) {
- if (name.endsWith(skipThose.getKey())
- && expectedLine.startsWith(skipStart)
- && resultLine.startsWith(skipStart)) {
- skip = true;
+ if (skipCompare != null) {
+ for (Entry<String, List<String>> skipThose : skipCompare
+ .entrySet()) {
+ for (String skipStart : skipThose.getValue()) {
+ if (name.endsWith(skipThose.getKey())
+ && expectedLine.startsWith(skipStart)
+ && resultLine.startsWith(skipStart)) {
+ skip = true;
+ }
}
}
}
return String.format("" //
+ "Assertion failed!%n" //
+ "Expected value: [%s]%n" //
- + "Actual value: [%s]", expected, actual);
+ + "Actual value: [%s]", expected, actual);
}
private static String list(List<?> items) {