Version 4.4.3: fix 4.4.2

diff --git a/VERSION b/VERSION
index 1d068c6ec6a83de51d17a4f6b7b6342864337273..9e3a93350d3a7cc2347f3605c3cbe07d515c5bae 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.4.2
+4.4.3

diff --git a/changelog.md b/changelog.md
index f0947f7938206fbbeb76da9f3b6373198b5ef722..1f0b60cc7fdc9ce77df724b0019f29b0555a6c42 100644 (file)
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # nikiroo-utils
 
 # nikiroo-utils
 

+## Version 4.4.3
+
+- Test assertions: fix files/dir content comparison code
+

 ## Version 4.4.2
 
 - Test assertions: can now compare files/dir content
 ## Version 4.4.2
 
 - Test assertions: can now compare files/dir content

diff --git a/src/be/nikiroo/utils/test/TestCase.java b/src/be/nikiroo/utils/test/TestCase.java
index 9b8086f754a6aedf6f566de11bf993b50132895e..2e46a7b5472af4eabc2a5ecb4aea4e4d6d6fe89c 100644 (file)
--- a/src/be/nikiroo/utils/test/TestCase.java
+++ b/src/be/nikiroo/utils/test/TestCase.java
@@ -439,13 +439,15 @@ abstract public class TestCase {
                                        String resultLine = resultLines.get(j);
 
                                        boolean skip = false;
                                        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;
+                                                               }

                                                        }
                                                }
                                        }
                                                        }
                                                }
                                        }