2 files changed, 28 insertions, 14 deletions
diff --git a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt
index d612a32374..02c6909031 100644
--- a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt
@@ -1,10 +1,19 @@
-# Generated from qprocessenvironment.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qprocessenvironment Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qprocessenvironment LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qprocessenvironment
     SOURCES
         tst_qprocessenvironment.cpp
+    LIBRARIES
+        Qt::TestPrivate
 )
diff --git a/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp b/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp
index 32a12c30bd..6a2a3daaa2 100644
--- a/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp
+++ b/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp
@@ -1,7 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// 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()
@@ -130,7 +135,7 @@ void tst_QProcessEnvironment::toStringList()
     e.insert("FOO", "bar");
     QStringList result = e.toStringList();
     QVERIFY(!result.isEmpty());
-    QCOMPARE(result.length(), 1);
+    QCOMPARE(result.size(), 1);
     QCOMPARE(result.at(0), QString("FOO=bar"));
 
     e.clear();
@@ -142,7 +147,7 @@ void tst_QProcessEnvironment::toStringList()
     e.insert("A", "bc");
     e.insert("HELLO", "World");
     result = e.toStringList();
-    QCOMPARE(result.length(), 4);
+    QCOMPARE(result.size(), 4);
 
     // order is not specified, so use contains()
     QVERIFY(result.contains("FOO=bar"));
@@ -159,7 +164,7 @@ void tst_QProcessEnvironment::keys()
 
     e.insert("FOO", "bar");
     QStringList result = e.keys();
-    QCOMPARE(result.length(), 1);
+    QCOMPARE(result.size(), 1);
     QCOMPARE(result.at(0), QString("FOO"));
 
     e.clear();
@@ -171,7 +176,7 @@ void tst_QProcessEnvironment::keys()
     e.insert("A", "bc");
     e.insert("HELLO", "World");
     result = e.keys();
-    QCOMPARE(result.length(), 4);
+    QCOMPARE(result.size(), 4);
 
     // order is not specified, so use contains()
     QVERIFY(result.contains("FOO"));
@@ -194,7 +199,7 @@ void tst_QProcessEnvironment::insertEnv()
 
     e.insert(e2);
     QStringList keys = e.keys();
-    QCOMPARE(keys.length(), 5);
+    QCOMPARE(keys.size(), 5);
 
     QCOMPARE(e.value("FOO"), QString("bar"));
     QCOMPARE(e.value("A"), QString("bc"));
@@ -244,7 +249,7 @@ void tst_QProcessEnvironment::caseSensitivity()
     QCOMPARE(e.value("foo"), QString("bar"));
 
     QStringList list = e.toStringList();
-    QCOMPARE(list.length(), 2);
+    QCOMPARE(list.size(), 2);
     QVERIFY(list.contains("foo=bar"));
     QVERIFY(list.contains("FOO=baz"));
 #endif