[libsys] Port tests from various places
Porting tests from gfx and media.
DX-387 #comment
CF-664 #comment
TEST=CQ
Change-Id: Iced8c2a27a6b986c639356567b443d4bde30c007
diff --git a/garnet/lib/ui/gfx/tests/BUILD.gn b/garnet/lib/ui/gfx/tests/BUILD.gn
index 275a1f0..2d18957 100644
--- a/garnet/lib/ui/gfx/tests/BUILD.gn
+++ b/garnet/lib/ui/gfx/tests/BUILD.gn
@@ -128,7 +128,6 @@
"//third_party/glm",
]
deps = [
- "//garnet/public/lib/component/cpp/testing",
"//garnet/public/lib/fsl",
"//garnet/public/lib/fxl",
"//garnet/public/lib/gtest",
@@ -138,6 +137,7 @@
"//sdk/fidl/fuchsia.ui.policy",
"//sdk/fidl/fuchsia.ui.scenic",
"//sdk/fidl/fuchsia.ui.views",
+ "//sdk/lib/sys/cpp/testing:integration",
"//sdk/lib/ui/scenic/cpp",
"//third_party/googletest:gtest_main",
"//zircon/public/lib/async-cpp",
@@ -156,7 +156,6 @@
"//third_party/glm",
]
deps = [
- "//garnet/public/lib/component/cpp/testing",
"//garnet/public/lib/fxl",
"//garnet/public/lib/gtest",
"//garnet/public/lib/ui/base_view/cpp",
@@ -165,6 +164,7 @@
"//sdk/fidl/fuchsia.ui.policy",
"//sdk/fidl/fuchsia.ui.scenic",
"//sdk/fidl/fuchsia.ui.views",
+ "//sdk/lib/sys/cpp/testing:integration",
"//sdk/lib/ui/scenic/cpp",
"//third_party/googletest:gtest_main",
]
diff --git a/garnet/lib/ui/gfx/tests/gfx_viewstate_apptest.cc b/garnet/lib/ui/gfx/tests/gfx_viewstate_apptest.cc
index 0db338a..de553d9 100644
--- a/garnet/lib/ui/gfx/tests/gfx_viewstate_apptest.cc
+++ b/garnet/lib/ui/gfx/tests/gfx_viewstate_apptest.cc
@@ -12,9 +12,9 @@
#include <fuchsia/ui/scenic/cpp/fidl.h>
#include <fuchsia/ui/views/cpp/fidl.h>
#include <gtest/gtest.h>
-#include <lib/component/cpp/testing/test_with_environment.h>
#include <lib/fxl/logging.h>
#include <lib/svc/cpp/services.h>
+#include <lib/sys/cpp/testing/test_with_environment.h>
#include <lib/ui/base_view/cpp/base_view.h>
#include <lib/ui/base_view/cpp/embedded_view_utils.h>
#include <lib/ui/scenic/cpp/session.h>
@@ -38,10 +38,10 @@
// Test fixture that sets up an environment suitable for Scenic pixel tests
// and provides related utilities. The environment includes Scenic and
// RootPresenter, and their dependencies.
-class ViewEmbedderTest : public component::testing::TestWithEnvironment {
+class ViewEmbedderTest : public sys::testing::TestWithEnvironment {
protected:
ViewEmbedderTest() {
- std::unique_ptr<component::testing::EnvironmentServices> services =
+ std::unique_ptr<sys::testing::EnvironmentServices> services =
CreateServices();
for (const auto& [service_name, url] : kServices) {
@@ -79,7 +79,7 @@
}
fuchsia::ui::scenic::ScenicPtr scenic_;
- std::unique_ptr<component::testing::EnclosingEnvironment> environment_;
+ std::unique_ptr<sys::testing::EnclosingEnvironment> environment_;
};
TEST_F(ViewEmbedderTest, BouncingBall) {
diff --git a/garnet/lib/ui/gfx/tests/scenic_pixel_test.cc b/garnet/lib/ui/gfx/tests/scenic_pixel_test.cc
index 020a8a9..f176bcb 100644
--- a/garnet/lib/ui/gfx/tests/scenic_pixel_test.cc
+++ b/garnet/lib/ui/gfx/tests/scenic_pixel_test.cc
@@ -12,9 +12,9 @@
#include <fuchsia/ui/views/cpp/fidl.h>
#include <gtest/gtest.h>
#include <lib/async/cpp/task.h>
-#include <lib/component/cpp/testing/test_with_environment.h>
#include <lib/fsl/vmo/vector.h>
#include <lib/fxl/logging.h>
+#include <lib/sys/cpp/testing/test_with_environment.h>
#include <lib/ui/scenic/cpp/session.h>
#include <lib/ui/scenic/cpp/view_token_pair.h>
#include <zircon/status.h>
@@ -54,10 +54,10 @@
// Test fixture that sets up an environment suitable for Scenic pixel tests
// and provides related utilities. The environment includes Scenic and
// RootPresenter, and their dependencies.
-class ScenicPixelTest : public component::testing::TestWithEnvironment {
+class ScenicPixelTest : public sys::testing::TestWithEnvironment {
protected:
ScenicPixelTest() {
- std::unique_ptr<component::testing::EnvironmentServices> services =
+ std::unique_ptr<sys::testing::EnvironmentServices> services =
CreateServices();
for (const auto& entry : kServices) {
@@ -147,7 +147,7 @@
fuchsia::ui::scenic::ScenicPtr scenic_;
private:
- std::unique_ptr<component::testing::EnclosingEnvironment> environment_;
+ std::unique_ptr<sys::testing::EnclosingEnvironment> environment_;
};
TEST_F(ScenicPixelTest, SolidColor) {
diff --git a/src/media/playback/mediaplayer/BUILD.gn b/src/media/playback/mediaplayer/BUILD.gn
index f28c0ee..9a20cb6 100644
--- a/src/media/playback/mediaplayer/BUILD.gn
+++ b/src/media/playback/mediaplayer/BUILD.gn
@@ -141,13 +141,13 @@
deps = [
":mediaplayer_bin",
"//garnet/public/lib/component/cpp",
- "//garnet/public/lib/component/cpp/testing",
"//garnet/public/lib/fsl",
"//garnet/public/lib/gtest",
"//garnet/public/lib/ui/base_view/cpp",
"//sdk/fidl/fuchsia.mediaplayer",
"//sdk/fidl/fuchsia.sys",
"//sdk/fidl/fuchsia.ui.views",
+ "//sdk/lib/sys/cpp/testing:integration",
"//sdk/lib/ui/scenic/cpp",
"//src/lib/url",
"//src/media/playback/mediaplayer/graph",
diff --git a/src/media/playback/mediaplayer/test/mediaplayer_tests.cc b/src/media/playback/mediaplayer/test/mediaplayer_tests.cc
index 0880444..25e863b 100644
--- a/src/media/playback/mediaplayer/test/mediaplayer_tests.cc
+++ b/src/media/playback/mediaplayer/test/mediaplayer_tests.cc
@@ -6,9 +6,8 @@
#include <fuchsia/mediaplayer/cpp/fidl.h>
#include <fuchsia/sys/cpp/fidl.h>
#include <fuchsia/ui/views/cpp/fidl.h>
+#include <lib/sys/cpp/testing/test_with_environment.h>
#include <queue>
-#include "lib/component/cpp/testing/test_util.h"
-#include "lib/component/cpp/testing/test_with_environment.h"
#include "lib/fsl/io/fd.h"
#include "lib/fxl/logging.h"
#include "lib/media/timeline/timeline_function.h"
@@ -32,7 +31,7 @@
constexpr char kBearFilePath[] = "/pkg/data/media_test_data/bear.mp4";
// Base class for mediaplayer tests.
-class MediaPlayerTests : public component::testing::TestWithEnvironment {
+class MediaPlayerTests : public sys::testing::TestWithEnvironment {
protected:
void SetUp() override {
auto services = CreateServices();
@@ -96,7 +95,7 @@
FakeAudio fake_audio_;
FakeScenic fake_scenic_;
fuchsia::ui::views::ViewHolderToken view_holder_token_;
- std::unique_ptr<component::testing::EnclosingEnvironment> environment_;
+ std::unique_ptr<sys::testing::EnclosingEnvironment> environment_;
bool sink_connection_closed_ = false;
SinkFeeder sink_feeder_;
CommandQueue commands_;
