diff options
author | Rym Bouabid <rym.bouabid@qt.io> | 2024-02-13 18:22:06 +0100 |
---|---|---|
committer | Rym Bouabid <rym.bouabid@qt.io> | 2024-02-22 13:37:41 +0100 |
commit | 22ebe86f1511f7f06031df1da030b78c1e8092c9 (patch) | |
tree | 0ed3790749530366d0a129c7eeb4dd3f2dacd42a /tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp | |
parent | 14b058048247098ba4d81427290f2a083d513dc2 (diff) |
QProcessEnvironment: Use new comparison helper macros
QProcessEnvironment had operator==() and operator!=() defined as public
member functions, so use QT_CORE_REMOVED_SINCE and removed_api.cpp to
get rid of these methods and replace them with a hidden friend.
Use QT_TEST_ALL_EQUALITY_OPS macro in unit-tests.
Use new \compares command in the documentation to describe the
comparison operators provided by QProcessEnvironment.
Task-number: QTBUG-120303
Change-Id: I4c57f6cfb9589e82a37eea6993e079212b34cecd
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp')
-rw-r--r-- | tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp b/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp index 27a1ec0bbb..6a2a3daaa2 100644 --- a/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp +++ b/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QTest> +#include <QtTest/private/qcomparisontesthelper_p.h> #include <QObject> #include <QProcessEnvironment> @@ -9,6 +10,7 @@ class tst_QProcessEnvironment: public QObject { Q_OBJECT private slots: + void compareCompiles(); void operator_eq(); void clearAndIsEmpty(); void clearAndInheritsFromParent(); @@ -23,6 +25,11 @@ private slots: void putenv(); }; +void tst_QProcessEnvironment::compareCompiles() +{ + QTestPrivate::testEqualityOperatorsCompile<QProcessEnvironment>(); +} + void tst_QProcessEnvironment::operator_eq() { QProcessEnvironment e1; @@ -35,8 +42,7 @@ void tst_QProcessEnvironment::operator_eq() QCOMPARE(e1, e2); auto parentEnv = QProcessEnvironment(QProcessEnvironment::InheritFromParent); - QVERIFY(parentEnv != e2); - QVERIFY(e2 != parentEnv); + QT_TEST_EQUALITY_OPS(parentEnv, e2, false); e1.clear(); QCOMPARE(e1, e2); @@ -45,16 +51,15 @@ void tst_QProcessEnvironment::operator_eq() QCOMPARE(e1, e2); e1.insert("FOO", "bar"); - QVERIFY(e1 != e2); + QT_TEST_EQUALITY_OPS(e1, e2, false); e2.insert("FOO", "bar"); QCOMPARE(e1, e2); e2.insert("FOO", "baz"); - QVERIFY(e1 != e2); + QT_TEST_EQUALITY_OPS(e1, e2, false); - QVERIFY(e2 != parentEnv); - QVERIFY(parentEnv != e2); + QT_TEST_EQUALITY_OPS(e2, parentEnv, false); } void tst_QProcessEnvironment::clearAndIsEmpty() |