From d7506697c86de38b05ec114e86164567f02fa62b Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Sat, 5 Apr 2025 18:08:56 -0400
Subject: [PATCH] refactor: port ServerArgsTests to QtTests

---
 src/test/mock/deskflow/MockArgParser.h        | 24 ------
 .../deskflow/ServerArgsParsingTests.cpp       | 74 -------------------
 src/unittests/deskflow/ArgParserTests.cpp     | 31 ++++++++
 src/unittests/deskflow/ArgParserTests.h       |  3 +
 4 files changed, 34 insertions(+), 98 deletions(-)
 delete mode 100644 src/test/mock/deskflow/MockArgParser.h
 delete mode 100644 src/test/unittests/deskflow/ServerArgsParsingTests.cpp

diff --git a/src/test/mock/deskflow/MockArgParser.h b/src/test/mock/deskflow/MockArgParser.h
deleted file mode 100644
index c223bb369..000000000
--- a/src/test/mock/deskflow/MockArgParser.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2014 - 2016 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#pragma once
-
-#define TEST_ENV
-
-#include "deskflow/ArgParser.h"
-
-#include <gmock/gmock.h>
-
-class MockArgParser : public ArgParser
-{
-public:
-  MockArgParser() : ArgParser(nullptr)
-  {
-  }
-
-  MOCK_METHOD(bool, parseGenericArgs, (int, const char *const *, int &));
-  MOCK_METHOD(bool, checkUnexpectedArgs, ());
-};
diff --git a/src/test/unittests/deskflow/ServerArgsParsingTests.cpp b/src/test/unittests/deskflow/ServerArgsParsingTests.cpp
deleted file mode 100644
index eaea0f6cb..000000000
--- a/src/test/unittests/deskflow/ServerArgsParsingTests.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2014 - 2016 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "deskflow/ArgParser.h"
-#include "deskflow/ServerArgs.h"
-#include "test/mock/deskflow/MockArgParser.h"
-
-#include <array>
-#include <gtest/gtest.h>
-
-using ::testing::_;
-using ::testing::Invoke;
-using ::testing::NiceMock;
-
-bool server_stubParseGenericArgs(int, const char *const *, int &)
-{
-  return false;
-}
-
-bool server_stubCheckUnexpectedArgs()
-{
-  return false;
-}
-
-TEST(ServerArgs, ServerArgs_will_construct_from_copy)
-{
-  deskflow::ServerArgs serverArgs;
-  serverArgs.m_display = "display0";
-  deskflow::ServerArgs serverArgs2{serverArgs};
-  EXPECT_EQ(serverArgs.m_display, serverArgs2.m_display);
-}
-
-TEST(ServerArgsParsingTests, parseServerArgs_addressArg_setDeskflowAddress)
-{
-  NiceMock<MockArgParser> argParser;
-  ON_CALL(argParser, parseGenericArgs(_, _, _)).WillByDefault(Invoke(server_stubParseGenericArgs));
-  ON_CALL(argParser, checkUnexpectedArgs()).WillByDefault(Invoke(server_stubCheckUnexpectedArgs));
-  deskflow::ServerArgs serverArgs;
-  const int argc = 3;
-  const char *kAddressCmd[argc] = {"stub", "--address", "mock_address"};
-
-  argParser.parseServerArgs(serverArgs, argc, kAddressCmd);
-
-  EXPECT_EQ("mock_address", serverArgs.m_deskflowAddress);
-}
-
-TEST(ServerArgsParsingTests, parseServerArgs_configArg_setConfigFile)
-{
-  NiceMock<MockArgParser> argParser;
-  ON_CALL(argParser, parseGenericArgs(_, _, _)).WillByDefault(Invoke(server_stubParseGenericArgs));
-  ON_CALL(argParser, checkUnexpectedArgs()).WillByDefault(Invoke(server_stubCheckUnexpectedArgs));
-  deskflow::ServerArgs serverArgs;
-  const int argc = 3;
-  const char *kConfigCmd[argc] = {"stub", "--config", "mock_configFile"};
-
-  argParser.parseServerArgs(serverArgs, argc, kConfigCmd);
-
-  EXPECT_EQ("mock_configFile", serverArgs.m_configFile);
-}
-
-TEST(ServerArgsParsingTests, parseServerArgs_checkUnexpectedParams)
-{
-  NiceMock<MockArgParser> argParser;
-  ON_CALL(argParser, parseGenericArgs(_, _, _)).WillByDefault(Invoke(server_stubParseGenericArgs));
-  ON_CALL(argParser, checkUnexpectedArgs()).WillByDefault(Invoke(server_stubCheckUnexpectedArgs));
-  deskflow::ServerArgs serverArgs;
-  const int argc = 2;
-  std::array<const char *, argc> kUnknownCmd = {"stub", "--unknown"};
-
-  EXPECT_FALSE(argParser.parseServerArgs(serverArgs, argc, kUnknownCmd.data()));
-}
diff --git a/src/unittests/deskflow/ArgParserTests.cpp b/src/unittests/deskflow/ArgParserTests.cpp
index 5cf60ddce..dd6b6a099 100644
--- a/src/unittests/deskflow/ArgParserTests.cpp
+++ b/src/unittests/deskflow/ArgParserTests.cpp
@@ -160,6 +160,37 @@ void ArgParserTests::assembleCommand()
   QCOMPARE(command, "\"stub1 space\" stub2 \"stub3 space\"");
 }
 
+void ArgParserTests::server_setAddress()
+{
+  deskflow::ServerArgs serverArgs;
+  const int argc = 3;
+  const char *kAddressCmd[argc] = {"stub", "--address", "mock_address"};
+
+  m_parser.parseServerArgs(serverArgs, argc, kAddressCmd);
+
+  QCOMPARE(serverArgs.m_deskflowAddress, "mock_address");
+}
+
+void ArgParserTests::server_setConfigFile()
+{
+  deskflow::ServerArgs serverArgs;
+  const int argc = 3;
+  const char *kConfigCmd[argc] = {"stub", "--config", "mock_configFile"};
+
+  m_parser.parseServerArgs(serverArgs, argc, kConfigCmd);
+
+  QCOMPARE(serverArgs.m_configFile, "mock_configFile");
+}
+
+void ArgParserTests::server_unexpectedParam()
+{
+  deskflow::ServerArgs serverArgs;
+  const int argc = 2;
+  std::array<const char *, argc> kUnknownCmd = {"stub", "--unknown"};
+
+  QVERIFY(!m_parser.parseServerArgs(serverArgs, argc, kUnknownCmd.data()));
+}
+
 void ArgParserTests::serverArgs()
 {
   deskflow::ServerArgs args;
diff --git a/src/unittests/deskflow/ArgParserTests.h b/src/unittests/deskflow/ArgParserTests.h
index b72bfdaf8..155255a9a 100644
--- a/src/unittests/deskflow/ArgParserTests.h
+++ b/src/unittests/deskflow/ArgParserTests.h
@@ -23,6 +23,9 @@ private slots:
   void getArgv();
   void assembleCommand();
   void serverArgs();
+  void server_setAddress();
+  void server_setConfigFile();
+  void server_unexpectedParam();
   void clientArgs();
   void client_yScroll();
   void client_setLangSync();