From 4e7305671f113a9873be6fe2c1d6b9210313c934 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Thu, 2 Nov 2023 12:56:11 -0700
Subject: [PATCH] common_test/world_features: don't use TYPED_TEST

Minor refactor based on #493.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 test/common_test/world_features.cc | 32 +++++++++++++-----------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/test/common_test/world_features.cc b/test/common_test/world_features.cc
index b9d7d0011..b4d3b784d 100644
--- a/test/common_test/world_features.cc
+++ b/test/common_test/world_features.cc
@@ -77,13 +77,10 @@ using GravityFeatures = gz::physics::FeatureList<
   gz::physics::ForwardStep
 >;
 
-using GravityFeaturesTestTypes =
-  ::testing::Types<GravityFeatures>;
-TYPED_TEST_SUITE(WorldFeaturesTest,
-                 GravityFeatures,);
+using WorldFeaturesTestGravity = WorldFeaturesTest<GravityFeatures>;
 
 /////////////////////////////////////////////////
-TYPED_TEST(WorldFeaturesTest, GravityFeatures)
+TEST_F(WorldFeaturesTestGravity, GravityFeatures)
 {
   for (const std::string &name : this->pluginNames)
   {
@@ -182,19 +179,18 @@ TYPED_TEST(WorldFeaturesTest, GravityFeatures)
   }
 }
 
-struct WorldModelFeatureList
-    : gz::physics::FeatureList<GravityFeatures, gz::physics::WorldModelFeature,
-                               gz::physics::RemoveEntities,
-                               gz::physics::GetNestedModelFromModel,
-                               gz::physics::sdf::ConstructSdfLink,
-                               gz::physics::sdf::ConstructSdfJoint,
-                               gz::physics::sdf::ConstructSdfModel,
-                               gz::physics::sdf::ConstructSdfNestedModel,
-                               gz::physics::ConstructEmptyLinkFeature,
-                               gz::physics::ConstructEmptyNestedModelFeature
-                               >
-{
-};
+using WorldModelFeatureList = gz::physics::FeatureList<
+  GravityFeatures,
+  gz::physics::WorldModelFeature,
+  gz::physics::RemoveEntities,
+  gz::physics::GetNestedModelFromModel,
+  gz::physics::sdf::ConstructSdfLink,
+  gz::physics::sdf::ConstructSdfJoint,
+  gz::physics::sdf::ConstructSdfModel,
+  gz::physics::sdf::ConstructSdfNestedModel,
+  gz::physics::ConstructEmptyLinkFeature,
+  gz::physics::ConstructEmptyNestedModelFeature
+>;
 
 class WorldModelTest : public WorldFeaturesTest<WorldModelFeatureList>
 {