OpenGL: Restructure tests similar to D3D12 layout

- Move old test files to new unit/integration structure
- Add OpenGL Test Fixture
- Update CMakeLists.txt for new layout
- Add OpenGL_Test_Restructuring_Plan.md

tests/RHI/OpenGL/CMakeLists.txt

@@ -5,54 +5,5 @@ project(OpenGLEngineTests)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-get_filename_component(PROJECT_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../.. ABSOLUTE)
-
-find_package(OpenGL REQUIRED)
-
-include_directories(${CMAKE_SOURCE_DIR}/tests/OpenGL/package/include/)
-include_directories(${PROJECT_ROOT_DIR}/engine/include)
-include_directories(${PROJECT_ROOT_DIR}/engine/src)
-
-link_directories(${CMAKE_SOURCE_DIR}/tests/OpenGL/package/lib/)
-
-find_package(GTest REQUIRED)
-
-set(TEST_SOURCES
-    ${CMAKE_SOURCE_DIR}/tests/OpenGL/package/src/glad.c
-    fixtures/OpenGLTestFixture.cpp
-    test_device.cpp
-    # test_buffer.cpp      
-    # test_fence.cpp       
-    test_texture.cpp
-    test_sampler.cpp
-    # test_shader.cpp      
-    test_pipeline_state.cpp
-    test_vertex_array.cpp
-    test_command_list.cpp
-    test_render_target_view.cpp
-    test_depth_stencil_view.cpp
-    test_swap_chain.cpp
-)
-
-add_executable(opengl_engine_tests ${TEST_SOURCES})
-
-target_link_libraries(opengl_engine_tests PRIVATE
-    opengl32
-    glfw3
-    XCEngine
-    GTest::gtest
-    GTest::gtest_main
-)
-
-target_include_directories(opengl_engine_tests PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/fixtures
-    ${PROJECT_ROOT_DIR}/engine/include
-    ${PROJECT_ROOT_DIR}/engine/src
-)
-
-target_compile_definitions(opengl_engine_tests PRIVATE
-    TEST_RESOURCES_DIR="${PROJECT_ROOT_DIR}/tests/RHI/OpenGL/Res"
-)
-
-enable_testing()
-add_test(NAME OpenGLEngineTests COMMAND opengl_engine_tests)
+add_subdirectory(unit)
+add_subdirectory(integration)

tests/RHI/OpenGL/integration/CMakeLists.txt

@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.15)
+
+project(OpenGL_Integration)
+
+set(ENGINE_ROOT_DIR ${CMAKE_SOURCE_DIR}/engine)
+
+find_package(Python3 REQUIRED)
+
+enable_testing()
+
+message(STATUS "OpenGL integration tests placeholder - to be implemented in Phase 5")

tests/RHI/OpenGL/unit/CMakeLists.txt

@@ -0,0 +1,59 @@
+cmake_minimum_required(VERSION 3.15)
+
+get_filename_component(PROJECT_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../.. ABSOLUTE)
+
+find_package(OpenGL REQUIRED)
+
+include_directories(${CMAKE_SOURCE_DIR}/tests/OpenGL/package/include/)
+include_directories(${PROJECT_ROOT_DIR}/engine/include)
+include_directories(${PROJECT_ROOT_DIR}/engine/src)
+
+link_directories(${CMAKE_SOURCE_DIR}/tests/OpenGL/package/lib/)
+
+find_package(GTest REQUIRED)
+
+set(TEST_SOURCES
+    ${CMAKE_SOURCE_DIR}/tests/OpenGL/package/src/glad.c
+    fixtures/OpenGLTestFixture.cpp
+    test_device.cpp
+    test_buffer.cpp
+    test_fence.cpp
+    test_texture.cpp
+    test_shader.cpp
+    test_pipeline_state.cpp
+    test_vertex_array.cpp
+    test_command_list.cpp
+    test_render_target_view.cpp
+    test_depth_stencil_view.cpp
+    test_swap_chain.cpp
+    test_sampler.cpp
+)
+
+add_executable(opengl_engine_tests ${TEST_SOURCES})
+
+target_link_libraries(opengl_engine_tests PRIVATE
+    opengl32
+    glfw3
+    XCEngine
+    GTest::gtest
+    GTest::gtest_main
+)
+
+target_include_directories(opengl_engine_tests PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/fixtures
+    ${PROJECT_ROOT_DIR}/engine/include
+    ${PROJECT_ROOT_DIR}/engine/src
+)
+
+target_compile_definitions(opengl_engine_tests PRIVATE
+    TEST_RESOURCES_DIR="${PROJECT_ROOT_DIR}/tests/RHI/OpenGL/integration/minimal/Res"
+)
+
+add_custom_command(TARGET opengl_engine_tests POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+        ${PROJECT_ROOT_DIR}/tests/RHI/OpenGL/integration/minimal/Res
+        $<TARGET_FILE_DIR:opengl_engine_tests>/Res
+)
+
+enable_testing()
+add_test(NAME OpenGLEngineTests COMMAND opengl_engine_tests)

