test: use test framework init() instead of resetArgs()

furszy · furszy · commit 5b63a5c63cb5 · 2022-06-09T11:18:46.000-03:00
diff --git a/src/qt/test/optiontests.cpp b/src/qt/test/optiontests.cpp
@@ -20,16 +20,15 @@ OptionTests::OptionTests(interfaces::Node& node) : m_node(node)
     gArgs.LockSettings([&](util::Settings& s) { m_previous_settings = s; });
 }
 
-void OptionTests::resetArgs()
+void OptionTests::init()
 {
+    // reset args
     gArgs.LockSettings([&](util::Settings& s) { s = m_previous_settings; });
     gArgs.ClearPathCache();
 }
 
 void OptionTests::migrateSettings()
 {
-    resetArgs();
-
     // Set legacy QSettings and verify that they get cleared and migrated to
     // settings.json
     QSettings settings;
@@ -73,8 +72,6 @@ void OptionTests::migrateSettings()
 
 void OptionTests::integerGetArgBug()
 {
-    resetArgs();
-
     // Test regression https://github.com/bitcoin/bitcoin/issues/24457. Ensure
     // that setting integer prune value doesn't cause an exception to be thrown
     // in the OptionsModel constructor
@@ -93,8 +90,6 @@ void OptionTests::integerGetArgBug()
 
 void OptionTests::parametersInteraction()
 {
-    resetArgs();
-
     // Test that the bug https://github.com/bitcoin-core/gui/issues/567 does not resurface.
     // It was fixed via https://github.com/bitcoin-core/gui/pull/568.
     // With fListen=false in ~/.config/Bitcoin/Bitcoin-Qt.conf and all else left as default,
diff --git a/src/qt/test/optiontests.h b/src/qt/test/optiontests.h
@@ -16,9 +16,9 @@ class OptionTests : public QObject
     Q_OBJECT
 public:
     explicit OptionTests(interfaces::Node& node);
-    void resetArgs();
 
 private Q_SLOTS:
+    void init(); // called before each test function execution.
     void migrateSettings();
     void integerGetArgBug();
     void parametersInteraction();

Original file line number	Diff line number	Diff line change
`@@ -20,16 +20,15 @@ OptionTests::OptionTests(interfaces::Node& node) : m_node(node)`
`20`	`20`	`gArgs.LockSettings([&](util::Settings& s) { m_previous_settings = s; });`
`21`	`21`	`}`
`22`	`22`
`23`		`-void OptionTests::resetArgs()`
	`23`	`+void OptionTests::init()`
`24`	`24`	`{`
	`25`	`+ // reset args`
`25`	`26`	`gArgs.LockSettings([&](util::Settings& s) { s = m_previous_settings; });`
`26`	`27`	`gArgs.ClearPathCache();`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`void OptionTests::migrateSettings()`
`30`	`31`	`{`
`31`		`- resetArgs();`
`32`		`-`
`33`	`32`	`// Set legacy QSettings and verify that they get cleared and migrated to`
`34`	`33`	`// settings.json`
`35`	`34`	`QSettings settings;`
`@@ -73,8 +72,6 @@ void OptionTests::migrateSettings()`
`73`	`72`
`74`	`73`	`void OptionTests::integerGetArgBug()`
`75`	`74`	`{`
`76`		`- resetArgs();`
`77`		`-`
`78`	`75`	`// Test regression https://github.com/bitcoin/bitcoin/issues/24457. Ensure`
`79`	`76`	`// that setting integer prune value doesn't cause an exception to be thrown`
`80`	`77`	`// in the OptionsModel constructor`
`@@ -93,8 +90,6 @@ void OptionTests::integerGetArgBug()`
`93`	`90`
`94`	`91`	`void OptionTests::parametersInteraction()`
`95`	`92`	`{`
`96`		`- resetArgs();`
`97`		`-`
`98`	`93`	`// Test that the bug https://github.com/bitcoin-core/gui/issues/567 does not resurface.`
`99`	`94`	`// It was fixed via https://github.com/bitcoin-core/gui/pull/568.`
`100`	`95`	`// With fListen=false in ~/.config/Bitcoin/Bitcoin-Qt.conf and all else left as default,`