Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deduplicate common tests part1 #448

Merged
merged 2 commits into from
Nov 22, 2022
Merged

Deduplicate common tests part1 #448

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adf1147
Reference FeatureLists recursively
scpeters Nov 12, 2022
af8e428
Add helper function for making an empty world
scpeters Nov 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 49 additions & 84 deletions test/common_test/construct_empty_world.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,29 @@ class ConstructEmptyWorldTest:
}
}

using FeaturePolicy3d = gz::physics::FeaturePolicy3d;

public: void MakeEmptyWorld(
const std::string &_pluginName,
gz::physics::EnginePtr<FeaturePolicy3d, T> &_engine,
gz::physics::WorldPtr<FeaturePolicy3d, T> &_world)
{
std::cout << "Testing plugin: " << _pluginName << std::endl;
gz::plugin::PluginPtr plugin = this->loader.Instantiate(_pluginName);

_engine = gz::physics::RequestEngine3d<T>::From(plugin);
ASSERT_NE(nullptr, _engine);

_world = _engine->ConstructEmptyWorld("empty world");
ASSERT_NE(nullptr, _world);
}

public: std::set<std::string> pluginNames;
public: gz::plugin::Loader loader;
};

using gz::physics::FeaturePolicy3d;

using FeaturesUpToEmptyWorld = gz::physics::FeatureList<
gz::physics::GetEngineInfo,
gz::physics::ConstructEmptyWorldFeature
Expand All @@ -69,21 +88,15 @@ TYPED_TEST(ConstructEmptyWorldTest, ConstructUpToEmptyWorld)
{
for (const std::string &name : this->pluginNames)
{
std::cout << "Testing plugin: " << name << std::endl;
gz::plugin::PluginPtr plugin = this->loader.Instantiate(name);
gz::physics::EnginePtr<FeaturePolicy3d, TypeParam> engine;
gz::physics::WorldPtr<FeaturePolicy3d, TypeParam> world;

auto engine =
gz::physics::RequestEngine3d<FeaturesUpToEmptyWorld>::From(plugin);
ASSERT_NE(nullptr, engine);

auto world = engine->ConstructEmptyWorld("empty world");
ASSERT_NE(nullptr, world);
this->MakeEmptyWorld(name, engine, world);
}
}

using FeaturesUpToGetWorldFromEngine = gz::physics::FeatureList<
gz::physics::GetEngineInfo,
gz::physics::ConstructEmptyWorldFeature,
FeaturesUpToEmptyWorld,
gz::physics::GetWorldFromEngine
>;

Expand All @@ -92,7 +105,7 @@ class ConstructEmptyWorldTestUpToGetWorldFromEngine :
public ConstructEmptyWorldTest<T>{};

using ConstructEmptyWorldTestUpToGetWorldFromEngineTypes =
::testing::Types<FeaturesUpToEmptyWorld>;
::testing::Types<FeaturesUpToGetWorldFromEngine>;
TYPED_TEST_SUITE(ConstructEmptyWorldTestUpToGetWorldFromEngine,
ConstructEmptyWorldTestUpToGetWorldFromEngineTypes);

