soma: Expose name via ReadOnlyContainerSpec
Whoops.
BUG=brillo:730
TEST=unit
Change-Id: I9e0e9da16bd15182881f7c623cc04380c0b114b1
Reviewed-on: https://chromium-review.googlesource.com/264067
Trybot-Ready: Chris Masone <cmasone@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>
Reviewed-by: Dan Erat <derat@chromium.org>
Commit-Queue: Chris Masone <cmasone@chromium.org>
diff --git a/soma/lib/soma/read_only_container_spec.cc b/soma/lib/soma/read_only_container_spec.cc
index f8a09b3..ce1a713 100644
--- a/soma/lib/soma/read_only_container_spec.cc
+++ b/soma/lib/soma/read_only_container_spec.cc
@@ -67,6 +67,10 @@
ReadOnlyContainerSpec::~ReadOnlyContainerSpec() {}
+const std::string& ReadOnlyContainerSpec::name() const {
+ return internal_->name();
+}
+
uid_t ReadOnlyContainerSpec::uid() const { return internal_->uid(); }
gid_t ReadOnlyContainerSpec::gid() const { return internal_->gid(); }
diff --git a/soma/lib/soma/read_only_container_spec.h b/soma/lib/soma/read_only_container_spec.h
index 8cd92f0..80fea23 100644
--- a/soma/lib/soma/read_only_container_spec.h
+++ b/soma/lib/soma/read_only_container_spec.h
@@ -38,6 +38,8 @@
explicit ReadOnlyContainerSpec(const ContainerSpec* spec);
virtual ~ReadOnlyContainerSpec();
+ const std::string& name() const;
+
const base::FilePath& service_bundle_path() const {
return service_bundle_path_;
}
diff --git a/soma/lib/soma/read_only_container_spec_unittest.cc b/soma/lib/soma/read_only_container_spec_unittest.cc
index 9ac978a..2cc8656 100644
--- a/soma/lib/soma/read_only_container_spec_unittest.cc
+++ b/soma/lib/soma/read_only_container_spec_unittest.cc
@@ -27,11 +27,13 @@
};
TEST_F(ReadOnlyContainerSpecTest, RequiredFieldsTest) {
- const char service_bundle_path[] = "/path/to/bundle.json";
+ const char fully_qualified_spec_name[] = "/path/to/spec.json";
+ const char service_bundle_path[] = "/path/to/bundle";
const uid_t uid = 1;
const gid_t gid = 8;
const char* command_line[2] = { "command", "arg1" };
+ spec_.set_name(fully_qualified_spec_name);
spec_.set_service_bundle_path(service_bundle_path);
spec_.set_uid(uid);
spec_.set_gid(gid);
@@ -39,6 +41,7 @@
spec_.add_command_line(command_line[1]);
ReadOnlyContainerSpec ro_spec(&spec_);
+ EXPECT_EQ(ro_spec.name(), fully_qualified_spec_name);
EXPECT_EQ(ro_spec.service_bundle_path().value(), service_bundle_path);
EXPECT_EQ(ro_spec.uid(), uid);
EXPECT_EQ(ro_spec.gid(), gid);