From: Niki Roo <niki@nikiroo.be>
Date: Sun, 23 Sep 2018 03:58:13 +0000 (+0200)
Subject: Version 4.4.3: fix 4.4.2
X-Git-Tag: nikiroo-utils-4.4.3
X-Git-Url: http://git.nikiroo.be/?a=commitdiff_plain;h=refs%2Ftags%2Fnikiroo-utils-4.4.3;hp=d62784c73d3d2a6f460cd612c84b39a9c7fc9cb3;p=nikiroo-utils.git

Version 4.4.3: fix 4.4.2
---

diff --git a/VERSION b/VERSION
index 1d068c6..9e3a933 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.4.2
+4.4.3
diff --git a/changelog.md b/changelog.md
index f0947f7..1f0b60c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # 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
diff --git a/src/be/nikiroo/utils/test/TestCase.java b/src/be/nikiroo/utils/test/TestCase.java
index 9b8086f..2e46a7b 100644
--- 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;
-					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;
+								}
 							}
 						}
 					}