diff options
| author | James Feist <james.feist@linux.intel.com> | 2019-02-26 11:26:36 -0800 |
|---|---|---|
| committer | Patrick Venture <venture@google.com> | 2019-02-26 20:37:47 +0000 |
| commit | f81f28860b91727b03845381f7afcc5c93274d57 (patch) | |
| tree | c52db9764cc7cb7d81ddbbab8a252598a61c3883 /test | |
| parent | 3484bedaf611a106eeaf418b6cede2c2e42095c8 (diff) | |
| download | phosphor-pid-control-f81f28860b91727b03845381f7afcc5c93274d57.tar.gz phosphor-pid-control-f81f28860b91727b03845381f7afcc5c93274d57.zip | |
Expand conf namespace
Put rest of conf.hpp in the conf namespace. This is
largely a sed replace, and wrapping from_json in
conf namespace as it failed to build.
Change-Id: I9fe5c7b2fface44618c43af2367035afc39bcb64
Signed-off-by: James Feist <james.feist@linux.intel.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/dbus_passive_unittest.cpp | 4 | ||||
| -rw-r--r-- | test/pid_json_unittest.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/dbus_passive_unittest.cpp b/test/dbus_passive_unittest.cpp index 92a30af..2fc3471 100644 --- a/test/dbus_passive_unittest.cpp +++ b/test/dbus_passive_unittest.cpp @@ -29,7 +29,7 @@ TEST(DbusPassiveTest, FactoryFailsWithInvalidType) std::string id = "id"; DbusHelperMock helper; - auto info = SensorConfig(); + auto info = conf::SensorConfig(); std::unique_ptr<ReadInterface> ri = DbusPassive::createDbusPassive(bus_mock, type, id, &helper, &info); @@ -76,7 +76,7 @@ class DbusPassiveTestObj : public ::testing::Test EXPECT_CALL(helper, thresholdsAsserted(_, StrEq("asdf"), StrEq(path))) .WillOnce(Return(false)); - auto info = SensorConfig(); + auto info = conf::SensorConfig(); ri = DbusPassive::createDbusPassive(bus_mock, type, id, &helper, &info); passive = reinterpret_cast<DbusPassive*>(ri.get()); EXPECT_FALSE(passive == nullptr); diff --git a/test/pid_json_unittest.cpp b/test/pid_json_unittest.cpp index 098d9da..c8a1f61 100644 --- a/test/pid_json_unittest.cpp +++ b/test/pid_json_unittest.cpp @@ -8,8 +8,8 @@ TEST(ZoneFromJson, emptyZone) // There is a zone key, but it's empty. // This is technically invalid. - std::map<int64_t, PIDConf> pidConfig; - std::map<int64_t, struct ZoneConfig> zoneConfig; + std::map<int64_t, conf::PIDConf> pidConfig; + std::map<int64_t, struct conf::ZoneConfig> zoneConfig; auto j2 = R"( { @@ -27,8 +27,8 @@ TEST(ZoneFromJson, oneZoneOnePid) { // Parse a valid configuration with one zone and one PID. - std::map<int64_t, PIDConf> pidConfig; - std::map<int64_t, struct ZoneConfig> zoneConfig; + std::map<int64_t, conf::PIDConf> pidConfig; + std::map<int64_t, struct conf::ZoneConfig> zoneConfig; auto j2 = R"( { |
