@@ -77,13 +77,10 @@ using GravityFeatures = gz::physics::FeatureList<
77
77
gz::physics::ForwardStep
78
78
>;
79
79
80
- using GravityFeaturesTestTypes =
81
- ::testing::Types<GravityFeatures>;
82
- TYPED_TEST_SUITE (WorldFeaturesTest,
83
- GravityFeatures,);
80
+ using WorldFeaturesTestGravity = WorldFeaturesTest<GravityFeatures>;
84
81
85
82
// ///////////////////////////////////////////////
86
- TYPED_TEST (WorldFeaturesTest , GravityFeatures)
83
+ TEST_F (WorldFeaturesTestGravity , GravityFeatures)
87
84
{
88
85
for (const std::string &name : this ->pluginNames )
89
86
{
@@ -182,19 +179,18 @@ TYPED_TEST(WorldFeaturesTest, GravityFeatures)
182
179
}
183
180
}
184
181
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
+ >;
198
194
199
195
class WorldModelTest : public WorldFeaturesTest <WorldModelFeatureList>
200
196
{
0 commit comments