diff options
Diffstat (limited to 'tests/auto/qndefmessage/tst_qndefmessage.cpp')
| -rw-r--r-- | tests/auto/qndefmessage/tst_qndefmessage.cpp | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/tests/auto/qndefmessage/tst_qndefmessage.cpp b/tests/auto/qndefmessage/tst_qndefmessage.cpp index 738be927..8c4e8525 100644 --- a/tests/auto/qndefmessage/tst_qndefmessage.cpp +++ b/tests/auto/qndefmessage/tst_qndefmessage.cpp @@ -160,12 +160,12 @@ void tst_QNdefMessage::parseSingleRecordMessage_data() QByteArray data; data.append(char(0xcd)); // MB=1, ME=1, IL=1, TNF=5 - data.append(char(type.length())); // TYPE LENGTH - data.append(char((payload.length() >> 24) & 0xff)); // PAYLOAD LENGTH 3 - data.append(char((payload.length() >> 16) & 0xff)); // PAYLOAD LENGTH 2 - data.append(char((payload.length() >> 8) & 0xff)); // PAYLOAD LENGTH 1 - data.append(char((payload.length() >> 0) & 0xff)); // PAYLOAD LENGTH 0 - data.append(char(id.length())); // ID LENGTH + data.append(char(type.size())); // TYPE LENGTH + data.append(char((payload.size() >> 24) & 0xff)); // PAYLOAD LENGTH 3 + data.append(char((payload.size() >> 16) & 0xff)); // PAYLOAD LENGTH 2 + data.append(char((payload.size() >> 8) & 0xff)); // PAYLOAD LENGTH 1 + data.append(char((payload.size() >> 0) & 0xff)); // PAYLOAD LENGTH 0 + data.append(char(id.size())); // ID LENGTH data.append(type); data.append(id); data.append(payload); @@ -188,14 +188,14 @@ void tst_QNdefMessage::parseSingleRecordMessage_data() QByteArray data; data.append(char(0xbd)); // MB=1, CF=1, SR=1, IL=1, TNF=5 - data.append(char(type.length())); // TYPE LENGTH + data.append(char(type.size())); // TYPE LENGTH data.append(char(1)); // PAYLOAD LENGTH - data.append(char(id.length())); // ID LENGTH + data.append(char(id.size())); // ID LENGTH data.append(type); // TYPE data.append(id); // ID data.append(payload.at(0)); // PAYLOAD[0] - for (int i = 1; i < payload.length() - 1; ++i) { + for (int i = 1; i < payload.size() - 1; ++i) { data.append(char(0x36)); // CF=1, SR=1, TNF=6 data.append(char(0)); // TYPE LENGTH data.append(char(1)); // PAYLOAD LENGTH @@ -205,7 +205,7 @@ void tst_QNdefMessage::parseSingleRecordMessage_data() data.append(char(0x56)); // ME=1, SR=1, TNF=6 data.append(char(0)); // TYPE LENGTH data.append(char(1)); // PAYLOAD LENGTH - data.append(payload.at(payload.length() - 1)); // PAYLOAD[length - 1] + data.append(payload.at(payload.size() - 1)); // PAYLOAD[length - 1] QNdefRecord record; record.setTypeNameFormat(QNdefRecord::Unknown); @@ -231,11 +231,11 @@ void tst_QNdefMessage::parseSingleRecordMessage_data() QByteArray data; data.append(char(0xc1)); // MB=1, ME=1, IL=0, TNF=1 - data.append(char(type.length())); // TYPE LENGTH - data.append(char((payload.length() >> 24) & 0xff)); // PAYLOAD LENGTH 3 - data.append(char((payload.length() >> 16) & 0xff)); // PAYLOAD LENGTH 2 - data.append(char((payload.length() >> 8) & 0xff)); // PAYLOAD LENGTH 1 - data.append(char((payload.length() >> 0) & 0xff)); // PAYLOAD LENGTH 0 + data.append(char(type.size())); // TYPE LENGTH + data.append(char((payload.size() >> 24) & 0xff)); // PAYLOAD LENGTH 3 + data.append(char((payload.size() >> 16) & 0xff)); // PAYLOAD LENGTH 2 + data.append(char((payload.size() >> 8) & 0xff)); // PAYLOAD LENGTH 1 + data.append(char((payload.size() >> 0) & 0xff)); // PAYLOAD LENGTH 0 data.append(type); data.append(payload); @@ -265,11 +265,11 @@ void tst_QNdefMessage::parseSingleRecordMessage_data() QByteArray data; data.append(char(0xc1)); // MB=1, ME=1, IL=0, TNF=1 - data.append(char(type.length())); // TYPE LENGTH - data.append(char((payload.length() >> 24) & 0xff)); // PAYLOAD LENGTH 3 - data.append(char((payload.length() >> 16) & 0xff)); // PAYLOAD LENGTH 2 - data.append(char((payload.length() >> 8) & 0xff)); // PAYLOAD LENGTH 1 - data.append(char((payload.length() >> 0) & 0xff)); // PAYLOAD LENGTH 0 + data.append(char(type.size())); // TYPE LENGTH + data.append(char((payload.size() >> 24) & 0xff)); // PAYLOAD LENGTH 3 + data.append(char((payload.size() >> 16) & 0xff)); // PAYLOAD LENGTH 2 + data.append(char((payload.size() >> 8) & 0xff)); // PAYLOAD LENGTH 1 + data.append(char((payload.size() >> 0) & 0xff)); // PAYLOAD LENGTH 0 data.append(type); data.append(payload); @@ -300,11 +300,11 @@ void tst_QNdefMessage::parseSingleRecordMessage_data() QByteArray data; data.append(char(0xc1)); - data.append(char(type.length())); - data.append(char((payload.length() >> 24) & 0xff)); // PAYLOAD LENGTH 3 - data.append(char((payload.length() >> 16) & 0xff)); // PAYLOAD LENGTH 2 - data.append(char((payload.length() >> 8) & 0xff)); // PAYLOAD LENGTH 1 - data.append(char((payload.length() >> 0) & 0xff)); // PAYLOAD LENGTH 0 + data.append(char(type.size())); + data.append(char((payload.size() >> 24) & 0xff)); // PAYLOAD LENGTH 3 + data.append(char((payload.size() >> 16) & 0xff)); // PAYLOAD LENGTH 2 + data.append(char((payload.size() >> 8) & 0xff)); // PAYLOAD LENGTH 1 + data.append(char((payload.size() >> 0) & 0xff)); // PAYLOAD LENGTH 0 data.append(type); data.append(payload); @@ -333,11 +333,11 @@ void tst_QNdefMessage::parseSingleRecordMessage_data() QByteArray data; data.append(char(0xc1)); - data.append(char(type.length())); - data.append(char((payload.length() >> 24) & 0xff)); // PAYLOAD LENGTH 3 - data.append(char((payload.length() >> 16) & 0xff)); // PAYLOAD LENGTH 2 - data.append(char((payload.length() >> 8) & 0xff)); // PAYLOAD LENGTH 1 - data.append(char((payload.length() >> 0) & 0xff)); // PAYLOAD LENGTH 0 + data.append(char(type.size())); + data.append(char((payload.size() >> 24) & 0xff)); // PAYLOAD LENGTH 3 + data.append(char((payload.size() >> 16) & 0xff)); // PAYLOAD LENGTH 2 + data.append(char((payload.size() >> 8) & 0xff)); // PAYLOAD LENGTH 1 + data.append(char((payload.size() >> 0) & 0xff)); // PAYLOAD LENGTH 0 data.append(type); data.append(payload); @@ -366,11 +366,11 @@ void tst_QNdefMessage::parseSingleRecordMessage_data() QByteArray data; data.append(char(0xc1)); - data.append(char(type.length())); - data.append(char((payload.length() >> 24) & 0xff)); // PAYLOAD LENGTH 3 - data.append(char((payload.length() >> 16) & 0xff)); // PAYLOAD LENGTH 2 - data.append(char((payload.length() >> 8) & 0xff)); // PAYLOAD LENGTH 1 - data.append(char((payload.length() >> 0) & 0xff)); // PAYLOAD LENGTH 0 + data.append(char(type.size())); + data.append(char((payload.size() >> 24) & 0xff)); // PAYLOAD LENGTH 3 + data.append(char((payload.size() >> 16) & 0xff)); // PAYLOAD LENGTH 2 + data.append(char((payload.size() >> 8) & 0xff)); // PAYLOAD LENGTH 1 + data.append(char((payload.size() >> 0) & 0xff)); // PAYLOAD LENGTH 0 data.append(type); data.append(payload); @@ -403,19 +403,19 @@ void tst_QNdefMessage::parseSingleRecordMessage_data() QByteArray data; data.append(char(0xB9)); // MB=1, ME=0, CF=1, SR=1, IL=1, TNF=1 (NFC-RTD) - data.append(type.length()); - data.append(payload1.length() & 0xff); // length fits into 1 byte - data.append(id.length()); + data.append(type.size()); + data.append(payload1.size() & 0xff); // length fits into 1 byte + data.append(id.size()); data.append(type); data.append(id); data.append(payload1); data.append(char(0x36)); // MB=0, ME=0, CF=1, SR=1, IL=0, TNF=6 (Unchanged) data.append(char(0x00)); - data.append(payload2.length()); + data.append(payload2.size()); data.append(payload2); data.append(char(0x56)); // MB=0, ME=1, CF=0, SR=1, IL=0, TNF=6 (Unchanged) data.append(char(0x00)); - data.append(payload3.length()); + data.append(payload3.size()); data.append(payload3); QNdefRecord record; @@ -442,22 +442,22 @@ void tst_QNdefMessage::parseSingleRecordMessage_data() QTest::newRow("truncated 1") << data << QNdefMessage() << QVariantList(); - data.append(char(type.length())); // TYPE LENGTH + data.append(char(type.size())); // TYPE LENGTH QTest::newRow("truncated 2") << data << QNdefMessage() << QVariantList(); - data.append(char((payload.length() >> 24) & 0xff)); // PAYLOAD LENGTH 3 + data.append(char((payload.size() >> 24) & 0xff)); // PAYLOAD LENGTH 3 QTest::newRow("truncated 3") << data << QNdefMessage() << QVariantList(); - data.append(char((payload.length() >> 16) & 0xff)); // PAYLOAD LENGTH 2 + data.append(char((payload.size() >> 16) & 0xff)); // PAYLOAD LENGTH 2 QTest::newRow("truncated 4") << data << QNdefMessage() << QVariantList(); - data.append(char((payload.length() >> 8) & 0xff)); // PAYLOAD LENGTH 1 + data.append(char((payload.size() >> 8) & 0xff)); // PAYLOAD LENGTH 1 QTest::newRow("truncated 5") << data << QNdefMessage() << QVariantList(); - data.append(char((payload.length() >> 0) & 0xff)); // PAYLOAD LENGTH 0 + data.append(char((payload.size() >> 0) & 0xff)); // PAYLOAD LENGTH 0 QTest::newRow("truncated 6") << data << QNdefMessage() << QVariantList(); - data.append(char(id.length())); // ID LENGTH + data.append(char(id.size())); // ID LENGTH QTest::newRow("truncated 7") << data << QNdefMessage() << QVariantList(); data.append(type); |