From: Klaas Freitag <freitag@owncloud.com>
Date: Tue, 10 May 2016 14:46:08 +0000 (+0200)
Subject: Fix exclude unit test, adopt to new Iface of isExcluded.
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1172^2~13
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9b1f46e5607ed1f579a2783bf322997d88229d24;p=nextcloud-desktop.git

Fix exclude unit test, adopt to new Iface of isExcluded.
---

diff --git a/test/testexcludedfiles.cpp b/test/testexcludedfiles.cpp
index 446a9cb7f..21683f991 100644
--- a/test/testexcludedfiles.cpp
+++ b/test/testexcludedfiles.cpp
@@ -26,22 +26,23 @@ private slots:
         bool excludeHidden = true;
         bool keepHidden = false;
 
-        QVERIFY(!excluded.isExcluded("/a/b", "b", keepHidden));
-        QVERIFY(!excluded.isExcluded("/a/b~", "b~", keepHidden));
-        QVERIFY(!excluded.isExcluded("/a/.b", ".b", keepHidden));
-        QVERIFY(excluded.isExcluded("/a/.b", ".b", excludeHidden));
+        bool x = excluded.isExcluded("/a/b", "/a", keepHidden);
+        QVERIFY(!excluded.isExcluded("/a/b", "/a", keepHidden));
+        QVERIFY(!excluded.isExcluded("/a/b~", "/a", keepHidden));
+        QVERIFY(!excluded.isExcluded("/a/.b", "/a", keepHidden));
+        QVERIFY(excluded.isExcluded("/a/.b", "/a", excludeHidden));
 
         QString path(BIN_PATH);
         path.append("/sync-exclude.lst");
         excluded.addExcludeFilePath(path);
         excluded.reloadExcludes();
 
-        QVERIFY(!excluded.isExcluded("/a/b", "b", keepHidden));
-        QVERIFY(excluded.isExcluded("/a/b~", "b~", keepHidden));
-        QVERIFY(!excluded.isExcluded("/a/.b", ".b", keepHidden));
-        QVERIFY(excluded.isExcluded("/a/.Trashes", ".Trashes", keepHidden));
-        QVERIFY(excluded.isExcluded("/a/foo_conflict-bar", "foo_conflict-bar", keepHidden));
-        QVERIFY(excluded.isExcluded("/a/.b", ".b", excludeHidden));
+        QVERIFY(!excluded.isExcluded("/a/b", "/a", keepHidden));
+        QVERIFY(excluded.isExcluded("/a/b~", "/a", keepHidden));
+        QVERIFY(!excluded.isExcluded("/a/.b", "/a", keepHidden));
+        QVERIFY(excluded.isExcluded("/a/.Trashes", "/a", keepHidden));
+        QVERIFY(excluded.isExcluded("/a/foo_conflict-bar", "/a", keepHidden));
+        QVERIFY(excluded.isExcluded("/a/.b", "/a", excludeHidden));
     }
 };