1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
|
From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Date: Sun, 10 Apr 2016 15:31:28 +0200
Subject: standarddirs_test
===================================================================
---
autotests/kstandarddirstest.cpp | 36 +++++++++++++++++++++++++-----------
1 file changed, 25 insertions(+), 11 deletions(-)
diff --git a/autotests/kstandarddirstest.cpp b/autotests/kstandarddirstest.cpp
index e29ffcd..e554ada 100644
--- a/autotests/kstandarddirstest.cpp
+++ b/autotests/kstandarddirstest.cpp
@@ -108,9 +108,10 @@ void KStandarddirsTest::testResourceDirs()
{
const QStringList configDirs = KGlobal::dirs()->resourceDirs("config");
Q_FOREACH (const QString &dir, configDirs) {
- QVERIFY2(dir.endsWith("xdg/")
- || dir.endsWith("share/config/") // KDE4 compat path
- || dir.endsWith(".kde-unit-test/xdg/config/"), qPrintable(dir));
+ QString clean = QDir::cleanPath(dir);
+ QVERIFY2(clean.endsWith("xdg")
+ || clean.endsWith("share/config") // KDE4 compat path
+ || clean.endsWith(".kde-unit-test/xdg/config"), qPrintable(clean));
}
}
@@ -172,6 +173,15 @@ static bool oneEndsWith(const QStringList &lst, const QString &str)
return false;
}
+static QStringList cleanThem(const QStringList &lst)
+{
+ QStringList result;
+ for (QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it) {
+ result.push_back(QDir::cleanPath(*it));
+ }
+ return result;
+}
+
void KStandarddirsTest::testFindAllResources()
{
if (!isKdeLibs4supportInstalled()) {
@@ -180,7 +190,8 @@ void KStandarddirsTest::testFindAllResources()
const QStringList dbusInterfaceFiles = KGlobal::dirs()->findAllResources("data", "dbus-1/interfaces/");
QVERIFY(!dbusInterfaceFiles.isEmpty());
- QVERIFY(dbusInterfaceFiles.count() > 20); // I have 21 here, installed by kdelibs.
+ QVERIFY(dbusInterfaceFiles.count() >= 4); // I have 21 here, installed by kdelibs.
+ // Only 4 installed here :/
// Create a local config file, the file will be used as expected result
const QString localConfigFile = m_configHome + "/foorc";
@@ -192,11 +203,12 @@ void KStandarddirsTest::testFindAllResources()
QVERIFY2(QFile::exists(localConfigFile), qPrintable(localConfigFile));
const QStringList configFiles = KGlobal::dirs()->findAllResources("config");
+ QStringList cleanConfigFiles = cleanThem(configFiles);
QVERIFY(!configFiles.isEmpty());
//qDebug() << configFiles;
QVERIFY(oneEndsWith(configFiles, "etc/xdg/kdebugrc"));
QVERIFY(oneEndsWith(configFiles, "etc/xdg/kdebug.areas"));
- QVERIFY(oneEndsWith(configFiles, "kde-unit-test/xdg/config/foorc"));
+ QVERIFY(oneEndsWith(cleanConfigFiles, "kde-unit-test/xdg/config/foorc"));
QVERIFY(!oneEndsWith(configFiles, "etc/xdg/colors/Web.colors")); // recursive was false
{
@@ -211,10 +223,11 @@ void KStandarddirsTest::testFindAllResources()
{
const QStringList configFilesRecursiveWithFilter = KGlobal::dirs()->findAllResources("config", "*rc",
KStandardDirs::Recursive);
+ QStringList cleanConfigFilesRecursiveWithFilter = cleanThem(configFilesRecursiveWithFilter);
QVERIFY(!configFilesRecursiveWithFilter.isEmpty());
//qDebug() << configFilesRecursiveWithFilter;
QVERIFY(configFilesRecursiveWithFilter.count() >= 2); // foorc, kdebugrc
- QVERIFY(oneEndsWith(configFilesRecursiveWithFilter, "kde-unit-test/xdg/config/foorc"));
+ QVERIFY(oneEndsWith(cleanConfigFilesRecursiveWithFilter, "kde-unit-test/xdg/config/foorc"));
QVERIFY(oneEndsWith(configFilesRecursiveWithFilter, "etc/xdg/kdebugrc"));
QVERIFY(!oneEndsWith(configFilesRecursiveWithFilter, "etc/xdg/colors/Web.colors")); // didn't match the filter
}
@@ -222,9 +235,10 @@ void KStandarddirsTest::testFindAllResources()
{
QStringList fileNames;
const QStringList configFilesWithFilter = KGlobal::dirs()->findAllResources("config", "*rc", KStandardDirs::NoDuplicates, fileNames);
+ QStringList cleanConfigFilesWithFilter = cleanThem(configFilesWithFilter);
QVERIFY(!configFilesWithFilter.isEmpty());
QVERIFY2(configFilesWithFilter.count() >= 2, qPrintable(configFilesWithFilter.join(",")));
- QVERIFY(oneEndsWith(configFilesWithFilter, "kde-unit-test/xdg/config/foorc"));
+ QVERIFY(oneEndsWith(cleanConfigFilesWithFilter, "kde-unit-test/xdg/config/foorc"));
QVERIFY(oneEndsWith(configFilesWithFilter, "kdebugrc")); // either global (etc/xdg/) or local (XDG_HOME)
QVERIFY(!oneEndsWith(configFilesWithFilter, "etc/xdg/ui/ui_standards.rc")); // recursive not set
QVERIFY(!oneEndsWith(configFilesWithFilter, "etc/xdg/accept-languages.codes")); // didn't match the filter
@@ -287,7 +301,7 @@ void KStandarddirsTest::testFindResourceDir()
const QString configDir = KGlobal::dirs()->findResourceDir("config", "foorc");
QVERIFY(!configDir.isEmpty());
- QVERIFY2(configDir.endsWith(QLatin1String("/xdg/config/")), qPrintable(configDir));
+ QVERIFY2(QDir::cleanPath(configDir).endsWith(QLatin1String("/xdg/config")), qPrintable(configDir));
}
void KStandarddirsTest::testFindExeLibExec()
@@ -428,14 +442,14 @@ void KStandarddirsTest::testAddResourceType()
void KStandarddirsTest::testAddResourceDir()
{
- const QString dir = QFileInfo(QFINDTESTDATA("kstandarddirstest.cpp")).absolutePath();
- const QString file = "kstandarddirstest.cpp";
+ const QString dir = QFileInfo(QFINDTESTDATA("kstandarddirstest")).absolutePath();
+ const QString file = "kstandarddirstest";
QString ret = KStandardDirs::locate("here", file);
QCOMPARE(ret, QString()); // not set up yet
KGlobal::dirs()->addResourceDir("here", dir);
ret = KStandardDirs::locate("here", file);
- QCOMPARE_PATHS(ret, KStandardDirs::realPath(dir) + "kstandarddirstest.cpp");
+ QCOMPARE_PATHS(ret, KStandardDirs::realPath(dir) + "kstandarddirstest");
}
void KStandarddirsTest::testSetXdgDataDirs()
|
