commit 8b3e536d384885e0de9f2899b8be6007b27ad6fa
author Ankur Mittal <anmittal@google.com> Thu Mar 21 02:27:09 2019 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Thu Mar 21 02:27:09 2019 +0000
tree e0088c10c4060e98b51c2954682b49567e3da5ea
parent 3243dd514ba741d3b3097cfa975f3d3378895d8e

[sessionctl] Port tests to use libsys

DX-387 #comment

TEST=CQ

Change-Id: I08857501ae3bbfa22a2a2eec652bf58bc40e07ec

peridot/tests/sessionctl/BUILD.gn

diff --git a/peridot/tests/sessionctl/BUILD.gn b/peridot/tests/sessionctl/BUILD.gn
index baad0be..77bdfb7 100644
--- a/peridot/tests/sessionctl/BUILD.gn
+++ b/peridot/tests/sessionctl/BUILD.gn
@@ -14,8 +14,6 @@
   ]
 
   deps = [
-    "//garnet/public/lib/component/cpp",
-    "//garnet/public/lib/component/cpp/testing",
     "//garnet/public/lib/fxl",
     "//garnet/public/lib/fxl/test:gtest_main",
     "//garnet/public/lib/test_runner/cpp",
@@ -25,6 +23,7 @@
     "//sdk/fidl/fuchsia.modular.internal",
     "//sdk/fidl/fuchsia.sys",
     "//sdk/fidl/fuchsia.testing.runner",
+    "//sdk/lib/sys/cpp/testing:integration",
     "//third_party/googletest:gtest",
   ]
 }

peridot/tests/sessionctl/sessionctl_test.cc

diff --git a/peridot/tests/sessionctl/sessionctl_test.cc b/peridot/tests/sessionctl/sessionctl_test.cc
index d443fa0..0f9e73e 100644
--- a/peridot/tests/sessionctl/sessionctl_test.cc
+++ b/peridot/tests/sessionctl/sessionctl_test.cc
@@ -6,21 +6,19 @@
 #include <fuchsia/modular/internal/cpp/fidl.h>
 #include <fuchsia/sys/cpp/fidl.h>
 #include <lib/async/default.h>
+#include <lib/fxl/strings/join_strings.h>
+#include <lib/sys/cpp/testing/test_with_environment.h>
 
-#include "lib/component/cpp/environment_services_helper.h"
-#include "lib/component/cpp/testing/test_util.h"
-#include "lib/component/cpp/testing/test_with_environment.h"
 #include "src/lib/files/directory.h"
 #include "src/lib/files/file.h"
 #include "src/lib/files/glob.h"
-#include "lib/fxl/strings/join_strings.h"
 
 #include "gtest/gtest.h"
 #include "peridot/bin/sessionctl/session_ctl_constants.h"
 
 namespace sessionctl {
 
-class SessionCtlTest : public component::testing::TestWithEnvironment {
+class SessionCtlTest : public sys::testing::TestWithEnvironment {
  protected:
   void RunBasemgr() {
     std::vector<std::string> args;