Commit bb7465ef authored by Thomas Markwalder's avatar Thomas Markwalder
Browse files

[master] Corrected a build failure under Googletest 1.4

in D2 unit test.
parent 465c3330
...@@ -608,11 +608,12 @@ public: ...@@ -608,11 +608,12 @@ public:
try { try {
config_set_ = isc::data::Element::fromJSON(json_text); config_set_ = isc::data::Element::fromJSON(json_text);
} catch (const isc::Exception &ex) { } catch (const isc::Exception &ex) {
return ::testing::AssertionFailure() return (::testing::AssertionFailure(::testing::Message() <<
<< "JSON text failed to parse:" << ex.what(); "JSON text failed to parse:"
<< ex.what()));
} }
return ::testing::AssertionSuccess(); return (::testing::AssertionSuccess());
} }
...@@ -628,11 +629,12 @@ public: ...@@ -628,11 +629,12 @@ public:
isc::data::ConstElementPtr comment; isc::data::ConstElementPtr comment;
comment = isc::config::parseAnswer(rcode, answer_); comment = isc::config::parseAnswer(rcode, answer_);
if (rcode == should_be) { if (rcode == should_be) {
return testing::AssertionSuccess(); return (testing::AssertionSuccess());
} }
return ::testing::AssertionFailure() << "checkAnswer rcode:" return (::testing::AssertionFailure(::testing::Message() <<
<< rcode << " comment: " << *comment; "checkAnswer rcode:" << rcode
<< " comment: " << *comment));
} }
/// @brief Configuration set being tested. /// @brief Configuration set being tested.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment