summaryrefslogtreecommitdiffstats
path: root/src/lib/cc
diff options
context:
space:
mode:
authorMichal 'vorner' Vaner <michal.vaner@nic.cz>2013-02-07 10:59:53 +0100
committerMichal 'vorner' Vaner <michal.vaner@nic.cz>2013-02-07 10:59:53 +0100
commit60b36bdabd4c052e5afaebc1a0d2ddd8eab637c2 (patch)
tree6345a28ecf795664ad2d7930284471623d814588 /src/lib/cc
parent[1924] Get rid of IO test code (diff)
downloadkea-60b36bdabd4c052e5afaebc1a0d2ddd8eab637c2.tar.xz
kea-60b36bdabd4c052e5afaebc1a0d2ddd8eab637c2.zip
[1924] Combine the elementsEqual variants together
One of them is a relict of previous tests and is no longer needed, so have only one.
Diffstat (limited to 'src/lib/cc')
-rw-r--r--src/lib/cc/tests/session_unittests.cc14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/lib/cc/tests/session_unittests.cc b/src/lib/cc/tests/session_unittests.cc
index 0e47d2fa23..8859bfb03b 100644
--- a/src/lib/cc/tests/session_unittests.cc
+++ b/src/lib/cc/tests/session_unittests.cc
@@ -174,20 +174,12 @@ protected:
}
// Check two elements are equal
- void elementsEqual(const ConstElementPtr& expected,
- const ConstElementPtr& actual)
- {
- EXPECT_TRUE(expected->equals(*actual)) <<
- "Elements differ, expected: " << expected->toWire() <<
- ", got: " << actual->toWire();
- }
-
- // The same, but with one specified as string
void elementsEqual(const string& expected,
const ConstElementPtr& actual)
{
- const ConstElementPtr expected_el(Element::fromJSON(expected));
- elementsEqual(expected_el, actual);
+ EXPECT_TRUE(Element::fromJSON(expected)->equals(*actual)) <<
+ "Elements differ, expected: " << expected <<
+ ", got: " << actual->toWire();
}
// Check the session sent a message with the given header. The