From 6a1bf02ddba48a24dbbcecbacae2eaf3cfd51c75 Mon Sep 17 00:00:00 2001 From: Florent Rougon Date: Sun, 4 Dec 2016 20:15:56 +0100 Subject: [PATCH] Use appropriate test macros in parse_color_test.cxx and state_machine_test.cxx - osg::Vec4 objects can't be output to a stream -> use the _NOSTREAM variant of the test macro. - ditto for the NULL... thing -> use SG_CHECK_IS_NULL(). --- simgear/scene/util/parse_color_test.cxx | 2 +- simgear/structure/state_machine_test.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/simgear/scene/util/parse_color_test.cxx b/simgear/scene/util/parse_color_test.cxx index a08fdfc1..0998b2b0 100644 --- a/simgear/scene/util/parse_color_test.cxx +++ b/simgear/scene/util/parse_color_test.cxx @@ -10,7 +10,7 @@ #define VERIFY_COLOR(str, r, g, b, a) \ SG_VERIFY(simgear::parseColor(str, color)) \ - SG_CHECK_EQUAL(color, osg::Vec4(r, g, b, a)) + SG_CHECK_EQUAL_NOSTREAM(color, osg::Vec4(r, g, b, a)) #define VERIFY_NODE_STR(node, str) \ SG_CHECK_EQUAL(node.getStringValue(), std::string(str)) diff --git a/simgear/structure/state_machine_test.cxx b/simgear/structure/state_machine_test.cxx index b3402ed9..05d62645 100644 --- a/simgear/structure/state_machine_test.cxx +++ b/simgear/structure/state_machine_test.cxx @@ -128,7 +128,7 @@ void testBasic() SG_CHECK_EQUAL(sm->state()->name(), "b"); //////////////////////////////////////// - SG_CHECK_EQUAL(sm->findStateByName("foo"), NULL); + SG_CHECK_IS_NULL(sm->findStateByName("foo")); SG_CHECK_EQUAL(sm->indexOfState(StateMachine::State_ptr()), -1); SG_CHECK_EQUAL(sm->stateByIndex(1), stateB);