sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4850

Browse Source 
1ffb99b [Qt] copyright, style and indentation cleanup of Qt tests (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan 2014-09-05 13:33:37 +02:00
commit 5e824181c1
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
6 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/test/paymentrequestdata.h
View File

@ -1,3 +1,7 @@
// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
//
// Data for paymentservertests.cpp
//

9
src/qt/test/paymentservertests.cpp
View File

@ -1,3 +1,7 @@
// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "paymentservertests.h"
#include "optionsmodel.h"
@ -21,7 +25,6 @@ X509 *parse_b64der_cert(const char* cert_data)
return cert;
}
//
// Test payment request handling
//
@ -30,7 +33,7 @@ static SendCoinsRecipient handleRequest(PaymentServer* server, std::vector<unsig
{
RecipientCatcher sigCatcher;
QObject::connect(server, SIGNAL(receivedPaymentRequest(SendCoinsRecipient)),
&sigCatcher, SLOT(getRecipient(SendCoinsRecipient)));
&sigCatcher, SLOT(getRecipient(SendCoinsRecipient)));
// Write data to a temp file:
QTemporaryFile f;
@ -48,7 +51,7 @@ static SendCoinsRecipient handleRequest(PaymentServer* server, std::vector<unsig
QCoreApplication::sendEvent(&object, &event);
QObject::disconnect(server, SIGNAL(receivedPaymentRequest(SendCoinsRecipient)),
&sigCatcher, SLOT(getRecipient(SendCoinsRecipient)));
&sigCatcher, SLOT(getRecipient(SendCoinsRecipient)));
// Return results from sigCatcher
return sigCatcher.recipient;

8
src/qt/test/paymentservertests.h
View File

@ -1,3 +1,7 @@
// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef PAYMENTSERVERTESTS_H
#define PAYMENTSERVERTESTS_H
@ -15,8 +19,8 @@ private slots:
};
// Dummy class to receive paymentserver signals.
// If SendCoinsRecipient was a proper QObject, then we could use
// QSignalSpy... but it's not.
// If SendCoinsRecipient was a proper QObject, then
// we could use QSignalSpy... but it's not.
class RecipientCatcher : public QObject
{
Q_OBJECT

7
src/qt/test/test_main.cpp
View File

@ -1,11 +1,16 @@
// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include "config/bitcoin-config.h"
#endif
#include "uritests.h"
#ifdef ENABLE_WALLET
#include "paymentservertests.h"
#endif
#include "uritests.h"
#include <QCoreApplication>
#include <QObject>

4
src/qt/test/uritests.cpp
View File

@ -1,3 +1,7 @@
// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "uritests.h"
#include "guiutil.h"

4
src/qt/test/uritests.h
View File

@ -1,3 +1,7 @@
// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef URITESTS_H
#define URITESTS_H