diff options
| -rw-r--r-- | src/qt/test/optiontests.cpp | 11 | ||||
| -rw-r--r-- | src/qt/test/test_main.cpp | 49 |
2 files changed, 41 insertions, 19 deletions
diff --git a/src/qt/test/optiontests.cpp b/src/qt/test/optiontests.cpp index b76e9ef499..5f9f2cb449 100644 --- a/src/qt/test/optiontests.cpp +++ b/src/qt/test/optiontests.cpp @@ -50,6 +50,17 @@ void OptionTests::migrateSettings() settings.sync(); + QVERIFY(settings.contains("nDatabaseCache")); + QVERIFY(settings.contains("nThreadsScriptVerif")); + QVERIFY(settings.contains("fUseUPnP")); + QVERIFY(settings.contains("fListen")); + QVERIFY(settings.contains("bPrune")); + QVERIFY(settings.contains("nPruneSize")); + QVERIFY(settings.contains("fUseProxy")); + QVERIFY(settings.contains("addrProxy")); + QVERIFY(settings.contains("fUseSeparateProxyTor")); + QVERIFY(settings.contains("addrSeparateProxyTor")); + OptionsModel options{m_node}; bilingual_str error; QVERIFY(options.Init(error)); diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index e45fc1ced8..8decc27bd7 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -9,6 +9,7 @@ #include <interfaces/init.h> #include <interfaces/node.h> #include <qt/bitcoin.h> +#include <qt/guiconstants.h> #include <qt/test/apptests.h> #include <qt/test/optiontests.h> #include <qt/test/rpcnestedtests.h> @@ -24,6 +25,7 @@ #include <QApplication> #include <QDebug> #include <QObject> +#include <QSettings> #include <QTest> #include <functional> @@ -83,36 +85,45 @@ int main(int argc, char* argv[]) setenv("QT_QPA_PLATFORM", "minimal", 0 /* overwrite */); #endif - BitcoinApplication app; - app.setApplicationName("Bitcoin-Qt-test"); - app.createNode(*init); + + QCoreApplication::setOrganizationName(QAPP_ORG_NAME); + QCoreApplication::setApplicationName(QAPP_APP_NAME_DEFAULT "-test"); int num_test_failures{0}; - AppTests app_tests(app); - num_test_failures += QTest::qExec(&app_tests); + { + BitcoinApplication app; + app.createNode(*init); + + AppTests app_tests(app); + num_test_failures += QTest::qExec(&app_tests); - OptionTests options_tests(app.node()); - num_test_failures += QTest::qExec(&options_tests); + OptionTests options_tests(app.node()); + num_test_failures += QTest::qExec(&options_tests); - URITests test1; - num_test_failures += QTest::qExec(&test1); + URITests test1; + num_test_failures += QTest::qExec(&test1); - RPCNestedTests test3(app.node()); - num_test_failures += QTest::qExec(&test3); + RPCNestedTests test3(app.node()); + num_test_failures += QTest::qExec(&test3); #ifdef ENABLE_WALLET - WalletTests test5(app.node()); - num_test_failures += QTest::qExec(&test5); + WalletTests test5(app.node()); + num_test_failures += QTest::qExec(&test5); - AddressBookTests test6(app.node()); - num_test_failures += QTest::qExec(&test6); + AddressBookTests test6(app.node()); + num_test_failures += QTest::qExec(&test6); #endif - if (num_test_failures) { - qWarning("\nFailed tests: %d\n", num_test_failures); - } else { - qDebug("\nAll tests passed.\n"); + if (num_test_failures) { + qWarning("\nFailed tests: %d\n", num_test_failures); + } else { + qDebug("\nAll tests passed.\n"); + } } + + QSettings settings; + settings.clear(); + return num_test_failures; } |