Expand All @@ -102,25 +115,17 @@ TYPED_TEST(ConstructEmptyWorldTestUpToGetWorldFromEngine,
{
for (const std::string &name : this->pluginNames)
{
std::cout << "Testing plugin: " << name << std::endl;
gz::plugin::PluginPtr plugin = this->loader.Instantiate(name);
gz::physics::EnginePtr<FeaturePolicy3d, TypeParam> engine;
gz::physics::WorldPtr<FeaturePolicy3d, TypeParam> world;
this->MakeEmptyWorld(name, engine, world);

auto engine =
gz::physics::RequestEngine3d<FeaturesUpToGetWorldFromEngine>::From(
plugin);
ASSERT_NE(nullptr, engine);

auto world = engine->ConstructEmptyWorld("empty world");
ASSERT_NE(nullptr, world);
EXPECT_EQ("empty world", world->GetName());
EXPECT_EQ(engine, world->GetEngine());
}
}

using FeaturesUpToEmptyModelFeature = gz::physics::FeatureList<
gz::physics::GetEngineInfo,
gz::physics::ConstructEmptyWorldFeature,
gz::physics::GetWorldFromEngine,
FeaturesUpToGetWorldFromEngine,
gz::physics::ConstructEmptyModelFeature
>;

Expand All @@ -138,15 +143,10 @@ TYPED_TEST(ConstructEmptyWorldTestUpToEmptyModelFeature,
{
for (const std::string &name : this->pluginNames)
{
std::cout << "Testing plugin: " << name << std::endl;
gz::plugin::PluginPtr plugin = this->loader.Instantiate(name);
gz::physics::EnginePtr<FeaturePolicy3d, TypeParam> engine;
gz::physics::WorldPtr<FeaturePolicy3d, TypeParam> world;
this->MakeEmptyWorld(name, engine, world);

auto engine =
gz::physics::RequestEngine3d<FeaturesUpToEmptyModelFeature>::From(plugin);
ASSERT_NE(nullptr, engine);

auto world = engine->ConstructEmptyWorld("empty world");
ASSERT_NE(nullptr, world);
EXPECT_EQ("empty world", world->GetName());
EXPECT_EQ(engine, world->GetEngine());

Expand All @@ -157,10 +157,7 @@ TYPED_TEST(ConstructEmptyWorldTestUpToEmptyModelFeature,
}

using FeaturesUpToGetModelFromWorld = gz::physics::FeatureList<
gz::physics::GetEngineInfo,
gz::physics::ConstructEmptyWorldFeature,
gz::physics::GetWorldFromEngine,
gz::physics::ConstructEmptyModelFeature,
FeaturesUpToEmptyModelFeature,
gz::physics::GetModelFromWorld
>;

Expand All @@ -178,15 +175,10 @@ TYPED_TEST(ConstructEmptyWorldTestUpToGetModelFromWorld,
{
for (const std::string &name : this->pluginNames)
{
std::cout << "Testing plugin: " << name << std::endl;
gz::plugin::PluginPtr plugin = this->loader.Instantiate(name);
gz::physics::EnginePtr<FeaturePolicy3d, TypeParam> engine;
gz::physics::WorldPtr<FeaturePolicy3d, TypeParam> world;
this->MakeEmptyWorld(name, engine, world);

auto engine =
gz::physics::RequestEngine3d<FeaturesUpToGetModelFromWorld>::From(plugin);
ASSERT_NE(nullptr, engine);

auto world = engine->ConstructEmptyWorld("empty world");
ASSERT_NE(nullptr, world);
EXPECT_EQ("empty world", world->GetName());
EXPECT_EQ(engine, world->GetEngine());

Expand All @@ -199,11 +191,7 @@ TYPED_TEST(ConstructEmptyWorldTestUpToGetModelFromWorld,
}

using FeaturesUpToEmptyNestedModelFeature = gz::physics::FeatureList<
gz::physics::GetEngineInfo,
gz::physics::ConstructEmptyWorldFeature,
gz::physics::GetWorldFromEngine,
gz::physics::ConstructEmptyModelFeature,
gz::physics::GetModelFromWorld,
FeaturesUpToGetModelFromWorld,
gz::physics::ConstructEmptyNestedModelFeature,
gz::physics::GetNestedModelFromModel
>;
Expand All @@ -222,14 +210,10 @@ TYPED_TEST(ConstructEmptyWorldTestUpToEmptyNestedModelFeature,
{
for (const std::string &name : this->pluginNames)
{
std::cout << "Testing plugin: " << name << std::endl;
gz::plugin::PluginPtr plugin = this->loader.Instantiate(name);
gz::physics::EnginePtr<FeaturePolicy3d, TypeParam> engine;
gz::physics::WorldPtr<FeaturePolicy3d, TypeParam> world;
this->MakeEmptyWorld(name, engine, world);

auto engine = gz::physics::RequestEngine3d<FeaturesUpToEmptyNestedModelFeature>::From(plugin);
ASSERT_NE(nullptr, engine);

auto world = engine->ConstructEmptyWorld("empty world");
ASSERT_NE(nullptr, world);
auto model = world->ConstructEmptyModel("empty model");

auto nestedModel = model->ConstructEmptyNestedModel("empty nested model");
Expand All @@ -248,10 +232,7 @@ TYPED_TEST(ConstructEmptyWorldTestUpToEmptyNestedModelFeature,
}

using FeaturesUpToEmptyLink = gz::physics::FeatureList<
gz::physics::GetEngineInfo,
gz::physics::ConstructEmptyWorldFeature,
gz::physics::GetWorldFromEngine,
gz::physics::ConstructEmptyModelFeature,
FeaturesUpToEmptyModelFeature,
gz::physics::GetLinkFromModel,
gz::physics::ConstructEmptyLinkFeature
>;
Expand All @@ -269,15 +250,10 @@ TYPED_TEST(ConstructEmptyWorldTestUpToEmptyLink, ConstructUpToEmptyWorld)
{
for (const std::string &name : this->pluginNames)
{
std::cout << "Testing plugin: " << name << std::endl;
gz::plugin::PluginPtr plugin = this->loader.Instantiate(name);

auto engine =
gz::physics::RequestEngine3d<FeaturesUpToEmptyLink>::From(plugin);
ASSERT_NE(nullptr, engine);
gz::physics::EnginePtr<FeaturePolicy3d, TypeParam> engine;
gz::physics::WorldPtr<FeaturePolicy3d, TypeParam> world;
this->MakeEmptyWorld(name, engine, world);

auto world = engine->ConstructEmptyWorld("empty world");
ASSERT_NE(nullptr, world);
EXPECT_EQ("empty world", world->GetName());
EXPECT_EQ(engine, world->GetEngine());

Expand Down Expand Up @@ -320,15 +296,10 @@ TYPED_TEST(ConstructEmptyWorldTestUpToRemove, ConstructUpToEmptyWorld)
{
for (const std::string &name : this->pluginNames)
{
std::cout << "Testing plugin: " << name << std::endl;
gz::plugin::PluginPtr plugin = this->loader.Instantiate(name);
gz::physics::EnginePtr<FeaturePolicy3d, TypeParam> engine;
gz::physics::WorldPtr<FeaturePolicy3d, TypeParam> world;
this->MakeEmptyWorld(name, engine, world);

auto engine =
gz::physics::RequestEngine3d<FeaturesUpToRemove>::From(plugin);
ASSERT_NE(nullptr, engine);

auto world = engine->ConstructEmptyWorld("empty world");
ASSERT_NE(nullptr, world);
auto model = world->ConstructEmptyModel("empty model");
ASSERT_NE(nullptr, model);
auto modelAlias = world->GetModel(0);
Expand Down Expand Up @@ -416,16 +387,10 @@ TYPED_TEST(ConstructEmptyWorldTestUpToEmptyNestedModelFeature2,
{
for (const std::string &name : this->pluginNames)
{
std::cout << "Testing plugin: " << name << std::endl;
gz::plugin::PluginPtr plugin = this->loader.Instantiate(name);

auto engine =
gz::physics::RequestEngine3d<FeaturesUpToEmptyNestedModelFeature2>::From(
plugin);
ASSERT_NE(nullptr, engine);
gz::physics::EnginePtr<FeaturePolicy3d, TypeParam> engine;
gz::physics::WorldPtr<FeaturePolicy3d, TypeParam> world;
this->MakeEmptyWorld(name, engine, world);

auto world = engine->ConstructEmptyWorld("empty world");
ASSERT_NE(nullptr, world);
auto model1 = world->ConstructEmptyModel("model1");
ASSERT_NE(nullptr, model1);
EXPECT_EQ(0ul, model1->GetIndex());
Expand Down