FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use appropriate test macros in parse_color_test.cxx and state_machine_test.cxx

Browse Source 
- 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().
This commit is contained in:
Florent Rougon
2016-12-04 22:41:12 +01:00
parent 6662800deb
commit 6a1bf02ddb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/util/parse_color_test.cxx
+1 -1
View File
@@ -10,7 +10,7 @@
#define VERIFY_COLOR(str, r, g, b, a) \ #define VERIFY_COLOR(str, r, g, b, a) \
SG_VERIFY(simgear::parseColor(str, color)) \ 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) \ #define VERIFY_NODE_STR(node, str) \
SG_CHECK_EQUAL(node.getStringValue(), std::string(str)) SG_CHECK_EQUAL(node.getStringValue(), std::string(str))
simgear/structure/state_machine_test.cxx
+1 -1
View File
@@ -128,7 +128,7 @@ void testBasic()
SG_CHECK_EQUAL(sm->state()->name(), "b"); 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->indexOfState(StateMachine::State_ptr()), -1);
SG_CHECK_EQUAL(sm->stateByIndex(1), stateB); SG_CHECK_EQUAL(sm->stateByIndex(1), stateB);