1 files changed, 7 insertions, 108 deletions

diff --git a/tests/auto/corelib/tools/qhash/tst_qhash.cpp b/tests/auto/corelib/tools/qhash/tst_qhash.cpp
index a1fc50fb38..6ea33fb37f 100644
--- a/tests/auto/corelib/tools/qhash/tst_qhash.cpp
+++ b/tests/auto/corelib/tools/qhash/tst_qhash.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -57,8 +57,6 @@ private slots:
     void operator_eq(); // copied from tst_QMap
     void rehash_isnt_quadratic();
     void dont_need_default_constructor();
-    void qhash();
-    void fp_qhash_of_zero_is_zero();
     void qmultihash_specific();
 
     void compare();
@@ -70,9 +68,6 @@ private slots:
     void const_shared_null();
     void twoArguments_qHash();
     void initializerList();
-
-    void qthash_data();
-    void qthash();
     void eraseValidIteratorOnSharedHash();
 };
 
@@ -1009,83 +1004,6 @@ void tst_QHash::dont_need_default_constructor()
     }
 }
 
-void tst_QHash::qhash()
-{
-    {
-        QBitArray a1;
-        QBitArray a2;
-        QVERIFY(qHash(a1) == 0);
-
-        a1.resize(1);
-        a1.setBit(0, true);
-
-        a2.resize(1);
-        a2.setBit(0, false);
-
-        uint h1 = qHash(a1);
-        uint h2 = qHash(a2);
-
-        QVERIFY(h1 != h2);
-
-        a2.setBit(0, true);
-        QVERIFY(h1 == qHash(a2));
-
-        a1.fill(true, 8);
-        a1.resize(7);
-
-        h1 = qHash(a1);
-
-        a2.fill(true, 7);
-        h2 = qHash(a2);
-
-        QVERIFY(h1 == h2);
-
-        a2.setBit(0, false);
-        uint h3 = qHash(a2);
-        QVERIFY(h2 != h3);
-
-        a2.setBit(0, true);
-        QVERIFY(h2 == qHash(a2));
-
-        a2.setBit(6, false);
-        uint h4 = qHash(a2);
-        QVERIFY(h2 != h4);
-
-        a2.setBit(6, true);
-        QVERIFY(h2 == qHash(a2));
-
-        QVERIFY(h3 != h4);
-    }
-
-    {
-        QPair<int, int> p12(1, 2);
-        QPair<int, int> p21(2, 1);
-
-        QVERIFY(qHash(p12) == qHash(p12));
-        QVERIFY(qHash(p21) == qHash(p21));
-        QVERIFY(qHash(p12) != qHash(p21));
-
-        QPair<int, int> pA(0x12345678, 0x12345678);
-        QPair<int, int> pB(0x12345675, 0x12345675);
-
-        QVERIFY(qHash(pA) != qHash(pB));
-    }
-}
-
-void tst_QHash::fp_qhash_of_zero_is_zero()
-{
-    QCOMPARE(qHash(-0.0f), 0U);
-    QCOMPARE(qHash( 0.0f), 0U);
-
-    QCOMPARE(qHash(-0.0 ), 0U);
-    QCOMPARE(qHash( 0.0 ), 0U);
-
-#ifndef Q_OS_DARWIN
-    QCOMPARE(qHash(-0.0L), 0U);
-    QCOMPARE(qHash( 0.0L), 0U);
-#endif
-}
-
 void tst_QHash::qmultihash_specific()
 {
     QMultiHash<int, int> hash1;
@@ -1384,25 +1302,6 @@ void tst_QHash::initializerList()
 #endif
 }
 
-void tst_QHash::qthash_data()
-{
-    QTest::addColumn<QString>("key");
-    QTest::addColumn<uint>("hash");
-
-    QTest::newRow("null") << QString() << 0u;
-    QTest::newRow("empty") << QStringLiteral("") << 0u;
-    QTest::newRow("abcdef") << QStringLiteral("abcdef") << 108567222u;
-    QTest::newRow("tqbfjotld") << QStringLiteral("The quick brown fox jumps over the lazy dog") << 140865879u;
-    QTest::newRow("42") << QStringLiteral("42") << 882u;
-}
-
-void tst_QHash::qthash()
-{
-    QFETCH(QString, key);
-    const uint result = qt_hash(key);
-    QTEST(result, "hash");
-}
-
 void tst_QHash::eraseValidIteratorOnSharedHash()
 {
     QHash<int, int> a, b;