tests/RHI/OpenGL/unit/fixtures/OpenGLTestFixture.cpp

@@ -2,45 +2,51 @@
 
 using namespace XCEngine::RHI;
 
-GLFWwindow* OpenGLTestFixture::m_window = nullptr;
-bool OpenGLTestFixture::m_contextInitialized = false;
-OpenGLDevice* OpenGLTestFixture::m_device = nullptr;
+static bool s_glfwInitialized = false;
+static bool s_gladInitialized = false;
 
-void OpenGLTestFixture::SetUpTestSuite() {
-    if (!glfwInit()) {
-        GTEST_SKIP() << "Failed to initialize GLFW";
-        return;
+void OpenGLTestFixture::SetUp() {
+    if (!s_glfwInitialized) {
+        if (!glfwInit()) {
+            GTEST_SKIP() << "Failed to initialize GLFW";
+            return;
+        }
+
+        glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
+        glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
+        glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 6);
+        glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+
+        s_glfwInitialized = true;
     }
 
-    glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 6);
-    glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
-
     m_window = glfwCreateWindow(640, 480, "OpenGL Tests", nullptr, nullptr);
     if (!m_window) {
         GTEST_SKIP() << "Failed to create GLFW window";
-        glfwTerminate();
         return;
     }
 
     glfwMakeContextCurrent(m_window);
-    
-    if (!gladLoadGLLoader((GLADloadproc)glfwGetProcAddress)) {
-        GTEST_SKIP() << "Failed to initialize GLAD";
-        glfwDestroyWindow(m_window);
-        m_window = nullptr;
-        glfwTerminate();
-        return;
+
+    if (!s_gladInitialized) {
+        if (!gladLoadGLLoader((GLADloadproc)glfwGetProcAddress)) {
+            GTEST_SKIP() << "Failed to initialize GLAD";
+            glfwDestroyWindow(m_window);
+            m_window = nullptr;
+            return;
+        }
+        s_gladInitialized = true;
     }
-    
-    m_contextInitialized = true;
 
     m_device = new OpenGLDevice();
     m_device->CreateRenderWindow(640, 480, "Test Window", false);
+
+    ClearGLErrors();
 }
 
-void OpenGLTestFixture::TearDownTestSuite() {
+void OpenGLTestFixture::TearDown() {
+    ResetGLState();
+
     if (m_device) {
         delete m_device;
         m_device = nullptr;
@@ -50,26 +56,6 @@ void OpenGLTestFixture::TearDownTestSuite() {
         glfwDestroyWindow(m_window);
         m_window = nullptr;
     }
-    glfwTerminate();
-    m_contextInitialized = false;
-}
-
-void OpenGLTestFixture::SetUp() {
-    if (!m_window || !m_contextInitialized) {
-        GTEST_SKIP() << "OpenGL context not available";
-        return;
-    }
-
-    glfwMakeContextCurrent(m_window);
-    ClearGLErrors();
-}
-
-void OpenGLTestFixture::TearDown() {
-    GLenum error = glGetError();
-    if (error != GL_NO_ERROR) {
-    }
-
-    ResetGLState();
 }
 
 void OpenGLTestFixture::MakeContextCurrent() {
@@ -135,4 +121,4 @@ void OpenGLTestFixture::ResetGLState() {
     glDepthFunc(GL_LESS);
     glStencilFunc(GL_ALWAYS, 0, 0xFF);
     glBlendFunc(GL_ONE, GL_ZERO);
-}
+}

tests/RHI/OpenGL/unit/fixtures/OpenGLTestFixture.h

@@ -11,9 +11,6 @@ namespace RHI {
 
 class OpenGLTestFixture : public ::testing::Test {
 protected:
-    static void SetUpTestSuite();
-    static void TearDownTestSuite();
-
     void SetUp() override;
     void TearDown() override;
 
@@ -27,9 +24,8 @@ protected:
     void ResetGLState();
 
 private:
-    static GLFWwindow* m_window;
-    static bool m_contextInitialized;
-    static OpenGLDevice* m_device;
+    GLFWwindow* m_window = nullptr;
+    OpenGLDevice* m_device = nullptr;
 };
 
 } // namespace RHI
@@ -50,4 +46,4 @@ private:
         call; \
         EXPECT_EQ(glGetError(), GL_NO_ERROR) \
             << "GL error after " << #call; \
-    } while(0)
+    } while(0)