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

Fix rendering tests #561

Merged
merged 14 commits into from
Aug 21, 2023
Merged

Fix rendering tests #561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f80b853
debugging
iche033 Aug 17, 2023
16cf100
reset cam
iche033 Aug 17, 2023
2aa1cd5
more testing
iche033 Aug 17, 2023
4fc923f
no unload
iche033 Aug 17, 2023
fd2a22b
more testing with no unload
iche033 Aug 17, 2023
b5e10a4
unload engine in gzrenderer
iche033 Aug 17, 2023
6d9a940
unload engine in gzrenderer debugging
iche033 Aug 17, 2023
2aac431
unload engine in gzrenderer reset scene
iche033 Aug 17, 2023
bea74af
comment out unload
iche033 Aug 18, 2023
5ff543a
increase timeout
iche033 Aug 18, 2023
9721afe
test timing
iche033 Aug 18, 2023
d700ba5
cleanup
iche033 Aug 18, 2023
66d6c28
cleanup
iche033 Aug 18, 2023
24b3c1c
more cleanup
iche033 Aug 18, 2023
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
3 changes: 3 additions & 0 deletions test/integration/marker_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,4 +211,7 @@ TEST_F(MarkerManagerTestFixture,

// Cleanup
plugins.clear();
scene.reset();

window->QuickWindow()->close();
}
4 changes: 2 additions & 2 deletions test/integration/minimal_scene.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ TEST(MinimalSceneTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config))
EXPECT_TRUE(app.RemovePlugin(pluginName));
plugins.clear();


scene.reset();
win->QuickWindow()->close();
engine->DestroyScene(scene);
EXPECT_TRUE(rendering::unloadEngine(engine->Name()));
}
11 changes: 5 additions & 6 deletions test/integration/transport_scene_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,10 @@ TEST(TransportSceneManagerTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config))
// Show, but don't exec, so we don't block
win->QuickWindow()->show();

// get render engine after window is shown
auto engine = gz::gui::testing::getRenderEngine("ogre2");
ASSERT_NE(nullptr, engine);

int sleep = 0;
int maxSleep = 30;
while (!sceneRequested && sleep < maxSleep)
Expand All @@ -166,10 +170,6 @@ TEST(TransportSceneManagerTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config))
EXPECT_TRUE(sceneRequested);
EXPECT_LT(sleep, maxSleep);

// get render engine after window is shown
auto engine = gz::gui::testing::getRenderEngine("ogre2");
ASSERT_NE(nullptr, engine);

auto scene = engine->SceneByName("banana");
ASSERT_NE(nullptr, scene);

Expand Down Expand Up @@ -260,8 +260,7 @@ TEST(TransportSceneManagerTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config))
}
plugins.clear();

scene.reset();
win->QuickWindow()->close();
engine->DestroyScene(scene);
EXPECT_TRUE(rendering::unloadEngine(engine->Name()));
}