From d2546c4daf8cc57d25521d1d60148248493162fd Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 5 Jul 2021 09:37:40 +0200 Subject: tst_QCryptographicHash: make hashLength() data-driven Change-Id: I44bf73e15b53b8d93d116f4114bc667c4c94b7b4 Reviewed-by: Edward Welbourne Reviewed-by: Giuseppe D'Angelo (cherry picked from commit 09d0fc068d4b32aa9cd00d38171e62fddf82c83a) Reviewed-by: Qt Cherry-pick Bot --- .../tools/qcryptographichash/tst_qcryptographichash.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp index ca4a6f7354..c819f02d70 100644 --- a/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp +++ b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp @@ -49,6 +49,7 @@ private slots: void blake2(); void files_data(); void files(); + void hashLength_data(); void hashLength(); }; @@ -400,15 +401,23 @@ void tst_QCryptographicHash::files() } } -void tst_QCryptographicHash::hashLength() +void tst_QCryptographicHash::hashLength_data() { + QTest::addColumn("algorithm"); auto metaEnum = QMetaEnum::fromType(); for (int i = 0, value = metaEnum.value(i); value != -1; value = metaEnum.value(++i)) { auto algorithm = QCryptographicHash::Algorithm(value); - QByteArray output = QCryptographicHash::hash(QByteArrayLiteral("test"), algorithm); - QCOMPARE(QCryptographicHash::hashLength(algorithm), output.length()); + QTest::addRow("%s", metaEnum.valueToKey(value)) << algorithm; } } +void tst_QCryptographicHash::hashLength() +{ + QFETCH(const QCryptographicHash::Algorithm, algorithm); + + QByteArray output = QCryptographicHash::hash(QByteArrayLiteral("test"), algorithm); + QCOMPARE(QCryptographicHash::hashLength(algorithm), output.length()); +} + QTEST_MAIN(tst_QCryptographicHash) #include "tst_qcryptographichash.moc" -- cgit v1.2.3