ETM-Schurig/powersync-mqtt
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #13: Fix isConnected() and binary payload parsing

Browse Source
This commit is contained in:
Jenkins nymea 2021-02-14 23:00:26 +01:00
commit 192dc822d8
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnymea-mqtt/mqttclient.cpp
View File

@ -364,9 +364,9 @@ void MqttClientPrivate::onReadyRead()
}
socket->write(retryPacket.serialize());
}
restartKeepAliveTimer();
// Make sure we emit connected after having handled all the retransmission queue
emit q_ptr->connected(packet.connectReturnCode(), packet.connackFlags());
restartKeepAliveTimer();
break;
case MqttPacket::TypePublish:
qCDebug(dbgClient) << "Publish received from server. Topic:" << packet.topic() << "Payload:" << packet.payload() << "QoS:" << packet.qos();

5
libnymea-mqtt/mqttpacket.cpp
View File

@ -522,8 +522,9 @@ int MqttPacket::parse(const QByteArray &buffer)
}
memset(str, 0, MAX_STRLEN);
inputStream.readRawData(str, qMin(MAX_STRLEN, remainingLength));
d_ptr->payload = QByteArray(str);
qint16 payloadLen = qMin(MAX_STRLEN, remainingLength);
inputStream.readRawData(str, payloadLen);
d_ptr->payload = QByteArray(str, payloadLen);
break;
}
case TypePuback:

26
tests/operation/test_operation.cpp
View File

@ -82,6 +82,8 @@ private slots:
void testEmptyClientId();
void testBinaryPaylaod();
private:
// Connects and waits for the MQTT CONNECT to be finished
MqttClient *connectAndWait(const QString &clientId, bool cleanSession = true, quint16 keepAlive = 300, const QString &willTopic = QString(), const QString &willMessage = QString(), Mqtt::QoS willQoS = Mqtt::QoS0, bool willRetain = false);
@ -182,7 +184,16 @@ void OperationTests::connectAndDisconnect()
QSignalSpy serverSpy(m_server, &MqttServer::clientConnected);
QString clientId = "connectAndDisconnect-client";
MqttClient* client = connectAndWait(clientId);
QPair<MqttClient*, QSignalSpy*> result = connectToServer(clientId);
MqttClient* client = result.first;
connect(client, &MqttClient::connected, this, [client](Mqtt::ConnectReturnCode connectReturnCode, Mqtt::ConnackFlags connackFlags){
QVERIFY2(client->isConnected(), "MqttClient::isConnected not returning true in connected signal()");
QCOMPARE(connectReturnCode, Mqtt::ConnectReturnCodeAccepted);
QCOMPARE(connackFlags, Mqtt::ConnackFlagNone);
});
if (result.second->count() == 0) {
result.second->wait();
}
QVERIFY2(serverSpy.count() == 1, "Server didn't emit clientConnected");
QVERIFY2(serverSpy.at(0).at(1) == clientId, "ClientId not matching on server side.");
@ -820,6 +831,19 @@ void OperationTests::testEmptyClientId()
QTRY_VERIFY2(client3.first->isConnected() == false, "Connection should have been dropped");
}
void OperationTests::testBinaryPaylaod()
{
MqttClient *client = connectAndWait("");
QVERIFY2(client->isConnected(), "Client did not connect");
client->subscribe("#");
const char binData[] = {'\xA5', '\x20', '\x00', '\x04', '\x00', '\x52'};
QByteArray payload(QByteArray::fromRawData(binData, 6));
QSignalSpy publishReceivedSpy(client, &MqttClient::publishReceived);
client->publish("testtopic", payload);
QTRY_VERIFY2(publishReceivedSpy.count() == 1, "Did not receive publish message");
QCOMPARE(publishReceivedSpy.first().at(1).toByteArray(), payload);
}
#endif
QTEST_MAIN(OperationTests)