hero123457/qtmqtt
1
0
Fork 0
mirror of https://github.com/qt/qtmqtt.git synced 2026-10-25 16:16:26 +00:00
Code Issues Projects Releases Wiki Activity

Port from container::count() and length() to size()

Browse Source 
This is a semantic patch using ClangTidyTransformator as in
qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8:

  auto QtContainerClass = anyOf(
      expr(hasType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))))).bind(o),
      expr(hasType(namedDecl(hasAnyName(<classes>)))).bind(o));
  makeRule(cxxMemberCallExpr(on(QtContainerClass),
                             callee(cxxMethodDecl(hasAnyName({"count", "length"),
                                                  parameterCountIs(0))))),
           changeTo(cat(access(o, cat("size"), "()"))),
           cat("use 'size()' instead of 'count()/length()'"))

a.k.a qt-port-to-std-compatible-api with config Scope: 'Container',
with the extended set of container classes recognized.

Change-Id: Ieb49171212fd72c685ba27cb39aaec9cbaf3a701
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
This commit is contained in:
Marc Mutz 2022-10-05 07:52:59 +02:00
parent 1972fe9953
commit fe687108b6
5 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mqtt/qmqttconnection.cpp
View File

@ -1599,7 +1599,7 @@ void QMqttConnection::finalize_publish()
{
// String topic
QMqttTopicName topic = readBufferTyped<QString>(&m_missingData);
const int topicLength = topic.name().length();
const int topicLength = topic.name().size();
quint16 id = 0;
if (m_currentPublish.qos > 0)

16
tests/auto/qmqttclient/tst_qmqttclient.cpp
View File

@ -220,7 +220,7 @@ void Tst_QMqttClient::retainMessage()
QSignalSpy publishSpy(&publisher, SIGNAL(messageSent(qint32)));
publisher.publish(testTopic, testMessage, 1, i == 1 ? true : false);
QTRY_COMPARE(publishSpy.count(), 1);
QTRY_COMPARE(publishSpy.size(), 1);
VersionClient(mqttVersion, sub);
sub.setClientId(QLatin1String("SubA"));
@ -310,7 +310,7 @@ void Tst_QMqttClient::willMessage()
else
willClient.disconnectFromHost();
QTest::qWait(500);
QTRY_COMPARE(messageSpy.count(), i);
QTRY_COMPARE(messageSpy.size(), i);
}
}
@ -665,7 +665,7 @@ void Tst_QMqttClient::messageStatus()
QSignalSpy publishSpy(&client, &QMqttClient::messageSent);
client.publish(topic, QByteArray("someContent"), quint8(qos));
QTRY_VERIFY2(publishSpy.count() == 1, "Could not publish message");
QTRY_VERIFY2(publishSpy.size() == 1, "Could not publish message");
QTRY_VERIFY2(expectedStatus.isEmpty(), "Did not receive all status updates.");
}
@ -718,8 +718,8 @@ void Tst_QMqttClient::messageStatusReceive()
QSignalSpy receiveSpy(&subscriber, &QMqttClient::messageReceived);
publisher.publish(topic, QByteArray("someContent"), quint8(qos));
QTRY_VERIFY2(publishSpy.count() == 1, "Could not publish message");
QTRY_VERIFY2(receiveSpy.count() == 1, "Did not receive message");
QTRY_VERIFY2(publishSpy.size() == 1, "Could not publish message");
QTRY_VERIFY2(receiveSpy.size() == 1, "Did not receive message");
QTRY_VERIFY2(expectedStatus.isEmpty(), "Did not receive all status updates.");
}
@ -803,7 +803,7 @@ void Tst_QMqttClient::subscriptionIdsOverlap()
QSignalSpy publishSpy(&pub, &QMqttClient::messageSent);
pub.publish(topic, "SomeData", 1);
QTRY_VERIFY2(publishSpy.count() == 1, "Could not finalize publication.");
QTRY_VERIFY2(publishSpy.size() == 1, "Could not finalize publication.");
QTRY_VERIFY2(receiveBCounter == 0, "Did not receive both messages.");
QTRY_VERIFY2(receiveB2Counter == 0, "Did not receive both messages.");
QTRY_VERIFY2(receiveACounter == 1, "Did not receive non-overlapping message.");
@ -848,7 +848,7 @@ void Tst_QMqttClient::keepAlive()
// Verify auto keep alive works
QSignalSpy spy(&client, &QMqttClient::pingResponseReceived);
QTRY_VERIFY_WITH_TIMEOUT(spy.count() == 5, keepAlive * 1000 * 5 * 2);
QTRY_VERIFY_WITH_TIMEOUT(spy.size() == 5, keepAlive * 1000 * 5 * 2);
spy.clear();
client.disconnectFromHost();
@ -880,7 +880,7 @@ void Tst_QMqttClient::keepAlive()
client.connectToHost();
QTRY_COMPARE(client.state(), QMqttClient::Connected);
QTRY_VERIFY_WITH_TIMEOUT(spy.count() == 5, keepAlive * 1000 * 5 * 2);
QTRY_VERIFY_WITH_TIMEOUT(spy.size() == 5, keepAlive * 1000 * 5 * 2);
client.disconnectFromHost();
QTRY_COMPARE(client.state(), QMqttClient::Disconnected);

