Skip to content

Commit 4e73056

Browse files
committed
common_test/world_features: don't use TYPED_TEST
Minor refactor based on #493. Signed-off-by: Steve Peters <[email protected]>
1 parent b83354d commit 4e73056

File tree

1 file changed

+14
-18
lines changed

1 file changed

+14
-18
lines changed

test/common_test/world_features.cc

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,10 @@ using GravityFeatures = gz::physics::FeatureList<
7777
gz::physics::ForwardStep
7878
>;
7979

80-
using GravityFeaturesTestTypes =
81-
::testing::Types<GravityFeatures>;
82-
TYPED_TEST_SUITE(WorldFeaturesTest,
83-
GravityFeatures,);
80+
using WorldFeaturesTestGravity = WorldFeaturesTest<GravityFeatures>;
8481

8582
/////////////////////////////////////////////////
86-
TYPED_TEST(WorldFeaturesTest, GravityFeatures)
83+
TEST_F(WorldFeaturesTestGravity, GravityFeatures)
8784
{
8885
for (const std::string &name : this->pluginNames)
8986
{
@@ -182,19 +179,18 @@ TYPED_TEST(WorldFeaturesTest, GravityFeatures)
182179
}
183180
}
184181

185-
struct WorldModelFeatureList
186-
: gz::physics::FeatureList<GravityFeatures, gz::physics::WorldModelFeature,
187-
gz::physics::RemoveEntities,
188-
gz::physics::GetNestedModelFromModel,
189-
gz::physics::sdf::ConstructSdfLink,
190-
gz::physics::sdf::ConstructSdfJoint,
191-
gz::physics::sdf::ConstructSdfModel,
192-
gz::physics::sdf::ConstructSdfNestedModel,
193-
gz::physics::ConstructEmptyLinkFeature,
194-
gz::physics::ConstructEmptyNestedModelFeature
195-
>
196-
{
197-
};
182+
using WorldModelFeatureList = gz::physics::FeatureList<
183+
GravityFeatures,
184+
gz::physics::WorldModelFeature,
185+
gz::physics::RemoveEntities,
186+
gz::physics::GetNestedModelFromModel,
187+
gz::physics::sdf::ConstructSdfLink,
188+
gz::physics::sdf::ConstructSdfJoint,
189+
gz::physics::sdf::ConstructSdfModel,
190+
gz::physics::sdf::ConstructSdfNestedModel,
191+
gz::physics::ConstructEmptyLinkFeature,
192+
gz::physics::ConstructEmptyNestedModelFeature
193+
>;
198194

199195
class WorldModelTest : public WorldFeaturesTest<WorldModelFeatureList>
200196
{

0 commit comments

Comments
 (0)