From e512125595d25f8611824bc5397ee23eb8246b83 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Tue, 8 Apr 2025 18:04:21 -0400 Subject: [PATCH] refactor: port net/SecureUtilsTest to QtTests --- src/unittests/net/CMakeLists.txt | 8 ++++++++ .../unittests/net/SecureUtilsTests.cpp | 16 ++++++++++------ src/unittests/net/SecureUtilsTests.h | 15 +++++++++++++++ 3 files changed, 33 insertions(+), 6 deletions(-) rename src/{test => }/unittests/net/SecureUtilsTests.cpp (89%) create mode 100644 src/unittests/net/SecureUtilsTests.h diff --git a/src/unittests/net/CMakeLists.txt b/src/unittests/net/CMakeLists.txt index 90c3072eb..720dd4c50 100644 --- a/src/unittests/net/CMakeLists.txt +++ b/src/unittests/net/CMakeLists.txt @@ -5,6 +5,14 @@ if(WIN32) set(extra_libs version) endif() +create_test( + NAME SecureUtilsTests + DEPENDS net + LIBS base arch mt io ${extra_libs} + SOURCE SecureUtilsTests.cpp + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/lib/net" +) + create_test( NAME FingerprintDatabaseTests DEPENDS net diff --git a/src/test/unittests/net/SecureUtilsTests.cpp b/src/unittests/net/SecureUtilsTests.cpp similarity index 89% rename from src/test/unittests/net/SecureUtilsTests.cpp rename to src/unittests/net/SecureUtilsTests.cpp index 1e9fde493..223d8625b 100644 --- a/src/test/unittests/net/SecureUtilsTests.cpp +++ b/src/unittests/net/SecureUtilsTests.cpp @@ -5,26 +5,28 @@ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception */ -#include "net/SecureUtils.h" +#include "SecureUtilsTests.h" -#include +#include "../../lib/net/SecureUtils.h" -TEST(SecureUtilsTest, formatSSLFingerprints_fromHex_withSeperators) +using namespace deskflow; + +void SecureUtilsTests::checkHex() { std::vector fingerprint = {40, 253, 10, 152, 138, 14, 161, 108, 215, 232, 108, 167, 238, 88, 65, 113, 202, 178, 142, 73, 37, 148, 144, 37, 38, 5, 141, 175, 99, 237, 46, 48}; - ASSERT_EQ( + QCOMPARE( deskflow::formatSSLFingerprint(fingerprint, true), "28:FD:0A:98:8A:0E:A1:6C:D7:E8:6C:A7:EE:58:41:71:CA:B2:8E:49:25:94:90:25:26:05:8D:AF:63:ED:2E:30" ); } -TEST(SecureUtilsTest, createFingerprintArt) +void SecureUtilsTests::checkArt() { std::vector fingerprint = {40, 253, 10, 152, 138, 14, 161, 108, 215, 232, 108, 167, 238, 88, 65, 113, 202, 178, 142, 73, 37, 148, 144, 37, 38, 5, 141, 175, 99, 237, 46, 48}; - ASSERT_EQ( + QCOMPARE( deskflow::generateFingerprintArt(fingerprint), "╔═════════════════╗\n" "║*X+. . ║\n" "║*oo + ║\n" @@ -38,3 +40,5 @@ TEST(SecureUtilsTest, createFingerprintArt) "╚═════════════════╝" ); } + +QTEST_MAIN(SecureUtilsTests) diff --git a/src/unittests/net/SecureUtilsTests.h b/src/unittests/net/SecureUtilsTests.h new file mode 100644 index 000000000..1ac5eaa45 --- /dev/null +++ b/src/unittests/net/SecureUtilsTests.h @@ -0,0 +1,15 @@ +/* + * Deskflow -- mouse and keyboard sharing utility + * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello + * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception + */ + +#include + +class SecureUtilsTests : public QObject +{ + Q_OBJECT +private slots: + void checkHex(); + void checkArt(); +};