dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix tests broken with #1510 (#1524)

Browse source
This commit is contained in:
Russel Waters 2019-01-09 17:58:35 -05:00 • committed by Zach Hyatt
commit 7335442eb0
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nano/qt_test/qt.cpp
View file

@ -43,7 +43,7 @@ TEST (wallet, status)
auto wallet_has = [wallet](nano_qt::status_types status_ty) { auto wallet_has = [wallet](nano_qt::status_types status_ty) {
return wallet->active_status.active.find (status_ty) != wallet->active_status.active.end (); return wallet->active_status.active.find (status_ty) != wallet->active_status.active.end ();
}; };
ASSERT_EQ ("Status: Disconnected, Block: 1", wallet->status->text ().toStdString ()); ASSERT_EQ ("Status: Disconnected, Blocks: 1", wallet->status->text ().toStdString ());
system.nodes[0]->peers.insert (nano::endpoint (boost::asio::ip::address_v6::loopback (), 10000), 0); system.nodes[0]->peers.insert (nano::endpoint (boost::asio::ip::address_v6::loopback (), 10000), 0);
// Because of the wallet "vulnerable" message, this won't be the message displayed. // Because of the wallet "vulnerable" message, this won't be the message displayed.
// However, it will still be part of the status set. // However, it will still be part of the status set.
@ -227,7 +227,7 @@ TEST (wallet, enter_password)
QTest::mouseClick (wallet->settings.lock_toggle, Qt::LeftButton); QTest::mouseClick (wallet->settings.lock_toggle, Qt::LeftButton);
QTest::mouseClick (wallet->settings.lock_toggle, Qt::LeftButton); QTest::mouseClick (wallet->settings.lock_toggle, Qt::LeftButton);
test_application->processEvents (); test_application->processEvents ();
ASSERT_EQ ("Status: Wallet password empty, Block: 1", wallet->status->text ().toStdString ()); ASSERT_EQ ("Status: Wallet password empty, Blocks: 1", wallet->status->text ().toStdString ());
{ {
auto transaction (system.nodes[0]->store.tx_begin (true)); auto transaction (system.nodes[0]->store.tx_begin (true));
ASSERT_FALSE (system.wallet (0)->store.rekey (transaction, "abc")); ASSERT_FALSE (system.wallet (0)->store.rekey (transaction, "abc"));
@ -235,12 +235,12 @@ TEST (wallet, enter_password)
QTest::mouseClick (wallet->settings_button, Qt::LeftButton); QTest::mouseClick (wallet->settings_button, Qt::LeftButton);
QTest::mouseClick (wallet->settings.lock_toggle, Qt::LeftButton); QTest::mouseClick (wallet->settings.lock_toggle, Qt::LeftButton);
test_application->processEvents (); test_application->processEvents ();
ASSERT_EQ ("Status: Wallet locked, Block: 1", wallet->status->text ().toStdString ()); ASSERT_EQ ("Status: Wallet locked, Blocks: 1", wallet->status->text ().toStdString ());
wallet->settings.new_password->setText (""); wallet->settings.new_password->setText ("");
QTest::keyClicks (wallet->settings.password, "abc"); QTest::keyClicks (wallet->settings.password, "abc");
QTest::mouseClick (wallet->settings.lock_toggle, Qt::LeftButton); QTest::mouseClick (wallet->settings.lock_toggle, Qt::LeftButton);
test_application->processEvents (); test_application->processEvents ();
ASSERT_EQ ("Status: Running, Block: 1", wallet->status->text ().toStdString ()); ASSERT_EQ ("Status: Running, Blocks: 1", wallet->status->text ().toStdString ());
ASSERT_EQ ("", wallet->settings.password->text ()); ASSERT_EQ ("", wallet->settings.password->text ());
} }