diff options
Diffstat (limited to 'tests/auto/corelib/tools')
-rw-r--r-- | tests/auto/corelib/tools/qhash/tst_qhash.cpp | 26 | ||||
-rw-r--r-- | tests/auto/corelib/tools/qmap/tst_qmap.cpp | 19 |
2 files changed, 0 insertions, 45 deletions
diff --git a/tests/auto/corelib/tools/qhash/tst_qhash.cpp b/tests/auto/corelib/tools/qhash/tst_qhash.cpp index fc669628b5..277171124c 100644 --- a/tests/auto/corelib/tools/qhash/tst_qhash.cpp +++ b/tests/auto/corelib/tools/qhash/tst_qhash.cpp @@ -935,32 +935,6 @@ void tst_QHash::iterators() QVERIFY(javaIt.value() == testMap.value(i)); } - /* - I've removed findNextKey() and findPreviousKey() from the API - for Qt 4.0 beta 1. - */ - -#if 0 - //findPreviousKey() findNextKey() - for(i = 1; i < 100; ++i) { - if(javaIt.findNextKey(i)) - QVERIFY(javaIt.value() == testString.arg(i)); - else { - QVERIFY(!javaIt.hasNext()); - QVERIFY(javaIt.findPreviousKey(i)); - QVERIFY(javaIt.value() == testString.arg(i)); - } - - if(javaIt.findPreviousKey(i)) - QVERIFY(javaIt.value() == testString.arg(i)); - else { - QVERIFY(!javaIt.hasPrevious()); - QVERIFY(javaIt.findNextKey(i)); - QVERIFY(javaIt.value() == testString.arg(i)); - } - } -#endif - //peekNext() peekPrevious() javaIt.toFront(); javaIt.next(); diff --git a/tests/auto/corelib/tools/qmap/tst_qmap.cpp b/tests/auto/corelib/tools/qmap/tst_qmap.cpp index 2b4cbe9b66..e6e8466aa2 100644 --- a/tests/auto/corelib/tools/qmap/tst_qmap.cpp +++ b/tests/auto/corelib/tools/qmap/tst_qmap.cpp @@ -713,31 +713,12 @@ void tst_QMap::iterators() QVERIFY(javaIt.value() == testString.arg(i)); } - /* - I've removed findNextKey() and findPreviousKey() from the API - for Qt 4.0 beta 1. - */ - -#if 0 - QVERIFY(javaIt.findNextKey(50)); - QVERIFY(javaIt.value() == "Teststring 50"); -#endif - i = 51; while(javaIt.hasPrevious()) { --i; javaIt.previous(); QVERIFY(javaIt.value() == testString.arg(i)); } - -#if 0 - QVERIFY(javaIt.findNextKey(50)); - QVERIFY(javaIt.value() == "Teststring 50"); - - QVERIFY(javaIt.hasPrevious()); - QVERIFY(javaIt.findPreviousKey(20)); - QCOMPARE(javaIt.value(), QString("Teststring 20")); -#endif } void tst_QMap::keys_values_uniqueKeys() |