From 30d9034a0f1e72b8b093f9d86bb277a129c5a476 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sat, 5 Apr 2025 17:30:42 -0400 Subject: [PATCH] refactor: port DeprecatedArgsTests to QtTests --- .../deskflow/DeprecatedArgsParsingTests.cpp | 39 ------------------- src/unittests/deskflow/ArgParserTests.cpp | 20 ++++++++++ src/unittests/deskflow/ArgParserTests.h | 2 + 3 files changed, 22 insertions(+), 39 deletions(-) delete mode 100644 src/test/unittests/deskflow/DeprecatedArgsParsingTests.cpp diff --git a/src/test/unittests/deskflow/DeprecatedArgsParsingTests.cpp b/src/test/unittests/deskflow/DeprecatedArgsParsingTests.cpp deleted file mode 100644 index b86dc7dec..000000000 --- a/src/test/unittests/deskflow/DeprecatedArgsParsingTests.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Deskflow -- mouse and keyboard sharing utility - * SPDX-FileCopyrightText: (C) 2015 - 2016 Symless Ltd. - * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception - */ - -#include "deskflow/ArgParser.h" - -#include - -using namespace deskflow; - -TEST(DeprecatedArgsParsingTests, parseDeprecatedArgs_cryptoPass_returnTrue) -{ - int i = 1; - const int argc = 3; - const char *kCryptoPassCmd[argc] = {"stub", "--crypto-pass", "mock_pass"}; - - ArgParser argParser(nullptr); - - bool result = argParser.parseDeprecatedArgs(argc, kCryptoPassCmd, i); - - EXPECT_EQ(true, result); - EXPECT_EQ(2, i); -} - -TEST(DeprecatedArgsParsingTests, parseDeprecatedArgs_cryptoPass_returnFalse) -{ - int i = 1; - const int argc = 3; - const char *kCryptoPassCmd[argc] = {"stub", "--mock-arg", "mock_value"}; - - ArgParser argParser(nullptr); - - bool result = argParser.parseDeprecatedArgs(argc, kCryptoPassCmd, i); - - EXPECT_FALSE(result); - EXPECT_EQ(1, i); -} diff --git a/src/unittests/deskflow/ArgParserTests.cpp b/src/unittests/deskflow/ArgParserTests.cpp index cc9ff35ef..75146aab2 100644 --- a/src/unittests/deskflow/ArgParserTests.cpp +++ b/src/unittests/deskflow/ArgParserTests.cpp @@ -199,4 +199,24 @@ void ArgParserTests::clientArgs() QVERIFY(args.m_shouldExitOk); } +void ArgParserTests::deprecatedArg_crypoPass_true() +{ + int i = 1; + const int argc = 3; + const char *kCryptoPassCmd[argc] = {"stub", "--crypto-pass", "mock_pass"}; + + QVERIFY(m_parser.parseDeprecatedArgs(argc, kCryptoPassCmd, i)); + QCOMPARE(i, 2); +} + +void ArgParserTests::deprecatedArg_crypoPass_false() +{ + int i = 1; + const int argc = 3; + const char *kCryptoPassCmd[argc] = {"stub", "--mock-arg", "mock_value"}; + + QVERIFY(!m_parser.parseDeprecatedArgs(argc, kCryptoPassCmd, i)); + QCOMPARE(i, 1); +} + QTEST_MAIN(ArgParserTests) diff --git a/src/unittests/deskflow/ArgParserTests.h b/src/unittests/deskflow/ArgParserTests.h index e1d14967a..5836a9a7f 100644 --- a/src/unittests/deskflow/ArgParserTests.h +++ b/src/unittests/deskflow/ArgParserTests.h @@ -24,6 +24,8 @@ private slots: void assembleCommand(); void serverArgs(); void clientArgs(); + void deprecatedArg_crypoPass_true(); + void deprecatedArg_crypoPass_false(); private: Arch m_arch;