diff options
Diffstat (limited to 'desktop/qa/desktop_lib/test_desktop_lib.cxx')
| -rw-r--r-- | desktop/qa/desktop_lib/test_desktop_lib.cxx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 7a52bee8c6fa..71ce50b5d301 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -1169,15 +1169,22 @@ namespace { // separator doesn't have any other attribs if ( aType.get().data() == "separator" ) { - CPPUNIT_ASSERT( !aText && !aCommand && !aSubmenu && !aEnabled && !aChecktype && !aChecked ); + CPPUNIT_ASSERT( !aText ); + CPPUNIT_ASSERT( !aCommand ); + CPPUNIT_ASSERT( !aSubmenu ); + CPPUNIT_ASSERT( !aEnabled ); + CPPUNIT_ASSERT( !aChecktype ); + CPPUNIT_ASSERT( !aChecked ); } else if ( aType.get().data() == "command" ) { - CPPUNIT_ASSERT( aCommand && aText ); + CPPUNIT_ASSERT( aCommand ); + CPPUNIT_ASSERT( aText ); } else if ( aType.get().data() == "menu") { - CPPUNIT_ASSERT( aSubmenu && aText ); + CPPUNIT_ASSERT( aSubmenu ); + CPPUNIT_ASSERT( aText ); verifyContextMenuStructure( aSubmenu.get() ); } @@ -1187,8 +1194,8 @@ namespace { aChecktype.get().data() == "checkmark" || aChecktype.get().data() == "auto" ); - CPPUNIT_ASSERT( aChecked && - ( aChecked.get().data() == "true" || aChecked.get().data() == "false" ) ); + CPPUNIT_ASSERT( aChecked ); + CPPUNIT_ASSERT( aChecked.get().data() == "true" || aChecked.get().data() == "false" ); } } |