32
tests/auto/qmqttconnectionproperties/tst_qmqttconnectionproperties.cpp
View File

@ -189,17 +189,17 @@ void tst_QMqttConnectionProperties::maximumPacketSize()
QSignalSpy publishSpy(&client, SIGNAL(messageSent(qint32)));
client.publish(topic, shortData, 1);
QTRY_COMPARE(publishSpy.count(), 1);
QTRY_COMPARE(publishSpy.size(), 1);
QTRY_COMPARE(subscribeSpy.count(), 1);
QTRY_COMPARE(subscribeSpy.size(), 1);
client.publish(topic, overFlowData, 1);
QTRY_COMPARE(publishSpy.count(), 1);
QTRY_COMPARE(publishSpy.size(), 1);
// We defined maximum size to receive is 500, hence the message should not be sent back
// to us. Wait for some time and verify no message got sent to subscriber
QTest::qWait(3000);
QTRY_COMPARE(subscribeSpy.count(), 1);
QTRY_COMPARE(subscribeSpy.size(), 1);
}
void tst_QMqttConnectionProperties::maximumTopicAlias()
@ -240,9 +240,9 @@ void tst_QMqttConnectionProperties::maximumTopicAlias()
QMqttTopicName topic(topicBase + QString::number(i));
client.publish(topic, msgContent, 1);
QTRY_VERIFY(publishSpy.count() == 1);
QTRY_VERIFY(publishSpy.size() == 1);
QVERIFY(transportSpy.count() == 1);
QVERIFY(transportSpy.size() == 1);
const int dataSize = transportSpy.at(0).at(0).toInt();
if (publishTransportSize == 0) {
publishTransportSize = dataSize;
@ -256,8 +256,8 @@ void tst_QMqttConnectionProperties::maximumTopicAlias()
QSignalSpy fullSpy(&client, SIGNAL(messageSent(qint32)));
transportSpy.clear();
client.publish(QLatin1String("Qt/connprop/alias/full/with/long/topic/to/verify/bigger/size"), msgContent, 1);
QTRY_VERIFY(fullSpy.count() == 1);
QVERIFY(transportSpy.count() == 1);
QTRY_VERIFY(fullSpy.size() == 1);
QVERIFY(transportSpy.size() == 1);
QVERIFY(transportSpy.at(0).at(0).toInt() > publishTransportSize);
// Verify alias is used at sending second time
@ -265,8 +265,8 @@ void tst_QMqttConnectionProperties::maximumTopicAlias()
fullSpy.clear();
client.publish(topicBase + QLatin1String("0"), msgContent, 1);
QTRY_VERIFY(fullSpy.count() == 1);
QVERIFY(transportSpy.count() == 1);
QTRY_VERIFY(fullSpy.size() == 1);
QVERIFY(transportSpy.size() == 1);
int usageSize = transportSpy.at(0).at(0).toInt();
QVERIFY(usageSize < publishTransportSize);
@ -277,16 +277,16 @@ void tst_QMqttConnectionProperties::maximumTopicAlias()
fullSpy.clear();
transportSpy.clear();
client.publish(overwrite, overProp, msgContent, 1);
QTRY_VERIFY(fullSpy.count() == 1);
QVERIFY(transportSpy.count() == 1);
QTRY_VERIFY(fullSpy.size() == 1);
QVERIFY(transportSpy.size() == 1);
const int overwriteSize = transportSpy.at(0).at(0).toInt();
QVERIFY(overwriteSize > publishTransportSize);
// After resend new alias should be used and msg size reduced
fullSpy.clear();
transportSpy.clear();
client.publish(overwrite, msgContent, 1);
QTRY_VERIFY(fullSpy.count() == 1);
QVERIFY(transportSpy.count() == 1);
QTRY_VERIFY(fullSpy.size() == 1);
QVERIFY(transportSpy.size() == 1);
usageSize = transportSpy.at(0).at(0).toInt();
QVERIFY(usageSize < overwriteSize);
}
@ -333,12 +333,12 @@ void tst_QMqttConnectionProperties::maximumTopicAliasReceive()
QSignalSpy publishSpy(&client, &QMqttClient::messageSent);
//QLoggingCategory::setFilterRules("qt.mqtt.connection*=true");
client.publish(topic, msgContent, 1);
QTRY_VERIFY2(publishSpy.count() == 1, "Could not publish");
QTRY_VERIFY2(publishSpy.size() == 1, "Could not publish");
QTRY_VERIFY2(receiveCounter == 1, "Did not receive initial message");
publishSpy.clear();
client.publish(topic, msgContent, 1);
QTRY_VERIFY2(publishSpy.count() == 1, "Could not publish");
QTRY_VERIFY2(publishSpy.size() == 1, "Could not publish");
QTRY_VERIFY2(receiveCounter == 2, "Did not receive second aliases message");
}

