summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-07-20 13:37:58 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2020-08-14 09:59:36 +0200
commit9ee554ac1d1af97e7ad5b4bf78e2779f7d1c405f (patch)
treec40e65aa3b2f7d02c32b592855c8c03252909c2b /tests/auto
parentff555d89650f5cea72365e12fb2b71be9e25b89d (diff)
qglobal.h: remove deprecated global functions
Since 5.0 - qMalloc(), qFree(), qRealloc(), qMemCopy(), qMemSet() Since 5.15 - qsrand(), qrand() Change-Id: I74fa3d17b05521271c3dc563fc85a5b133289ce3 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/corelib/global/CMakeLists.txt1
-rw-r--r--tests/auto/corelib/global/global.pro1
-rw-r--r--tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp2
-rw-r--r--tests/auto/corelib/global/qrand/.gitignore1
-rw-r--r--tests/auto/corelib/global/qrand/CMakeLists.txt10
-rw-r--r--tests/auto/corelib/global/qrand/qrand.pro4
-rw-r--r--tests/auto/corelib/global/qrand/tst_qrand.cpp76
7 files changed, 1 insertions, 94 deletions
diff --git a/tests/auto/corelib/global/CMakeLists.txt b/tests/auto/corelib/global/CMakeLists.txt
index 8f1a8171ea..29c696e121 100644
--- a/tests/auto/corelib/global/CMakeLists.txt
+++ b/tests/auto/corelib/global/CMakeLists.txt
@@ -6,7 +6,6 @@ add_subdirectory(qgetputenv)
add_subdirectory(qglobal)
add_subdirectory(qnumeric)
add_subdirectory(qfloat16)
-add_subdirectory(qrand)
add_subdirectory(qrandomgenerator)
add_subdirectory(qlogging)
add_subdirectory(qtendian)
diff --git a/tests/auto/corelib/global/global.pro b/tests/auto/corelib/global/global.pro
index 0b37bf63cf..8af353728d 100644
--- a/tests/auto/corelib/global/global.pro
+++ b/tests/auto/corelib/global/global.pro
@@ -6,7 +6,6 @@ SUBDIRS=\
qglobal \
qnumeric \
qfloat16 \
- qrand \
qrandomgenerator \
qlogging \
qtendian \
diff --git a/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp b/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp
index 820a0b999b..6b8f634e1f 100644
--- a/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp
+++ b/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp
@@ -185,7 +185,7 @@ void tst_QGlobalStatic::threadStressTest()
void run()
{
QReadLocker l(lock);
- //usleep(qrand() * 200 / RAND_MAX);
+ //usleep(QRandomGenerator::global()->generate(200));
// thundering herd
try {
threadStressTestGS();
diff --git a/tests/auto/corelib/global/qrand/.gitignore b/tests/auto/corelib/global/qrand/.gitignore
deleted file mode 100644
index e8ec2ebfd1..0000000000
--- a/tests/auto/corelib/global/qrand/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-tst_qrand
diff --git a/tests/auto/corelib/global/qrand/CMakeLists.txt b/tests/auto/corelib/global/qrand/CMakeLists.txt
deleted file mode 100644
index 8b1fabfeb8..0000000000
--- a/tests/auto/corelib/global/qrand/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Generated from qrand.pro.
-
-#####################################################################
-## tst_qrand Test:
-#####################################################################
-
-qt_add_test(tst_qrand
- SOURCES
- tst_qrand.cpp
-)
diff --git a/tests/auto/corelib/global/qrand/qrand.pro b/tests/auto/corelib/global/qrand/qrand.pro
deleted file mode 100644
index ee1430aea5..0000000000
--- a/tests/auto/corelib/global/qrand/qrand.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qrand
-QT = core testlib
-SOURCES = tst_qrand.cpp
diff --git a/tests/auto/corelib/global/qrand/tst_qrand.cpp b/tests/auto/corelib/global/qrand/tst_qrand.cpp
deleted file mode 100644
index 279f4e0a34..0000000000
--- a/tests/auto/corelib/global/qrand/tst_qrand.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** 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 The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <QtTest/QtTest>
-
-QT_WARNING_DISABLE_DEPRECATED
-
-class tst_QRand: public QObject
-{
- Q_OBJECT
-private slots:
- void testqrand();
-};
-
-void tst_QRand::testqrand()
-{
- const int numTestValues = 100;
-
- int generatedNumbers[numTestValues];
- bool generatesSameSequence = true;
-
- // test without calling srand() first
- // should give same sequence as with srand(1)
-
- for (int i=0; i<numTestValues; ++i)
- generatedNumbers[i] = qrand();
-
- qsrand(1);
- for (int i=0; i<numTestValues; ++i)
- if (generatedNumbers[i] != qrand())
- generatesSameSequence = false;
-
- QVERIFY(generatesSameSequence);
-
- for (unsigned int seed=1; seed < 10; seed+=100) {
-
- qsrand(seed);
- for (int i=0; i<numTestValues; ++i)
- generatedNumbers[i] = qrand();
-
- qsrand(seed);
- generatesSameSequence = true;
- for (int i=0; i<numTestValues; ++i)
- if (generatedNumbers[i] != qrand())
- generatesSameSequence = false;
-
- QVERIFY(generatesSameSequence);
- }
-}
-
-QTEST_MAIN(tst_QRand)
-#include "tst_qrand.moc"