From 67315fc8f07cee0de3e926afc5fb40f2ec5af967 Mon Sep 17 00:00:00 2001
From: Stanislav Motylkov <x86corez@gmail.com>
Date: Wed, 31 Jul 2024 17:46:47 +0300
Subject: [PATCH] [INTEROP_UNITTEST] Move to unit tests

---
 modules/rostests/unittests/CMakeLists.txt        |  1 +
 .../rostests/unittests/interop/CMakeLists.txt    | 16 ++++++++++++++++
 .../interop}/LocaleTests.cpp                     |  2 +-
 .../interop_test => unittests/interop}/interop.h |  0
 .../interop}/testlist.c                          |  0
 modules/rostests/win32/CMakeLists.txt            |  1 -
 .../rostests/win32/interop_test/CMakeLists.txt   | 14 --------------
 7 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 modules/rostests/unittests/interop/CMakeLists.txt
 rename modules/rostests/{win32/interop_test => unittests/interop}/LocaleTests.cpp (99%)
 rename modules/rostests/{win32/interop_test => unittests/interop}/interop.h (100%)
 rename modules/rostests/{win32/interop_test => unittests/interop}/testlist.c (100%)
 delete mode 100644 modules/rostests/win32/interop_test/CMakeLists.txt

diff --git a/modules/rostests/unittests/CMakeLists.txt b/modules/rostests/unittests/CMakeLists.txt
index 4578836648e66..a6367cd1a892d 100644
--- a/modules/rostests/unittests/CMakeLists.txt
+++ b/modules/rostests/unittests/CMakeLists.txt
@@ -1 +1,2 @@
+add_subdirectory(interop)
 add_subdirectory(setuplib)
diff --git a/modules/rostests/unittests/interop/CMakeLists.txt b/modules/rostests/unittests/interop/CMakeLists.txt
new file mode 100644
index 0000000000000..68eece5682c82
--- /dev/null
+++ b/modules/rostests/unittests/interop/CMakeLists.txt
@@ -0,0 +1,16 @@
+
+PROJECT(interop_unittest)
+
+include_directories(../../apitests/include)
+
+list(APPEND SOURCE
+    LocaleTests.cpp
+    testlist.c)
+
+add_executable(interop_unittest ${SOURCE})
+
+target_link_libraries(interop_unittest cppstl)
+set_module_type(interop_unittest win32cui)
+target_compile_definitions(interop_unittest PRIVATE UNICODE _UNICODE _STLP_NO_EXCEPTIONS)
+add_importlibs(interop_unittest shell32 user32 msvcrt kernel32)
+add_rostests_file(TARGET interop_unittest)
diff --git a/modules/rostests/win32/interop_test/LocaleTests.cpp b/modules/rostests/unittests/interop/LocaleTests.cpp
similarity index 99%
rename from modules/rostests/win32/interop_test/LocaleTests.cpp
rename to modules/rostests/unittests/interop/LocaleTests.cpp
index 4ab9ea70ded01..81c28436a1333 100644
--- a/modules/rostests/win32/interop_test/LocaleTests.cpp
+++ b/modules/rostests/unittests/interop/LocaleTests.cpp
@@ -241,7 +241,7 @@ static void TEST_LocaleTests(void)
 #define ADD_LIB(eModule, pszPath) lib.insert(std::make_pair(eModule, pszPath));
 
     GetModuleFileNameW(NULL, szBuffer, _countof(szBuffer));
-    LPCWSTR pszFind = StrStrW(szBuffer, L"modules\\rostests\\win32");
+    LPCWSTR pszFind = StrStrW(szBuffer, L"modules\\rostests\\unittests");
     if (pszFind)
     {
         // We're running in ReactOS output folder
diff --git a/modules/rostests/win32/interop_test/interop.h b/modules/rostests/unittests/interop/interop.h
similarity index 100%
rename from modules/rostests/win32/interop_test/interop.h
rename to modules/rostests/unittests/interop/interop.h
diff --git a/modules/rostests/win32/interop_test/testlist.c b/modules/rostests/unittests/interop/testlist.c
similarity index 100%
rename from modules/rostests/win32/interop_test/testlist.c
rename to modules/rostests/unittests/interop/testlist.c
diff --git a/modules/rostests/win32/CMakeLists.txt b/modules/rostests/win32/CMakeLists.txt
index 294b0ed5f39ed..bf71c98bebd6b 100644
--- a/modules/rostests/win32/CMakeLists.txt
+++ b/modules/rostests/win32/CMakeLists.txt
@@ -1,6 +1,5 @@
 add_subdirectory(advapi32)
 add_subdirectory(cmd)
 add_subdirectory(comctl32)
-add_subdirectory(interop_test)
 add_subdirectory(kernel32)
 add_subdirectory(user32)
diff --git a/modules/rostests/win32/interop_test/CMakeLists.txt b/modules/rostests/win32/interop_test/CMakeLists.txt
deleted file mode 100644
index 23e803f9038a5..0000000000000
--- a/modules/rostests/win32/interop_test/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-include_directories(../../apitests/include)
-
-list(APPEND SOURCE
-    LocaleTests.cpp
-    testlist.c)
-
-add_executable(interop_apitest ${SOURCE})
-
-target_link_libraries(interop_apitest cppstl)
-set_module_type(interop_apitest win32cui)
-target_compile_definitions(interop_apitest PRIVATE UNICODE _UNICODE _STLP_NO_EXCEPTIONS)
-add_importlibs(interop_apitest shell32 user32 msvcrt kernel32)
-add_rostests_file(TARGET interop_apitest)