4
tests/auto/qmqttpublishproperties/tst_qmqttpublishproperties.cpp
View File

@ -159,8 +159,8 @@ void tst_QMqttPublishProperties::propertyConsistency()
QSignalSpy subscribeSpy(sub, SIGNAL(messageReceived(QMqttMessage)));
client.publish(testTopic, pubProp, QByteArray("Some Content"), 1);
QTRY_COMPARE(publishSpy.count(), 1);
QTRY_COMPARE(subscribeSpy.count(), 1);
QTRY_COMPARE(publishSpy.size(), 1);
QTRY_COMPARE(subscribeSpy.size(), 1);
auto msg = subscribeSpy.at(0).at(0).value<QMqttMessage>();

8
tests/auto/qmqttsubscription/tst_qmqttsubscription.cpp
View File

@ -192,7 +192,7 @@ void Tst_QMqttSubscription::reconnect()
// [MQTT-4.1.0-2] A Session MUST last at least as long it has an active Network Connection.
// All testbrokers delete the session at transport disconnect, regardless of DISCONNECT been
// send before or not.
if (restoredSpy.count() > 0) {
if (restoredSpy.size() > 0) {
QCOMPARE(reSub->state(), QMqttSubscription::Subscribed);
pubSpy.clear();
receivalSpy.clear();
@ -388,13 +388,13 @@ void Tst_QMqttSubscription::noLocal()
QSignalSpy receivalSpy(sub, SIGNAL(messageReceived(QMqttMessage)));
client.publish(topic, "content", 1);
QTRY_VERIFY(publishSpy.count() == 1);
QTRY_VERIFY(publishSpy.size() == 1);
if (version == QMqttClient::MQTT_3_1_1 || !non) { // 3.1.1 does not know NoLocal and sends to subscription
QTRY_VERIFY(receivalSpy.count() == 1);
QTRY_VERIFY(receivalSpy.size() == 1);
} else {
QTest::qWait(3000);
QCOMPARE(receivalSpy.count(), 0);
QCOMPARE(receivalSpy.size(), 0);
}
}