Skip to content
Snippets Groups Projects
Commit 4b90b2fb authored by Evgenii Tagiltsev's avatar Evgenii Tagiltsev
Browse files

[*] added test for checking QByteArray

parent e3b4ccdc
No related branches found
No related tags found
Loading
Pipeline #929 passed with stage
in 3 minutes and 16 seconds
...@@ -51,6 +51,7 @@ void DapCommandController::getHistory() ...@@ -51,6 +51,7 @@ void DapCommandController::getHistory()
{ {
DapRpcServiceReply *reply = m_DAPRpcSocket->invokeRemoteMethod("RPCServer.getHistory"); DapRpcServiceReply *reply = m_DAPRpcSocket->invokeRemoteMethod("RPCServer.getHistory");
connect(reply, SIGNAL(finished()), this, SLOT(processGetHistory())); connect(reply, SIGNAL(finished()), this, SLOT(processGetHistory()));
} }
void DapCommandController::setNewHistory(const QVariant& aData) void DapCommandController::setNewHistory(const QVariant& aData)
...@@ -70,6 +71,12 @@ void DapCommandController::getCmdHistory() ...@@ -70,6 +71,12 @@ void DapCommandController::getCmdHistory()
connect(reply, SIGNAL(finished()), this, SLOT(processGetCmdHistory())); connect(reply, SIGNAL(finished()), this, SLOT(processGetCmdHistory()));
} }
void DapCommandController::getTest()
{
DapRpcServiceReply *reply = m_DAPRpcSocket->invokeRemoteMethod("RPCServer.getTest");
connect(reply, SIGNAL(finished()), this, SLOT(processGetTest()));
}
void DapCommandController::processChangedLog() void DapCommandController::processChangedLog()
{ {
// QStringList tempLogModel; // QStringList tempLogModel;
...@@ -213,6 +220,14 @@ void DapCommandController::processGetCmdHistory() ...@@ -213,6 +220,14 @@ void DapCommandController::processGetCmdHistory()
emit sigCmdHistory(result); emit sigCmdHistory(result);
} }
void DapCommandController::processGetTest()
{
qDebug() << "!!!!!!!!processGetTest!!!!!!!!!!";
DapRpcServiceReply *reply = static_cast<DapRpcServiceReply *>(sender());
QByteArray result = reply->response().result().toVariant().toByteArray();
qDebug() << result;
}
/// Show or hide GUI client by clicking on the tray icon. /// Show or hide GUI client by clicking on the tray icon.
/// @param aIsActivated Accepts true - when requesting to /// @param aIsActivated Accepts true - when requesting to
/// display a client, falso - when requesting to hide a client. /// display a client, falso - when requesting to hide a client.
...@@ -251,6 +266,8 @@ void DapCommandController::getWallets() ...@@ -251,6 +266,8 @@ void DapCommandController::getWallets()
{ {
DapRpcServiceReply *reply = m_DAPRpcSocket->invokeRemoteMethod("RPCServer.getWallets"); DapRpcServiceReply *reply = m_DAPRpcSocket->invokeRemoteMethod("RPCServer.getWallets");
connect(reply, SIGNAL(finished()), this, SLOT(processGetWallets())); connect(reply, SIGNAL(finished()), this, SLOT(processGetWallets()));
getTest();
} }
void DapCommandController::getWalletInfo(const QString& asWalletName) void DapCommandController::getWalletInfo(const QString& asWalletName)
......
...@@ -84,6 +84,8 @@ private slots: ...@@ -84,6 +84,8 @@ private slots:
void processGetCmdHistory(); void processGetCmdHistory();
void processGetTest();
public slots: public slots:
/// Show or hide GUI client by clicking on the tray icon. /// Show or hide GUI client by clicking on the tray icon.
/// @param aIsActivated Accepts true - when requesting to /// @param aIsActivated Accepts true - when requesting to
...@@ -119,6 +121,8 @@ public slots: ...@@ -119,6 +121,8 @@ public slots:
void requestConsole(const QString& aQueue); void requestConsole(const QString& aQueue);
/// Get command history /// Get command history
void getCmdHistory(); void getCmdHistory();
void getTest();
}; };
#endif // COMMANDCONTROLLER_H #endif // COMMANDCONTROLLER_H
...@@ -100,6 +100,20 @@ QString DapChainDashboardService::getCmdHistory() const ...@@ -100,6 +100,20 @@ QString DapChainDashboardService::getCmdHistory() const
return m_pDapChainConsoleHandler->getHistory(); return m_pDapChainConsoleHandler->getHistory();
} }
QByteArray DapChainDashboardService::getTest() const
{
QByteArray data;
QDataStream out(&data, QIODevice::WriteOnly);
DapNodeData nodeData;
nodeData.Cell = 1;
nodeData.Ipv4 = "mua";
out << nodeData;
return data;
}
void DapChainDashboardService::doRequestWallets() void DapChainDashboardService::doRequestWallets()
{ {
m_pDapChainHistoryHandler->onRequestNewHistory(m_pDapChainWalletHandler->getWallets()); m_pDapChainHistoryHandler->onRequestNewHistory(m_pDapChainWalletHandler->getWallets());
......
...@@ -111,6 +111,8 @@ public slots: ...@@ -111,6 +111,8 @@ public slots:
/// @return history of last 50 commands /// @return history of last 50 commands
QString getCmdHistory() const; QString getCmdHistory() const;
QByteArray getTest() const;
private slots: private slots:
void doRequestWallets(); void doRequestWallets();
void doSendNewHistory(const QVariant& aData); void doSendNewHistory(const QVariant& aData);
......
...@@ -21,7 +21,7 @@ DapRpcLocalServer::~DapRpcLocalServer() ...@@ -21,7 +21,7 @@ DapRpcLocalServer::~DapRpcLocalServer()
bool DapRpcLocalServer::listen(const QString &asAddress, quint16 aPort) bool DapRpcLocalServer::listen(const QString &asAddress, quint16 aPort)
{ {
Q_UNUSED(aPort); Q_UNUSED(aPort)
return QLocalServer::listen(asAddress); return QLocalServer::listen(asAddress);
} }
......
...@@ -204,6 +204,12 @@ DapRpcMessage DapRpcMessage::createRequest(const QString &asMethod, ...@@ -204,6 +204,12 @@ DapRpcMessage DapRpcMessage::createRequest(const QString &asMethod,
return request; return request;
} }
DapRpcMessage DapRpcMessage::createRequest(const QString& asMethod, const QByteArray& aStream)
{
DapRpcMessage request = createRequest(asMethod, QJsonValue::fromVariant(aStream));
return request;
}
DapRpcMessage DapRpcMessage::createNotification(const QString &asMethod, const QJsonArray &aParams) DapRpcMessage DapRpcMessage::createNotification(const QString &asMethod, const QJsonArray &aParams)
{ {
DapRpcMessage notification = DapRpcMessagePrivate::createBasicRequest(asMethod, aParams); DapRpcMessage notification = DapRpcMessagePrivate::createBasicRequest(asMethod, aParams);
...@@ -227,6 +233,12 @@ DapRpcMessage DapRpcMessage::createNotification(const QString &asMethod, ...@@ -227,6 +233,12 @@ DapRpcMessage DapRpcMessage::createNotification(const QString &asMethod,
return notification; return notification;
} }
DapRpcMessage DapRpcMessage::createNotification(const QString& asMethod, const QByteArray& aStream)
{
DapRpcMessage notification = createNotification(asMethod, QJsonValue::fromVariant(aStream));
return notification;
}
DapRpcMessage DapRpcMessage::createResponse(const QJsonValue &aResult) const DapRpcMessage DapRpcMessage::createResponse(const QJsonValue &aResult) const
{ {
DapRpcMessage response; DapRpcMessage response;
......
...@@ -47,16 +47,15 @@ public: ...@@ -47,16 +47,15 @@ public:
Error Error
}; };
static DapRpcMessage createRequest(const QString &asMethod, static DapRpcMessage createRequest(const QString &asMethod, const QJsonArray &aParams = QJsonArray());
const QJsonArray &aParams = QJsonArray());
static DapRpcMessage createRequest(const QString &asMethod, const QJsonValue &aParam); static DapRpcMessage createRequest(const QString &asMethod, const QJsonValue &aParam);
static DapRpcMessage createRequest(const QString &asMethod, const QJsonObject &aNamedParameters); static DapRpcMessage createRequest(const QString &asMethod, const QJsonObject &aNamedParameters);
static DapRpcMessage createRequest(const QString &asMethod, const QByteArray& aStream);
static DapRpcMessage createNotification(const QString &asMethod, static DapRpcMessage createNotification(const QString &asMethod, const QJsonArray &aParams = QJsonArray());
const QJsonArray &aParams = QJsonArray());
static DapRpcMessage createNotification(const QString &asMethod, const QJsonValue &aParam); static DapRpcMessage createNotification(const QString &asMethod, const QJsonValue &aParam);
static DapRpcMessage createNotification(const QString &asMethod, static DapRpcMessage createNotification(const QString &asMethod, const QJsonObject &aNamedParameters);
const QJsonObject &aNamedParameters); static DapRpcMessage createNotification(const QString &asMethod, const QByteArray& aStream);
DapRpcMessage createResponse(const QJsonValue &aResult) const; DapRpcMessage createResponse(const QJsonValue &aResult) const;
DapRpcMessage createErrorResponse(DapErrorCode aCode, DapRpcMessage createErrorResponse(DapErrorCode aCode,
......
...@@ -93,19 +93,14 @@ int DapRpcService::convertVariantTypeToJSType(int aType) ...@@ -93,19 +93,14 @@ int DapRpcService::convertVariantTypeToJSType(int aType)
case QMetaType::ULongLong: case QMetaType::ULongLong:
case QMetaType::UShort: case QMetaType::UShort:
case QMetaType::UChar: case QMetaType::UChar:
case QMetaType::Float: case QMetaType::QByteArray:
return QJsonValue::Double; // all numeric types in js are doubles case QMetaType::Float: return QJsonValue::Double; // all numeric types in js are doubles
case QMetaType::QVariantList: case QMetaType::QVariantList:
case QMetaType::QStringList: case QMetaType::QStringList: return QJsonValue::Array;
return QJsonValue::Array; case QMetaType::QVariantMap: return QJsonValue::Object;
case QMetaType::QVariantMap: case QMetaType::QString: return QJsonValue::String;
return QJsonValue::Object; case QMetaType::Bool: return QJsonValue::Bool;
case QMetaType::QString: default: break;
return QJsonValue::String;
case QMetaType::Bool:
return QJsonValue::Bool;
default:
break;
} }
return QJsonValue::Undefined; return QJsonValue::Undefined;
...@@ -217,7 +212,7 @@ QJsonValue DapRpcService::convertReturnValue(QVariant &aReturnValue) ...@@ -217,7 +212,7 @@ QJsonValue DapRpcService::convertReturnValue(QVariant &aReturnValue)
else if (static_cast<int>(aReturnValue.type()) == qMetaTypeId<QJsonArray>()) else if (static_cast<int>(aReturnValue.type()) == qMetaTypeId<QJsonArray>())
return QJsonValue(aReturnValue.toJsonArray()); return QJsonValue(aReturnValue.toJsonArray());
switch (aReturnValue.type()) { switch (static_cast<QMetaType::Type>(aReturnValue.type())) {
case QMetaType::Bool: case QMetaType::Bool:
case QMetaType::Int: case QMetaType::Int:
case QMetaType::Double: case QMetaType::Double:
...@@ -228,6 +223,7 @@ QJsonValue DapRpcService::convertReturnValue(QVariant &aReturnValue) ...@@ -228,6 +223,7 @@ QJsonValue DapRpcService::convertReturnValue(QVariant &aReturnValue)
case QMetaType::QStringList: case QMetaType::QStringList:
case QMetaType::QVariantList: case QMetaType::QVariantList:
case QMetaType::QVariantMap: case QMetaType::QVariantMap:
case QMetaType::QByteArray:
return QJsonValue::fromVariant(aReturnValue); return QJsonValue::fromVariant(aReturnValue);
default: default:
// if a conversion operator was registered it will be used // if a conversion operator was registered it will be used
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment