From: Michal 'vorner' Vaner Date: Thu, 7 Feb 2013 09:59:53 +0000 (+0100) Subject: [1924] Combine the elementsEqual variants together X-Git-Tag: bind10-1.1.0beta1-release~104^2~22^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60b36bdabd4c052e5afaebc1a0d2ddd8eab637c2;p=thirdparty%2Fkea.git [1924] Combine the elementsEqual variants together One of them is a relict of previous tests and is no longer needed, so have only one. --- 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