diff options
Diffstat (limited to 'tests/auto/corelib/tools')
4 files changed, 14 insertions, 14 deletions
diff --git a/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp index e941ceb456..de252a5d5e 100644 --- a/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp +++ b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp @@ -169,19 +169,19 @@ void tst_QCryptographicHash::sha1() // A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D QCOMPARE(QCryptographicHash::hash("abc", QCryptographicHash::Sha1).toHex().toUpper(), QByteArray("A9993E364706816ABA3E25717850C26C9CD0D89D")); - + // SHA1("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") = // 84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1 QCOMPARE(QCryptographicHash::hash("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", QCryptographicHash::Sha1).toHex().toUpper(), QByteArray("84983E441C3BD26EBAAE4AA1F95129E5E54670F1")); - + // SHA1(A million repetitions of "a") = // 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F QByteArray as; for (int i = 0; i < 1000000; ++i) as += 'a'; - QCOMPARE(QCryptographicHash::hash(as, QCryptographicHash::Sha1).toHex().toUpper(), + QCOMPARE(QCryptographicHash::hash(as, QCryptographicHash::Sha1).toHex().toUpper(), QByteArray("34AA973CD4C4DAA4F61EEB2BDBAD27316534016F")); } diff --git a/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp b/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp index 80311079d4..d22e771b79 100644 --- a/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp +++ b/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp @@ -74,7 +74,7 @@ void tst_QMargins::getSetCheck() margins.setRight(5); QVERIFY(!margins.isNull()); QCOMPARE(margins, QMargins(5, 0, 5, 0)); -} +} void tst_QMargins::operators() { diff --git a/tests/auto/corelib/tools/qqueue/tst_qqueue.cpp b/tests/auto/corelib/tools/qqueue/tst_qqueue.cpp index 88de03e4bf..2fdde3c613 100644 --- a/tests/auto/corelib/tools/qqueue/tst_qqueue.cpp +++ b/tests/auto/corelib/tools/qqueue/tst_qqueue.cpp @@ -63,15 +63,15 @@ void tst_QQueue::enqueue_dequeue_data() void tst_QQueue::enqueue_dequeue() { - QFETCH(int, num_items); - - int *values = new int[num_items]; - QQueue<int> queue_v; - QQueue<int*> queue_p; + QFETCH(int, num_items); + + int *values = new int[num_items]; + QQueue<int> queue_v; + QQueue<int*> queue_p; QVERIFY(queue_v.empty()); QVERIFY(queue_p.empty()); - + for (int i = 0; i < num_items; i++ ) { values[i] = i; queue_p.enqueue(values + i); @@ -84,11 +84,11 @@ void tst_QQueue::enqueue_dequeue() v = queue_v.head(); p = queue_p.head(); QCOMPARE(*p, v); - QCOMPARE(v, i); + QCOMPARE(v, i); v = queue_v.dequeue(); p = queue_p.dequeue(); - QCOMPARE(*p, v); - QCOMPARE(v, values[i]); + QCOMPARE(*p, v); + QCOMPARE(v, values[i]); } QVERIFY(queue_v.empty()); QVERIFY(queue_p.empty()); diff --git a/tests/auto/corelib/tools/qsharedpointer/externaltests.pri b/tests/auto/corelib/tools/qsharedpointer/externaltests.pri index 10d30e3c76..b3a01f7990 100644 --- a/tests/auto/corelib/tools/qsharedpointer/externaltests.pri +++ b/tests/auto/corelib/tools/qsharedpointer/externaltests.pri @@ -4,4 +4,4 @@ cleanedQMAKESPEC = $$replace(QMAKESPEC, \\\\, /) DEFINES += DEFAULT_MAKESPEC=\\\"$$cleanedQMAKESPEC\\\" cross_compile:DEFINES += QTEST_NO_RTTI QTEST_CROSS_COMPILED -wince*:DEFINES += QTEST_CROSS_COMPILED QTEST_NO_RTTI +wince*:DEFINES += QTEST_CROSS_COMPILED QTEST_NO_RTTI |