diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-11-13 15:34:06 +0100 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2015-11-16 09:21:30 +0000 |
commit | cb0861c7d9ce445835c3b07ae3021c11774873ff (patch) | |
tree | 2f5c3d78744b120e814d924e9d75f9fa6461464d /tests | |
parent | 5da82568a3259a72883d405f88994c5fe0e2384b (diff) |
Make QModbusReply setter public API
It avoids friend declarations and custom implementations can use
QModbusReply as well.
Change-Id: I7293cac73155da55f707f6c7225ac65298b3cf84
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qmodbusreply/tst_qmodbusreply.cpp | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/tests/auto/qmodbusreply/tst_qmodbusreply.cpp b/tests/auto/qmodbusreply/tst_qmodbusreply.cpp index 0f179eb..ecdc47a 100644 --- a/tests/auto/qmodbusreply/tst_qmodbusreply.cpp +++ b/tests/auto/qmodbusreply/tst_qmodbusreply.cpp @@ -37,31 +37,6 @@ #include <QtTest/QtTest> #include <QtSerialBus/QModbusReply> -class QModbusReplyTest : public QModbusReply -{ -public: - QModbusReplyTest() : QModbusReply(1, Q_NULLPTR) {} - void setResult(const QModbusDataUnit &unit) - { - QModbusReply::setResult(unit); - } - - void setFinished(bool isFinished) - { - QModbusReply::setFinished(isFinished); - } - - void setProtocolError(QModbusPdu::ExceptionCode error, const QString &errorText) - { - QModbusReply::setProtocolError(error, errorText); - } - - void setError(QModbusReply::ReplyError error, const QString &errorText) - { - QModbusReply::setError(error, errorText); - } -}; - class tst_QModbusReply : public QObject { Q_OBJECT @@ -97,7 +72,8 @@ void tst_QModbusReply::tst_ctor() void tst_QModbusReply::tst_setFinished() { - QModbusReplyTest replyTest; + QModbusReply replyTest(1); + QCOMPARE(replyTest.slaveAddress(), 1); QSignalSpy finishedSpy(&replyTest, SIGNAL(finished())); QSignalSpy errorSpy(&replyTest, SIGNAL(errorOccurred(QModbusReply::ReplyError))); @@ -149,7 +125,8 @@ void tst_QModbusReply::tst_setError() QFETCH(QModbusReply::ReplyError, error); QFETCH(QString, errorText); - QModbusReplyTest replyTest; + QModbusReply replyTest(1); + QCOMPARE(replyTest.slaveAddress(), 1); QSignalSpy finishedSpy(&replyTest, SIGNAL(finished())); QSignalSpy errorSpy(&replyTest, SIGNAL(errorOccurred(QModbusReply::ReplyError))); @@ -185,7 +162,8 @@ void tst_QModbusReply::tst_setProtocolError() QFETCH(QModbusPdu::ExceptionCode, error); QFETCH(QString, errorText); - QModbusReplyTest replyTest; + QModbusReply replyTest(1); + QCOMPARE(replyTest.slaveAddress(), 1); QSignalSpy finishedSpy(&replyTest, SIGNAL(finished())); QSignalSpy errorSpy(&replyTest, SIGNAL(errorOccurred(QModbusReply::ReplyError))); @@ -216,7 +194,8 @@ void tst_QModbusReply::tst_setResult() QVector<quint16> reference = { 4,5,6 }; QCOMPARE(unit.values(), reference); - QModbusReplyTest replyTest; + QModbusReply replyTest(1); + QCOMPARE(replyTest.slaveAddress(), 1); QSignalSpy finishedSpy(&replyTest, SIGNAL(finished())); QSignalSpy errorSpy(&replyTest, SIGNAL(errorOccurred(QModbusReply::ReplyError))); |