From e52557ee7610488211aa0c590d329a852d39fcad Mon Sep 17 00:00:00 2001
From: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
Date: Tue, 23 Nov 2021 10:54:00 +0000
Subject: [PATCH] restoring physx joint typed tests on all platforms (#5836)

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
---
 Gems/PhysX/Code/CMakeLists.txt                            | 8 --------
 Gems/PhysX/Code/Source/Platform/Android/PAL_android.cmake | 2 --
 Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake     | 1 -
 Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake         | 1 -
 Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake | 1 -
 Gems/PhysX/Code/Source/Platform/iOS/PAL_ios.cmake         | 1 -
 Gems/PhysX/Code/Tests/PhysXJointsTest.cpp                 | 3 ---
 7 files changed, 17 deletions(-)

diff --git a/Gems/PhysX/Code/CMakeLists.txt b/Gems/PhysX/Code/CMakeLists.txt
index bb3d7c08a2..fcb2f8ab20 100644
--- a/Gems/PhysX/Code/CMakeLists.txt
+++ b/Gems/PhysX/Code/CMakeLists.txt
@@ -182,14 +182,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
             Gem::LmbrCentral
     )
 
-    if(PAL_TRAIT_JOINTS_TYPED_TEST_CASE)
-        ly_add_source_properties(
-            SOURCES Tests/PhysXJointsTest.cpp
-            PROPERTY COMPILE_DEFINITIONS 
-            VALUES ENABLE_JOINTS_TYPED_TEST_CASE
-        )
-    endif()
-
     ly_add_googletest(
         NAME Gem::PhysX.Tests
     )
diff --git a/Gems/PhysX/Code/Source/Platform/Android/PAL_android.cmake b/Gems/PhysX/Code/Source/Platform/Android/PAL_android.cmake
index e6a2b35d36..1d078bb505 100644
--- a/Gems/PhysX/Code/Source/Platform/Android/PAL_android.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Android/PAL_android.cmake
@@ -7,5 +7,3 @@
 #
 
 set(PAL_TRAIT_PHYSX_SUPPORTED TRUE)
-set(PAL_TRAIT_JOINTS_TYPED_TEST_CASE FALSE)
-
diff --git a/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake b/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake
index 0d9c4f1e3a..43c92ab916 100644
--- a/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake
@@ -7,7 +7,6 @@
 #
 
 set(PAL_TRAIT_PHYSX_SUPPORTED TRUE)
-set(PAL_TRAIT_JOINTS_TYPED_TEST_CASE FALSE)
 
 if(PAL_TRAIT_BUILD_HOST_TOOLS)
      ly_associate_package(PACKAGE_NAME poly2tri-7f0487a-rev1-linux TARGETS poly2tri PACKAGE_HASH b16eef8f0bc469de0e3056d28d7484cf42659667e39b68b239f0d3a4cbb533d0) 
diff --git a/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake b/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake
index 141a80ae59..992280bceb 100644
--- a/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake
@@ -7,7 +7,6 @@
 #
 
 set(PAL_TRAIT_PHYSX_SUPPORTED TRUE)
-set(PAL_TRAIT_JOINTS_TYPED_TEST_CASE FALSE)
 
 if(PAL_TRAIT_BUILD_HOST_TOOLS)
      ly_associate_package(PACKAGE_NAME poly2tri-7f0487a-rev1-mac TARGETS poly2tri PACKAGE_HASH 23e49e6b06d79327985d17b40bff20ab202519c283a842378f5f1791c1bf8dbc) 
diff --git a/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake b/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake
index 7abd7ab9e9..336bb89c40 100644
--- a/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake
@@ -7,7 +7,6 @@
 #
 
 set(PAL_TRAIT_PHYSX_SUPPORTED TRUE)
-set(PAL_TRAIT_JOINTS_TYPED_TEST_CASE TRUE)
 
 if(PAL_TRAIT_BUILD_HOST_TOOLS)
      ly_associate_package(PACKAGE_NAME poly2tri-7f0487a-rev1-windows TARGETS poly2tri PACKAGE_HASH 5fea2bf294e5130e0654fbfa39f192e6369f3853901dde90bb9b3f3a11edcb1e) 
diff --git a/Gems/PhysX/Code/Source/Platform/iOS/PAL_ios.cmake b/Gems/PhysX/Code/Source/Platform/iOS/PAL_ios.cmake
index 6316fa60c6..1d078bb505 100644
--- a/Gems/PhysX/Code/Source/Platform/iOS/PAL_ios.cmake
+++ b/Gems/PhysX/Code/Source/Platform/iOS/PAL_ios.cmake
@@ -7,4 +7,3 @@
 #
 
 set(PAL_TRAIT_PHYSX_SUPPORTED TRUE)
-set(PAL_TRAIT_JOINTS_TYPED_TEST_CASE FALSE)
diff --git a/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp b/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp
index 3a7eac0884..8a624e0223 100644
--- a/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp
@@ -267,8 +267,6 @@ namespace PhysX
         EXPECT_GT(followerEndPosition.GetZ(), followerPosition.GetZ());
     }
 
-// for some reason TYPED_TEST_CASE with the fixture is not working on Android + Linux
-#ifdef ENABLE_JOINTS_TYPED_TEST_CASE
     template<class JointConfigurationType>
     class PhysXJointsApiTest : public PhysX::GenericPhysicsInterfaceTest
     {
@@ -347,5 +345,4 @@ namespace PhysX
 
         EXPECT_GT(childCurrentPos.GetX(), this->m_childInitialPos.GetX());
     }
-#endif // ENABLE_JOINTS_TYPED_TEST_CASE
 }