Simplified Guard class and supporting functions
Signed-off-by: Zane Shelley <zshelle@us.ibm.com>
Change-Id: I7a4b2298198c7aa9434c08dfa949081ed6437a53
diff --git a/test/resolution_test.cpp b/test/resolution_test.cpp
index 13c296a..0f1dfcd 100644
--- a/test/resolution_test.cpp
+++ b/test/resolution_test.cpp
@@ -33,13 +33,8 @@
callout["Priority"] = iv_priority.getUserDataString();
io_sd.addCallout(callout);
- Guard::Type guard = Guard::NONE;
- if (iv_guard)
- {
- guard = io_sd.queryCheckstop() ? Guard::FATAL : Guard::NON_FATAL;
- }
-
- io_sd.addGuard(std::make_shared<Guard>(path, guard));
+ // Add the guard info to the service data.
+ io_sd.addGuard(path, iv_guard);
}
//------------------------------------------------------------------------------
@@ -110,19 +105,6 @@
])";
ASSERT_EQ(s, j.dump(4));
- sd1.getGuardList(j);
- s = R"([
- {
- "Path": "/proc0",
- "Type": "NONE"
- },
- {
- "Path": "/proc0/pib/perv12/mc0/mi0/mcc0/omi0",
- "Type": "FATAL"
- }
-])";
- ASSERT_EQ(s, j.dump(4));
-
j = sd2.getCalloutList();
s = R"([
{
@@ -143,21 +125,4 @@
}
])";
ASSERT_EQ(s, j.dump(4));
-
- sd2.getGuardList(j);
- s = R"([
- {
- "Path": "/proc0/pib/perv39/eq7/fc1/core1",
- "Type": "NON_FATAL"
- },
- {
- "Path": "/proc0",
- "Type": "NONE"
- },
- {
- "Path": "/proc0/pib/perv12/mc0/mi0/mcc0/omi0",
- "Type": "NON_FATAL"
- }
-])";
- ASSERT_EQ(s, j.dump(4));
}