From 080c096cb00aa77345a711696b4cfb7515f07327 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Wed, 14 May 2014 17:18:35 +0200 Subject: Remove nokia URLS from NFC unit tests Change-Id: I04c8bbd25203249366a1deef839ef16c25e35703 Reviewed-by: Kai Koehne Reviewed-by: Joerg Bornemann --- tests/auto/qndefmessage/tst_qndefmessage.cpp | 24 +++++++++++----------- tests/auto/qndefrecord/tst_qndefrecord.cpp | 16 +++++++-------- .../qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp | 4 ++-- .../qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp | 4 ++-- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tests/auto/qndefmessage/tst_qndefmessage.cpp b/tests/auto/qndefmessage/tst_qndefmessage.cpp index a734b72e..897db5a3 100644 --- a/tests/auto/qndefmessage/tst_qndefmessage.cpp +++ b/tests/auto/qndefmessage/tst_qndefmessage.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNfc module of the Qt Toolkit. @@ -244,7 +244,7 @@ void tst_QNdefMessage::tst_parse_data() QByteArray type("U"); QByteArray payload; payload.append(char(0x00)); - payload.append("http://qt.nokia.com/"); + payload.append("http://qt-project.org/"); QByteArray data; data.append(char(0xc1)); @@ -259,13 +259,13 @@ void tst_QNdefMessage::tst_parse_data() QNdefRecord record; record.setTypeNameFormat(QNdefRecord::NfcRtd); record.setType("U"); - record.setPayload(QByteArray("\000http://qt.nokia.com/", 21)); + record.setPayload(QByteArray("\000http://qt-project.org/", 23)); QList recordList; recordList.append(record); - QTest::newRow("nfc-rtd uri http://qt.nokia.com/") + QTest::newRow("nfc-rtd uri http://qt-project.org/") << data << QNdefMessage(recordList) - << (QVariantList() << QUrl(QStringLiteral("http://qt.nokia.com/"))); - QCOMPARE(qHash(record), 4030951038LL); + << (QVariantList() << QUrl(QStringLiteral("http://qt-project.org/"))); + QCOMPARE(qHash(record), 3736709795LL); } // NFC-RTD URI @@ -273,7 +273,7 @@ void tst_QNdefMessage::tst_parse_data() QByteArray type("U"); QByteArray payload; payload.append(char(0x03)); - payload.append("qt.nokia.com/"); + payload.append("qt-project.org/"); QByteArray data; data.append(char(0xc1)); @@ -288,13 +288,13 @@ void tst_QNdefMessage::tst_parse_data() QNdefRecord record; record.setTypeNameFormat(QNdefRecord::NfcRtd); record.setType("U"); - record.setPayload(QByteArray("\003qt.nokia.com/", 14)); + record.setPayload(QByteArray("\003qt-project.org/", 16)); QList recordList; recordList.append(record); - QTest::newRow("nfc-rtd uri abbrev http://qt.nokia.com/") + QTest::newRow("nfc-rtd uri abbrev http://qt-project.org/") << data << QNdefMessage(recordList) - << (QVariantList() << QUrl(QStringLiteral("http://qt.nokia.com/"))); - QCOMPARE(qHash(record), 132405495LL); + << (QVariantList() << QUrl(QStringLiteral("http://qt-project.org/"))); + QCOMPARE(qHash(record),2445925084LL); } // NFC-RTD URI @@ -332,7 +332,7 @@ void tst_QNdefMessage::tst_parse_data() QByteArray id("Test ID"); QByteArray payload; payload.append(char(0x00)); - payload.append("http://qt.nokia.com/"); + payload.append("http://qt-project.org/"); QByteArray data; data.append(char(0xc9)); // MB=1, ME=1, IL=1 diff --git a/tests/auto/qndefrecord/tst_qndefrecord.cpp b/tests/auto/qndefrecord/tst_qndefrecord.cpp index 000ff017..1657691c 100644 --- a/tests/auto/qndefrecord/tst_qndefrecord.cpp +++ b/tests/auto/qndefrecord/tst_qndefrecord.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNfc module of the Qt Toolkit. @@ -164,7 +164,7 @@ void tst_QNdefRecord::tst_record() { QNdefRecord record; record.setTypeNameFormat(QNdefRecord::ExternalRtd); - record.setType("qt.nokia.com:test-rtd"); + record.setType("qt-project.org:test-rtd"); record.setId("test id"); record.setPayload("test payload"); @@ -196,13 +196,13 @@ void tst_QNdefRecord::tst_record() { QNdefRecord record; record.setTypeNameFormat(QNdefRecord::ExternalRtd); - record.setType("qt.nokia.com:test-rtd"); + record.setType("qt-project.org:test-rtd"); record.setId("test id"); record.setPayload("test payload"); QNdefRecord other; other.setTypeNameFormat(QNdefRecord::ExternalRtd); - other.setType("qt.nokia.com:test-other-rtd"); + other.setType("qt-project.org:test-other-rtd"); other.setId("test other id"); other.setPayload("test other payload"); @@ -301,14 +301,14 @@ void tst_QNdefRecord::tst_uriRecord_data() QTest::addColumn("payload"); - QTest::newRow("http") << QString::fromLatin1("http://qt.nokia.com/") - << QByteArray::fromHex("0371742E6E6F6B69612E636F6D2F"); + QTest::newRow("http") << QString::fromLatin1("http://qt-project.org/") + << QByteArray::fromHex("0371742d70726f6a6563742e6f72672f"); QTest::newRow("tel") << QString::fromLatin1("tel:+1234567890") << QByteArray::fromHex("052B31323334353637383930"); QTest::newRow("mailto") << QString::fromLatin1("mailto:test@example.com") << QByteArray::fromHex("0674657374406578616D706C652E636F6D"); - QTest::newRow("urn") << QString::fromLatin1("urn:nfc:ext:qt.nokia.com:test") - << QByteArray::fromHex("136E66633A6578743A71742E6E6F6B69612E636F6D3A74657374"); + QTest::newRow("urn") << QString::fromLatin1("urn:nfc:ext:qt-project.org:test") + << QByteArray::fromHex("136E66633A6578743A71742D70726F6A6563742E6F72673A74657374"); } void tst_QNdefRecord::tst_uriRecord() diff --git a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp index e0bb7ea3..cec6ff38 100644 --- a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp +++ b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNfc module of the Qt Toolkit. @@ -429,7 +429,7 @@ void tst_QNearFieldTagType1::ndefMessages() if (target->memorySize() > 120) { QNdefRecord record; record.setTypeNameFormat(QNdefRecord::ExternalRtd); - record.setType("com.nokia.qt:ndefMessagesTest"); + record.setType("org.qt-project:ndefMessagesTest"); record.setPayload(QByteArray(120, quint8(0x55))); message.append(record); } diff --git a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp index d01ce24a..b7ac2bae 100644 --- a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp +++ b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNfc module of the Qt Toolkit. @@ -321,7 +321,7 @@ void tst_QNearFieldTagType2::ndefMessages() if (target->memorySize() > 120) { QNdefRecord record; record.setTypeNameFormat(QNdefRecord::ExternalRtd); - record.setType("com.nokia.qt:ndefMessagesTest"); + record.setType("org.qt-project:ndefMessagesTest"); record.setPayload(QByteArray(120, quint8(0x55))); message.append(record); } -- cgit v1.2.3