diff options
author | Paul Wicking <paul.wicking@qt.io> | 2019-08-06 12:40:58 +0200 |
---|---|---|
committer | Paul Wicking <paul.wicking@qt.io> | 2019-08-14 17:39:33 +0200 |
commit | 411e75b05eb391bd39d642838bf9bc7914f13f77 (patch) | |
tree | 218599c2439e687387d61cfa66d33e0eaa802767 /tests | |
parent | e6d4579277ae8f526026b1df5d52fee4c744141f (diff) |
QDoc: Set default Config options in Config's constructor
Move the setting of configuration defaults from
QDocCommandLineParser::process() to Config::Config().
In the process, eliminate QDocGlobals::defaults() and
its test.
Task-number: QTBUG-71176
Change-Id: I97adbfd93b0c31130aab6cfcb10dfe7ffa458b9d
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qdoc/qdocglobals/tst_qdocglobals.cpp | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/tests/auto/qdoc/qdocglobals/tst_qdocglobals.cpp b/tests/auto/qdoc/qdocglobals/tst_qdocglobals.cpp index 286363500..fca46911f 100644 --- a/tests/auto/qdoc/qdocglobals/tst_qdocglobals.cpp +++ b/tests/auto/qdoc/qdocglobals/tst_qdocglobals.cpp @@ -53,7 +53,6 @@ private slots: void testAppendToIndexDirs(); void testSetCurrentDir(); void testPreviousCurrentDir(); - void testDefaults(); }; void testQDocGlobals::testClassMembersInitializeToFalseOrEmpty() @@ -74,7 +73,6 @@ void testQDocGlobals::testClassMembersInitializeToFalseOrEmpty() QVERIFY(qdocTestGlobals.indexDirs().isEmpty()); QVERIFY(qdocTestGlobals.currentDir().isEmpty()); QVERIFY(qdocTestGlobals.previousCurrentDir().isEmpty()); - QVERIFY(qdocTestGlobals.defaults().isEmpty()); } void testQDocGlobals::testEnableHighlighting() @@ -202,32 +200,6 @@ void testQDocGlobals::testPreviousCurrentDir() QCOMPARE(qdocTestGlobals.currentDir(), expected); } -void testQDocGlobals::testDefaults() -{ - QDocGlobals qdocTestGlobals; - - QHash<QString, QString> expected = { - {"codeindent", "0"}, {"falsehoods", "0"}, - {"fileextensions", "*.cpp *.h *.qdoc *.qml"}, {"language", "Cpp"}, - {"outputformats", "HTML"}, {"tabsize", "8"}}; - - qdocTestGlobals.defaults().insert(QStringLiteral("codeindent"), - QLatin1String("0")); - qdocTestGlobals.defaults().insert(QStringLiteral("falsehoods"), - QLatin1String("0")); - qdocTestGlobals.defaults().insert(QStringLiteral("fileextensions"), - QLatin1String("*.cpp *.h *.qdoc *.qml")); - qdocTestGlobals.defaults().insert(QStringLiteral("language"), - QLatin1String("Cpp")); - qdocTestGlobals.defaults().insert(QStringLiteral("outputformats"), - QLatin1String("HTML")); - qdocTestGlobals.defaults().insert(QStringLiteral("tabsize"), - QLatin1String("8")); - - QHash<QString, QString> result = qdocTestGlobals.defaults(); - QCOMPARE(result, expected); -} - QTEST_APPLESS_MAIN(testQDocGlobals) #include "tst_qdocglobals.moc" |