Fix unit tests after renaming the test executables

now use QCoreApplication::applicationName() + "rc" as the config file name
instead of hardcoding the named
wilder
Alex Richardson 12 years ago
parent a3d6957ec5
commit a1dcaf788e
  1. 5
      autotests/kconfignokdehometest.cpp
  2. 3
      autotests/ksharedconfigtest.cpp

@ -39,7 +39,7 @@ void KConfigNoKdeHomeTest::testNoKdeHome()
QStandardPaths::setTestModeEnabled(true);
QString configPath = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
QDir configDir(configPath);
configDir.removeRecursively();
QVERIFY(configDir.removeRecursively());
QVERIFY(!QFile::exists(configPath));
// Do what kf5-config does, and ensure the config directory doesn't get created (#233892)
@ -52,7 +52,8 @@ void KConfigNoKdeHomeTest::testNoKdeHome()
group.writeEntry("Key", "Value");
group.sync();
QVERIFY(QFile::exists(configPath));
QVERIFY(QFile::exists(configPath + QStringLiteral("/kconfignokdehometestrc")));
const QString rcFile = QCoreApplication::applicationName() + QStringLiteral("rc");
QVERIFY(QFile::exists(configPath + QLatin1Char('/') + rcFile));
// Cleanup
configDir.removeRecursively();

@ -38,7 +38,8 @@ void KSharedConfigTest::initTestCase()
{
QStandardPaths::enableTestMode(true);
m_path = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/ksharedconfigtestrc";
m_path = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation)
+ QLatin1Char('/') + QCoreApplication::applicationName() + QStringLiteral("rc");
QFile::remove(m_path);
}

Loading…
Cancel
Save