chore: use lizardbyte-common in c++ (#221)

ReenigneArcher · web-flow · commit 8c12a9aca36a · 2026-06-30T18:23:34.000-04:00
diff --git a/.gitmodules b/.gitmodules
@@ -8,10 +8,6 @@
 	url = https://github.com/FFmpeg/FFmpeg.git
 	branch = release/8.1
 	shallow = true
-[submodule "third-party/googletest"]
-	path = third-party/googletest
-	url = https://github.com/google/googletest.git
-	shallow = true
 [submodule "third-party/lizardbyte-common"]
 	path = third-party/lizardbyte-common
 	url = https://github.com/LizardByte/lizardbyte-common.git
diff --git a/README.md b/README.md
@@ -1,18 +1,28 @@
-# Moonlight-XboxOG
-
-[![GitHub stars](https://img.shields.io/github/stars/lizardbyte/moonlight-xboxog.svg?logo=github&style=for-the-badge)](https://github.com/LizardByte/Moonlight-XboxOG)
-[![GitHub Releases](https://img.shields.io/github/downloads/lizardbyte/moonlight-xboxog/total.svg?style=for-the-badge&logo=github)](https://github.com/LizardByte/Moonlight-XboxOG/releases/latest)
-[![GitHub Workflow Status (CI)](https://img.shields.io/github/actions/workflow/status/lizardbyte/moonlight-xboxog/ci.yml.svg?branch=master&label=CI%20build&logo=github&style=for-the-badge)](https://github.com/LizardByte/Moonlight-XboxOG/actions/workflows/CI.yml?query=branch%3Amaster)
-[![Codecov](https://img.shields.io/codecov/c/gh/LizardByte/Moonlight-XboxOG?token=DoIh5pkEzA&style=for-the-badge&logo=codecov&label=codecov)](https://codecov.io/gh/LizardByte/Moonlight-XboxOG)
-
-Port of Moonlight for the Original Xbox.
+<div align="center">
+  <img
+    src="moonlight-logo.svg"
+    alt="Moonlight icon"
+    width="256"
+  />
+  <h1 align="center">Moonlight-XboxOG</h1>
+  <h4 align="center">Port of Moonlight for the Original Xbox.</h4>
+</div>
+
+<div align="center">
+  <a href="https://github.com/LizardByte/Moonlight-XboxOG"><img src="https://img.shields.io/github/stars/lizardbyte/Moonlight-XboxOG.svg?logo=github&style=for-the-badge" alt="GitHub stars"></a>
+  <a href="https://github.com/LizardByte/Moonlight-XboxOG/actions/workflows/ci.yml?query=branch%3Amaster"><img src="https://img.shields.io/github/actions/workflow/status/lizardbyte/Moonlight-XboxOG/ci.yml.svg?branch=master&label=CI%20build&logo=github&style=for-the-badge" alt="GitHub Workflow Status (CI)"></a>
+  <a href="https://codecov.io/gh/LizardByte/Moonlight-XboxOG"><img src="https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fapp.lizardbyte.dev%2Fdashboard%2Fshields%2Fcodecov%2FMoonlight-XboxOG.json&style=for-the-badge&logo=codecov" alt="Codecov"></a>
+  <a href="https://sonarcloud.io/project/overview?id=Moonlight-XboxOG"><img src="https://img.shields.io/sonar/quality_gate/LizardByte_Moonlight-XboxOG.svg?server=https%3A%2F%2Fsonarcloud.io&style=for-the-badge&logo=sonarqubecloud&label=sonarcloud" alt="SonarCloud"></a>
+</div>
+
+# Overview
 
 ![Splash Screen](./docs/images/screenshots/01-splash.png)
 ![Hosts Screen](./docs/images/screenshots/02-hosts.png)
 ![Apps Screen](./docs/images/screenshots/03-apps.png)
 
 
-## Build
+## 🛠️ Build
 
 ### Prerequisites
 
@@ -195,7 +205,7 @@ scripts\setup-xemu.cmd --skip-support-files
 > You can set Xemu to use widescreen mode by using https://github.com/Ernegien/XboxEepromEditor
 > but 1080i does not work in Xemu.
 
-## Todo
+## 📋 Todo
 
 - Build
    - [x] Build in GitHub CI
diff --git a/docs/Doxyfile b/docs/Doxyfile
@@ -25,6 +25,8 @@
 DOCSET_BUNDLE_ID = dev.lizardbyte.Moonlight-XboxOG
 DOCSET_PUBLISHER_ID = dev.lizardbyte.Moonlight-XboxOG.documentation
 PROJECT_BRIEF = "Moonlight Xbox OG is a port of the Moonlight Game Streaming client to the original Xbox console."
+PROJECT_ICON = ../moonlight-logo.svg
+PROJECT_LOGO = ../moonlight-logo.svg
 PROJECT_NAME = Moonlight-XboxOG
 
 # project specific settings
diff --git a/moonlight-logo.svg b/moonlight-logo.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256">
+  <circle cx="128" cy="128" r="128" fill="#565C64"/>
+  <circle cx="128" cy="128" r="95.5" fill="#FDFDFD"/>
+  <path d="M137.66 132H224V124H137.66L198.71 62.95L193.05 57.29L132 118.34V32H124V118.34L62.95 57.29L57.29 62.95L118.34 124H32V132H118.34L57.29 193.05L62.95 198.71L124 137.66V224H132V137.66L193.05 198.71L198.71 193.05L137.66 132Z" fill="#565C64" fill-rule="evenodd"/>
+</svg>
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -10,11 +10,19 @@ if(NOT DEFINED MOONLIGHT_HOST_TESTABLE_SOURCES)
     message(FATAL_ERROR "tests/CMakeLists.txt must be configured from the top-level CMake project")
 endif()
 
-set(GTEST_SOURCE_DIR "${CMAKE_SOURCE_DIR}/third-party/googletest")
+set(GTEST_SOURCE_DIR "${CMAKE_SOURCE_DIR}/third-party/lizardbyte-common/third-party/googletest")
 set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
 set(INSTALL_GMOCK OFF CACHE BOOL "" FORCE)
 add_subdirectory("${GTEST_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/googletest" EXCLUDE_FROM_ALL)
 
+set(LIZARDBYTE_COMMON_BUILD_TEST_SUPPORT ON CACHE BOOL "Build lizardbyte-common GoogleTest support helpers" FORCE)
+if(NOT TARGET lizardbyte::common)
+    add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/lizardbyte-common"
+                     "${CMAKE_CURRENT_BINARY_DIR}/lizardbyte-common"
+                     EXCLUDE_FROM_ALL)
+elseif(NOT TARGET lizardbyte::test_support)
+    message(FATAL_ERROR "Moonlight tests require lizardbyte::test_support")
+endif()
 if(NOT TARGET moonlight-common-c OR NOT TARGET Moonlight::OpenSSL)
     message(FATAL_ERROR
             "tests/CMakeLists.txt requires the shared Moonlight dependency targets from the top-level configure")
@@ -52,7 +60,8 @@ target_include_directories(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME}
         PRIVATE
         gtest_main
-        Moonlight::OpenSSL)
+        Moonlight::OpenSSL
+        lizardbyte::test_support)
 target_compile_definitions(${PROJECT_NAME}
         PRIVATE
         TOML_EXCEPTIONS=0
diff --git a/tests/unit/app/client_state_test.cpp b/tests/unit/app/client_state_test.cpp
@@ -6,7 +6,7 @@
 #include "src/app/client_state.h"
 
 // lib includes
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 #include <string>
 
 // test includes
diff --git a/tests/unit/app/host_records_test.cpp b/tests/unit/app/host_records_test.cpp
@@ -9,7 +9,7 @@
 #include <vector>
 
 // lib includes
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 
 // test includes
 #include "tests/support/network_test_constants.h"
diff --git a/tests/unit/app/pairing_flow_test.cpp b/tests/unit/app/pairing_flow_test.cpp
@@ -6,7 +6,7 @@
 #include "src/app/pairing_flow.h"
 
 // lib includes
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 
 // test includes
 #include "tests/support/network_test_constants.h"
diff --git a/tests/unit/app/settings_storage_test.cpp b/tests/unit/app/settings_storage_test.cpp
@@ -11,7 +11,7 @@
 #include <string_view>
 
 // lib includes
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 
 // test includes
 #include "tests/support/filesystem_test_utils.h"
@@ -25,18 +25,20 @@ namespace {
     ASSERT_EQ(std::fclose(file), 0);
   }
 
-  class SettingsStorageTest: public ::testing::Test {  // NOSONAR(cpp:S3656) protected members are required by gtest
+  class SettingsStorageTest: public BaseTest {  // NOSONAR(cpp:S3656) protected members are required by gtest
   protected:
     std::string testDirectory = "settings-storage-test";
     std::string settingsPath = test_support::join_path(testDirectory, "moonlight.toml");
 
     void SetUp() override {
+      BaseTest::SetUp();
       ASSERT_TRUE(test_support::create_directory(testDirectory));
     }
 
     void TearDown() override {
       test_support::remove_if_present(settingsPath);
       test_support::remove_directory_if_present(testDirectory);
+      BaseTest::TearDown();
     }
   };
 
diff --git a/tests/unit/input/navigation_input_test.cpp b/tests/unit/input/navigation_input_test.cpp
@@ -6,7 +6,7 @@
 #include "src/input/navigation_input.h"
 
 // lib includes
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 
 namespace {
 
diff --git a/tests/unit/logging/log_file_test.cpp b/tests/unit/logging/log_file_test.cpp
@@ -10,7 +10,7 @@
 #include <string>
 
 // lib includes
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 
 // test includes
 #include "tests/support/filesystem_test_utils.h"
diff --git a/tests/unit/logging/logger_test.cpp b/tests/unit/logging/logger_test.cpp
@@ -11,7 +11,7 @@
 #include <vector>
 
 // lib includes
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 
 namespace {
 
diff --git a/tests/unit/logging/startup_debug_test.cpp b/tests/unit/logging/startup_debug_test.cpp
@@ -6,7 +6,7 @@
 #include "src/logging/logger.h"
 
 // lib includes
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 
 namespace {
 
diff --git a/tests/unit/network/host_discovery_test.cpp b/tests/unit/network/host_discovery_test.cpp
@@ -9,7 +9,7 @@
 #include <string_view>
 
 // lib includes
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 
 // test includes
 #include "tests/support/network_test_constants.h"
diff --git a/tests/unit/network/host_pairing_test.cpp b/tests/unit/network/host_pairing_test.cpp
@@ -18,7 +18,7 @@
 #include <vector>
 
 // lib includes
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 
diff --git a/tests/unit/network/runtime_network_test.cpp b/tests/unit/network/runtime_network_test.cpp
@@ -9,7 +9,7 @@
 #include <string>
 
 // lib includes
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 
 // test includes
 #include "tests/support/network_test_constants.h"
diff --git a/tests/unit/platform/filesystem_utils_test.cpp b/tests/unit/platform/filesystem_utils_test.cpp
@@ -12,7 +12,7 @@
 #include <string>
 
 // lib includes
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 
 // test includes
 #include "tests/support/filesystem_test_utils.h"
@@ -26,14 +26,15 @@ namespace {
     ASSERT_EQ(std::fclose(file), 0);
   }
 
-  class FilesystemUtilsTest: public ::testing::Test {  // NOSONAR(cpp:S3656) protected members are required by gtest
+  class FilesystemUtilsTest: public BaseTest {  // NOSONAR(cpp:S3656) protected members are required by gtest
   protected:
     std::string rootDirectory = "filesystem-utils-test";
     std::string nestedDirectory = test_support::join_path(test_support::join_path(rootDirectory, "level-one"), "level-two");
     std::string filePath = test_support::join_path(nestedDirectory, "payload.bin");
 
     void TearDown() override {
       test_support::remove_tree_if_present(rootDirectory);
+      BaseTest::TearDown();
     }
   };
 
diff --git a/tests/unit/splash/splash_layout_test.cpp b/tests/unit/splash/splash_layout_test.cpp
@@ -6,7 +6,7 @@
 #include "src/splash/splash_layout.h"
 
 // lib includes
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 
 namespace {
 
diff --git a/tests/unit/startup/client_identity_storage_test.cpp b/tests/unit/startup/client_identity_storage_test.cpp
@@ -10,7 +10,7 @@
 #include <string_view>
 
 // lib includes
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 
 // test includes
 #include "tests/support/filesystem_test_utils.h"
@@ -24,7 +24,7 @@ namespace {
     ASSERT_EQ(std::fclose(file), 0);
   }
 
-  class ClientIdentityStorageTest: public ::testing::Test {  // NOSONAR(cpp:S3656) protected members are required by gtest
+  class ClientIdentityStorageTest: public BaseTest {  // NOSONAR(cpp:S3656) protected members are required by gtest
   protected:
     void TearDown() override {
       test_support::remove_if_present(test_support::join_path(nestedIdentityDirectory, "uniqueid.dat"));
@@ -37,6 +37,7 @@ namespace {
       test_support::remove_if_present(test_support::join_path(testDirectory, "client.pem"));
       test_support::remove_if_present(test_support::join_path(testDirectory, "key.pem"));
       test_support::remove_directory_if_present(testDirectory);
+      BaseTest::TearDown();
     }
 
     std::string testDirectory = "pairing-storage-test";
diff --git a/tests/unit/startup/cover_art_cache_test.cpp b/tests/unit/startup/cover_art_cache_test.cpp
@@ -9,19 +9,20 @@
 #include <vector>
 
 // lib includes
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 
 // test includes
 #include "tests/support/filesystem_test_utils.h"
 #include "tests/support/network_test_constants.h"
 
 namespace {
 
-  class CoverArtCacheTest: public ::testing::Test {  // NOSONAR(cpp:S3656) protected members are required by gtest
+  class CoverArtCacheTest: public BaseTest {  // NOSONAR(cpp:S3656) protected members are required by gtest
   protected:
     void TearDown() override {
       test_support::remove_if_present(testFilePath);
       test_support::remove_directory_if_present(testDirectory);
+      BaseTest::TearDown();
     }
 
     std::string testDirectory = "cover-art-cache-test";
diff --git a/tests/unit/startup/host_storage_test.cpp b/tests/unit/startup/host_storage_test.cpp
@@ -11,21 +11,22 @@
 #include <vector>
 
 // lib includes
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 
 // test includes
 #include "tests/support/filesystem_test_utils.h"
 #include "tests/support/network_test_constants.h"
 
 namespace {
 
-  class HostStorageTest: public ::testing::Test {  // NOSONAR(cpp:S3656) protected members are required by gtest
+  class HostStorageTest: public BaseTest {  // NOSONAR(cpp:S3656) protected members are required by gtest
   protected:
     void TearDown() override {
       test_support::remove_if_present(nestedFilePath);
       test_support::remove_directory_if_present(test_support::join_path(testDirectory, "nested"));
       test_support::remove_if_present(testFilePath);
       test_support::remove_directory_if_present(testDirectory);
+      BaseTest::TearDown();
     }
 
     std::string testDirectory = "host-storage-test";
diff --git a/tests/unit/startup/saved_files_test.cpp b/tests/unit/startup/saved_files_test.cpp
@@ -10,7 +10,7 @@
 #include <vector>
 
 // lib includes
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 
 // test includes
 #include "tests/support/filesystem_test_utils.h"
@@ -24,7 +24,7 @@ namespace {
     ASSERT_EQ(std::fclose(file), 0);
   }
 
-  class SavedFilesTest: public ::testing::Test {  // NOSONAR(cpp:S3656) protected members are required by gtest
+  class SavedFilesTest: public BaseTest {  // NOSONAR(cpp:S3656) protected members are required by gtest
   protected:
     std::string testDirectory = "saved-files-test";
     std::string pairingDirectory = test_support::join_path(testDirectory, "pairing");
@@ -47,6 +47,7 @@ namespace {
     };
 
     void SetUp() override {
+      BaseTest::SetUp();
       ASSERT_TRUE(test_support::create_directory(testDirectory));
       ASSERT_TRUE(test_support::create_directory(pairingDirectory));
       ASSERT_TRUE(test_support::create_directory(coverArtDirectory));
@@ -66,6 +67,7 @@ namespace {
       test_support::remove_directory_if_present(coverArtDirectory);
       test_support::remove_directory_if_present(pairingDirectory);
       test_support::remove_directory_if_present(testDirectory);
+      BaseTest::TearDown();
     }
   };
 
diff --git a/tests/unit/startup/video_mode_test.cpp b/tests/unit/startup/video_mode_test.cpp
@@ -9,7 +9,7 @@
 #include <vector>
 
 // lib includes
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 
 namespace {
 
diff --git a/tests/unit/streaming/stats_overlay_test.cpp b/tests/unit/streaming/stats_overlay_test.cpp
@@ -4,7 +4,7 @@
  */
 #include "src/streaming/stats_overlay.h"
 
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 #include <vector>
 
 namespace {
diff --git a/tests/unit/ui/host_probe_result_queue_test.cpp b/tests/unit/ui/host_probe_result_queue_test.cpp
@@ -11,7 +11,7 @@
 #include <vector>
 
 // lib includes
-#include <gtest/gtest.h>
+#include <lizardbyte/common/testing.h>
 
 // test includes
 #include "tests/support/network_test_constants.h"
diff --git a/tests/unit/ui/menu_model_test.cpp b/tests/unit/ui/menu_model_test.cpp
diff --git a/tests/unit/ui/shell_view_test.cpp b/tests/unit/ui/shell_view_test.cpp
diff --git a/third-party/googletest b/third-party/googletest
diff --git a/third-party/lizardbyte-common b/third-party/lizardbyte-common
