Add 'src/be/nikiroo/utils/' from commit '46add0670fdee4bd936a13fe2448c5e20a7ffd0a'

[fanfix.git] / src / be / nikiroo / utils / test / TestCase.java

diff --git a/src/be/nikiroo/utils/test/TestCase.java b/src/be/nikiroo/utils/test/TestCase.java
index 9b8086f754a6aedf6f566de11bf993b50132895e..fe7b9af5e141d5f750be96b5c692b51484158f4f 100644 (file)
--- a/src/be/nikiroo/utils/test/TestCase.java
+++ b/src/be/nikiroo/utils/test/TestCase.java
@@ -2,6 +2,7 @@ package be.nikiroo.utils.test;
 
 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;
@@ -405,9 +406,9 @@ abstract public class TestCase {
                                        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++) {
@@ -439,13 +440,15 @@ abstract public class TestCase {
                                        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;
+                                                               }
                                                        }
                                                }
                                        }
@@ -506,7 +509,7 @@ abstract public class TestCase {
                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) {