1 files changed, 25 insertions, 3 deletions
diff --git a/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
index c08afd67c4..47e0ead270 100644
--- a/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
+++ b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
@@ -20,6 +20,8 @@ private slots:
     void repeated_result();
     void intermediary_result_data();
     void intermediary_result();
+    void static_hash_data() { intermediary_result_data(); }
+    void static_hash();
     void sha1();
     void sha3_data();
     void sha3();
@@ -29,9 +31,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 +42,7 @@ private slots:
     void moreThan4GiBOfData();
     void keccakBufferOverflow();
 private:
+    void all_methods(bool includingNumAlgorithms) const;
     void ensureLargeData();
     std::vector<char> large;
 };
@@ -197,6 +200,20 @@ void tst_QCryptographicHash::intermediary_result()
     hash.reset();
 }
 
+void tst_QCryptographicHash::static_hash()
+{
+    QFETCH(const int, algo);
+    QFETCH(const QByteArray, first);
+    QFETCH(const QByteArray, hash_first);
+
+    const auto _algo = QCryptographicHash::Algorithm(algo);
+
+    QCOMPARE(QCryptographicHash::hash(first, _algo), hash_first);
+
+    std::byte buffer[1024];
+    QCOMPARE(QCryptographicHash::hashInto(buffer, first, _algo), hash_first);
+}
+
 
 void tst_QCryptographicHash::sha1()
 {
@@ -474,12 +491,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;
     }
 }
@@ -495,6 +514,9 @@ void tst_QCryptographicHash::hashLength()
         expectedSize = 0;
     } else {
         expectedSize = QCryptographicHash::hash("test", algorithm).size();
+
+        std::byte buffer[1024];
+        QCOMPARE(QCryptographicHash::hashInto(buffer, "foo", algorithm).size(), expectedSize);
     }
     QCOMPARE(QCryptographicHash::hashLength(algorithm), expectedSize);
 }