From 89737a22218d8af1ce40b42c9119e243c76a90d1 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Fri, 17 May 2024 14:52:52 +0200
Subject: [PATCH] tst_QCryptographicHash: mask a QSKIP in
 addDataAcceptsNullByteArrayView()

We know NumAlgorithms is not supported, so don't print a skipped
warning, by not including that enumerator in the test data in the
first place.

Amends 96dc4acb235f13a72bef7c719d005846fe1d9726.

Change-Id: Ie19f7ebcceb855b9363017c8b2626dae99e23313
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
(cherry picked from commit 00099c057cb584713cb9327738393e1748fc14f6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../tools/qcryptographichash/tst_qcryptographichash.cpp  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
index c08afd67c40..447dca309b1 100644
--- a/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
+++ b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
@@ -29,9 +29,9 @@ private slots:
     void blake2();
     void files_data();
     void files();
-    void hashLength_data();
+    void hashLength_data() { all_methods(true); }
     void hashLength();
-    void addDataAcceptsNullByteArrayView_data() { hashLength_data(); }
+    void addDataAcceptsNullByteArrayView_data() { all_methods(false); }
     void addDataAcceptsNullByteArrayView();
     void move();
     void swap();
@@ -40,6 +40,7 @@ private slots:
     void moreThan4GiBOfData();
     void keccakBufferOverflow();
 private:
+    void all_methods(bool includingNumAlgorithms) const;
     void ensureLargeData();
     std::vector<char> large;
 };
@@ -474,12 +475,14 @@ void tst_QCryptographicHash::files()
     }
 }
 
-void tst_QCryptographicHash::hashLength_data()
+void tst_QCryptographicHash::all_methods(bool inclNumAlgos) const
 {
     QTest::addColumn<QCryptographicHash::Algorithm>("algorithm");
     auto metaEnum = QMetaEnum::fromType<QCryptographicHash::Algorithm>();
     for (int i = 0, value = metaEnum.value(i); value != -1; value = metaEnum.value(++i)) {
         auto algorithm = QCryptographicHash::Algorithm(value);
+        if (!inclNumAlgos && algorithm == QCryptographicHash::Algorithm::NumAlgorithms)
+            continue;
         QTest::addRow("%s", metaEnum.key(i)) << algorithm;
     }
 }