grpc: Minor test updates

Minimize incrementing and check of the iterator variables. Replaces
hardcoded test values with constants.

Change-Id: I5ae4c5e1ab8db62b5744e62f62a5124536686342
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Konrad Kujawa <konrad.kujawa@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Alexey Edelev 2022-12-09 15:32:00 +01:00
parent 6ad57034be
commit 7b565c1d13
1 changed files with 7 additions and 7 deletions

View File

@ -291,9 +291,8 @@ void QtGrpcClientTest::StreamStringAndAbortTest()
int i = 0; int i = 0;
QObject::connect(stream.get(), &QGrpcStream::messageReceived, this, [&result, &i, stream]() { QObject::connect(stream.get(), &QGrpcStream::messageReceived, this, [&result, &i, stream]() {
SimpleStringMessage ret = stream->read<SimpleStringMessage>(); SimpleStringMessage ret = stream->read<SimpleStringMessage>();
++i;
result.setTestFieldString(result.testFieldString() + ret.testFieldString()); result.setTestFieldString(result.testFieldString() + ret.testFieldString());
if (i == ExpectedMessageCount) if (++i == ExpectedMessageCount)
stream->abort(); stream->abort();
}); });
@ -578,11 +577,14 @@ void QtGrpcClientTest::MultipleStreamsCancelTest()
void QtGrpcClientTest::CallNonCompatibleArgRetTest() void QtGrpcClientTest::CallNonCompatibleArgRetTest()
{ {
const QtProtobuf::sint32 TestValue = 2048;
const QString TestValueString = QString::number(TestValue);
SimpleIntMessage request; SimpleIntMessage request;
request.setTestField(2048); request.setTestField(TestValue);
auto result = QSharedPointer<SimpleStringMessage>::create(); auto result = QSharedPointer<SimpleStringMessage>::create();
QCOMPARE_EQ(_client->testMethodNonCompatibleArgRet(request, result.get()), QGrpcStatus::Ok); QCOMPARE_EQ(_client->testMethodNonCompatibleArgRet(request, result.get()), QGrpcStatus::Ok);
QCOMPARE_EQ(result->testFieldString(), "2048"); QCOMPARE_EQ(result->testFieldString(), TestValueString);
} }
void QtGrpcClientTest::CallStringThreadTest() void QtGrpcClientTest::CallStringThreadTest()
@ -658,10 +660,8 @@ void QtGrpcClientTest::StreamStringThreadTest()
SimpleStringMessage ret = stream->read<SimpleStringMessage>(); SimpleStringMessage ret = stream->read<SimpleStringMessage>();
result.setTestFieldString(result.testFieldString() result.setTestFieldString(result.testFieldString()
+ ret.testFieldString()); + ret.testFieldString());
++i; if (++i == 4)
if (i == 4) {
waiter.quit(); waiter.quit();
}
}); });
waiter.exec(); waiter.exec();