tests: added unit tests for joypads using SDL2

games-on-whales · Jan 24, 2024 · 12e90b3 · 12e90b3
1 parent 99ed7fe
commit 12e90b3
Show file tree

Hide file tree

Showing 7 changed files with 299 additions and 54 deletions.
diff --git a/.github/workflows/linux-build-test.yml b/.github/workflows/linux-build-test.yml
@@ -35,7 +35,8 @@ jobs:
               libudev-dev \
               libdrm-dev \
               libpci-dev \
-              libunwind-dev
+              libunwind-dev \
+              libsdl2-dev
 
       - name: Setup Rust
         uses: ATiltedTree/setup-rust@v1
@@ -120,6 +121,7 @@ jobs:
               libdrm-dev \
               libpci-dev \
               libunwind-dev \
+              libsdl2-dev
               ${{ join(matrix.other_pkgs, ' ') }}
 
       - name: Setup Rust

diff --git a/src/core/src/core/input.hpp b/src/core/src/core/input.hpp
@@ -222,8 +222,8 @@ class Joypad : public VirtualDevice {
   void set_triggers(unsigned char left, unsigned char right);
 
   enum STICK_POSITION {
-    R2,
-    L2
+    RS,
+    LS
   };
 
   void set_stick(STICK_POSITION stick_type, short x, short y);

diff --git a/src/core/src/platforms/linux/uinput/joypad.cpp b/src/core/src/platforms/linux/uinput/joypad.cpp
@@ -759,7 +759,7 @@ void Joypad::set_pressed_buttons(int newly_pressed) {
 
 void Joypad::set_stick(Joypad::STICK_POSITION stick_type, short x, short y) {
   if (auto controller = this->_state->joy.get()) {
-    if (stick_type == L2) {
+    if (stick_type == LS) {
       libevdev_uinput_write_event(controller, EV_ABS, ABS_X, x);
       libevdev_uinput_write_event(controller, EV_ABS, ABS_Y, -y);
     } else {

diff --git a/src/moonlight-server/control/input_handler.cpp b/src/moonlight-server/control/input_handler.cpp
@@ -215,8 +215,8 @@ void handle_input(const state::StreamSession &session,
                                        Joypad::ANALOG_TRIGGERS | Joypad::RUMBLE);
     }
     selected_pad->set_pressed_buttons(controller_pkt->button_flags | (controller_pkt->buttonFlags2 << 16));
-    selected_pad->set_stick(Joypad::L2, controller_pkt->left_stick_x, controller_pkt->left_stick_y);
-    selected_pad->set_stick(Joypad::R2, controller_pkt->right_stick_x, controller_pkt->right_stick_y);
+    selected_pad->set_stick(Joypad::LS, controller_pkt->left_stick_x, controller_pkt->left_stick_y);
+    selected_pad->set_stick(Joypad::RS, controller_pkt->right_stick_x, controller_pkt->right_stick_y);
     selected_pad->set_triggers(controller_pkt->left_trigger, controller_pkt->right_trigger);
     break;
   }

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -37,14 +37,6 @@ if (UNIX AND NOT APPLE)
     if (TEST_NVIDIA)
         list(APPEND SRC_LIST "platforms/linux/nvidia.cpp")
     endif ()
-
-    option(TEST_SDL "Enabled SDL tests" OFF) # TODO: SDL does pick up my joypad but it doesn't detect gyro/acceleration
-    if (TEST_SDL)
-        find_package(SDL2 REQUIRED)
-        target_include_directories(wolftests PRIVATE ${SDL2_INCLUDE_DIRS})
-        target_link_libraries(wolftests PRIVATE SDL2::SDL2)
-        list(APPEND SRC_LIST "platforms/linux/sdl-test-joypad.cpp")
-    endif ()
 endif ()
 
 option(TEST_DOCKER "Enable docker tests" ON)
@@ -57,6 +49,14 @@ if (TEST_EXCEPTIONS)
     list(APPEND SRC_LIST testExceptions.cpp)
 endif ()
 
+option(TEST_SDL "Enabled SDL tests" ON)
+if (TEST_SDL)
+    find_package(SDL2 REQUIRED)
+    target_include_directories(wolftests PRIVATE ${SDL2_INCLUDE_DIRS})
+    target_link_libraries(wolftests PRIVATE SDL2::SDL2)
+    list(APPEND SRC_LIST "testJoypads.cpp")
+endif ()
+
 target_sources(wolftests PRIVATE ${SRC_LIST})
 
 # I'm using C++17 in the test

diff --git a/tests/platforms/linux/sdl-test-joypad.cpp b/tests/platforms/linux/sdl-test-joypad.cpp