Skip to content

Commit 7c43465

Browse files
hebastovijaydasmp
authored andcommitted
Merge bitcoin-core/gui#803: test: Set organization name
0dcbad3 qt, test: Clean settings after tests (Hennadii Stepanov) 49cf635 qt, test: Set organization name (Hennadii Stepanov) Pull request description: From Qt [docs](https://doc.qt.io/qt-5/qsettings.html#QSettings-4): > If [`QCoreApplication::setOrganizationName()`](https://doc.qt.io/qt-5/qcoreapplication.html#organizationName-prop) and [`QCoreApplication::setApplicationName()`](https://doc.qt.io/qt-5/qcoreapplication.html#applicationName-prop) has not been previously called, the `QSettings` object will not be able to read or write any settings, and [`status()`](https://doc.qt.io/qt-5/qsettings.html#status) will return [`AccessError`](https://doc.qt.io/qt-5/qsettings.html#Status-enum). Fixes bitcoin-core/gui#799. ACKs for top commit: pablomartin4btc: utACK 0dcbad3 Tree-SHA512: d5ac160f17cc358f0c1b89097193cd5adfd25f5531955c211f3e0994fc084e0a2b8d3aeddebe38f3a8ab5333edef5aa92b18915885c9e58b33f2e5786f31c600
1 parent ffcf4f6 commit 7c43465

2 files changed

Lines changed: 41 additions & 19 deletions

File tree

src/qt/test/optiontests.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,17 @@ void OptionTests::migrateSettings()
4646

4747
settings.sync();
4848

49+
QVERIFY(settings.contains("nDatabaseCache"));
50+
QVERIFY(settings.contains("nThreadsScriptVerif"));
51+
QVERIFY(settings.contains("fUseUPnP"));
52+
QVERIFY(settings.contains("fListen"));
53+
QVERIFY(settings.contains("bPrune"));
54+
QVERIFY(settings.contains("nPruneSize"));
55+
QVERIFY(settings.contains("fUseProxy"));
56+
QVERIFY(settings.contains("addrProxy"));
57+
QVERIFY(settings.contains("fUseSeparateProxyTor"));
58+
QVERIFY(settings.contains("addrSeparateProxyTor"));
59+
4960
OptionsModel options{m_node};
5061
bilingual_str error;
5162
QVERIFY(options.Init(error));

src/qt/test/test_main.cpp

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <interfaces/init.h>
1111
#include <interfaces/node.h>
1212
#include <qt/bitcoin.h>
13+
#include <qt/guiconstants.h>
1314
#include <qt/test/apptests.h>
1415
#include <qt/test/optiontests.h>
1516
#include <qt/test/rpcnestedtests.h>
@@ -25,6 +26,7 @@
2526
#include <QApplication>
2627
#include <QDebug>
2728
#include <QObject>
29+
#include <QSettings>
2830
#include <QTest>
2931

3032
#include <functional>
@@ -81,38 +83,47 @@ int main(int argc, char* argv[])
8183
setenv("QT_QPA_PLATFORM", "minimal", 0 /* overwrite */);
8284
#endif
8385

84-
BitcoinApplication app;
85-
app.setApplicationName("Dash-Qt-test");
86-
app.createNode(*init);
86+
87+
QCoreApplication::setOrganizationName(QAPP_ORG_NAME);
88+
QCoreApplication::setApplicationName(QAPP_APP_NAME_DEFAULT "-test");
8789

8890
int num_test_failures{0};
8991

90-
AppTests app_tests(app);
91-
num_test_failures += QTest::qExec(&app_tests);
92+
{
93+
BitcoinApplication app;
94+
app.createNode(*init);
95+
96+
AppTests app_tests(app);
97+
num_test_failures += QTest::qExec(&app_tests);
9298

93-
OptionTests options_tests(app.node());
94-
num_test_failures += QTest::qExec(&options_tests);
99+
OptionTests options_tests(app.node());
100+
num_test_failures += QTest::qExec(&options_tests);
95101

96-
URITests test1;
97-
num_test_failures += QTest::qExec(&test1);
102+
URITests test1;
103+
num_test_failures += QTest::qExec(&test1);
98104

99-
RPCNestedTests test3(app.node());
100-
num_test_failures += QTest::qExec(&test3);
105+
RPCNestedTests test3(app.node());
106+
num_test_failures += QTest::qExec(&test3);
101107

102108
#ifdef ENABLE_WALLET
103-
WalletTests test5(app.node());
104-
num_test_failures += QTest::qExec(&test5);
109+
WalletTests test5(app.node());
110+
num_test_failures += QTest::qExec(&test5);
105111

106-
AddressBookTests test6(app.node());
107-
num_test_failures += QTest::qExec(&test6);
112+
AddressBookTests test6(app.node());
113+
num_test_failures += QTest::qExec(&test6);
108114
#endif
109115
TrafficGraphDataTests test7;
110116
num_test_failures += QTest::qExec(&test7);
111117

112-
if (num_test_failures) {
113-
qWarning("\nFailed tests: %d\n", num_test_failures);
114-
} else {
115-
qDebug("\nAll tests passed.\n");
118+
if (num_test_failures) {
119+
qWarning("\nFailed tests: %d\n", num_test_failures);
120+
} else {
121+
qDebug("\nAll tests passed.\n");
122+
}
116123
}
124+
125+
QSettings settings;
126+
settings.clear();
127+
117128
return num_test_failures;
118129
}

0 commit comments

Comments
 (0)