commit 99f6c515448bbcc58dd145ef1fde32ce5902049c
author Yegor Pomortsev <ypomortsev@google.com> Fri Jan 18 17:00:50 2019 -0800
committer Yegor Pomortsev <ypomortsev@google.com> Fri Jan 18 17:04:40 2019 -0800
tree a68cc603e50c4ec571a3614266e26504d855e0e5
parent 97f70289dc2513e5d382732e8e32102f5d5c1194

[modular tests] Remove deprecated_bare_package_url in module_context

Test: run_integration_tests.sh module_context

MI4-1659 #done

Change-Id: I9a6ba3df714f8d576e1756a31fcb93aa124d5a2c

tests/module_context/BUILD.gn

diff --git a/tests/module_context/BUILD.gn b/tests/module_context/BUILD.gn
index 6eff94d..49a75ff 100644
--- a/tests/module_context/BUILD.gn
+++ b/tests/module_context/BUILD.gn
@@ -5,8 +5,6 @@
 import("//peridot/build/executable_package.gni")
 
 executable_package("module_context_test_session_shell") {
-  deprecated_bare_package_url = "//build"
-
   testonly = true
 
   meta = [
@@ -39,8 +37,6 @@
 }
 
 executable_package("module_context_test_module") {
-  deprecated_bare_package_url = "//build"
-
   testonly = true
 
   meta = [
@@ -69,8 +65,6 @@
 }
 
 executable_package("module_context_test_entity_module") {
-  deprecated_bare_package_url = "//build"
-
   testonly = true
 
   meta = [

tests/module_context/defs.h

diff --git a/tests/module_context/defs.h b/tests/module_context/defs.h
index 1e485ec..91f2334 100644
--- a/tests/module_context/defs.h
+++ b/tests/module_context/defs.h
@@ -20,6 +20,13 @@
 // The intent action |kModuleUrl| accepts.
 constexpr char kIntentAction[] = "action";
 
+// The URL for the entity test module.
+constexpr char kEntityModuleUrl[] =
+    "fuchsia-pkg://fuchsia.com/module_context_test_entity_module#meta/module_context_test_entity_module.cmx";
+
+// The intent action |kEntityModuleUrl| accepts.
+constexpr char kEntityIntentAction[] = "test";
+
 // The names of the first and second modules to be stopped.
 constexpr char kFirstModuleName[] = "first";
 constexpr char kSecondModuleName[] = "second";

tests/module_context/module_context_test_session_shell.cc

diff --git a/tests/module_context/module_context_test_session_shell.cc b/tests/module_context/module_context_test_session_shell.cc
index 54395b2..17f2238 100644
--- a/tests/module_context/module_context_test_session_shell.cc
+++ b/tests/module_context/module_context_test_session_shell.cc
@@ -105,8 +105,8 @@
     }
     {
       fuchsia::modular::Intent intent;
-      intent.handler = "module_context_test_entity_module";
-      intent.action = "test";
+      intent.handler = kEntityModuleUrl;
+      intent.action = kEntityIntentAction;
       fuchsia::modular::AddMod add_mod;
       add_mod.mod_name.push_back("entity_module");
       add_mod.intent = std::move(intent);
@@ -221,8 +221,8 @@
     Await(kEntityModuleDoneFirstTask, [this] {
       Await(kEntityModuleDoneSecondTask, [this] {
         fuchsia::modular::Intent intent;
-        intent.handler = "module_context_test_entity_module";
-        intent.action = "test";
+        intent.handler = kEntityModuleUrl;
+        intent.action = kEntityIntentAction;
         fuchsia::modular::RemoveMod remove_mod;
         remove_mod.mod_name.push_back("entity_module");