perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Unit tests update

This commit is contained in:
Markus Gans 2018-03-01 00:00:30 +01:00
parent 74629b9ffb
commit f42175c8da
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fstring.cpp
View File

@ -1700,6 +1700,9 @@ bool FString::operator >= (const char c) const
//---------------------------------------------------------------------- //----------------------------------------------------------------------
bool FString::operator > (const FString& s) const bool FString::operator > (const FString& s) const
{ {
if ( ! (string || s.string) )
return false;
if ( ! s ) if ( ! s )
return true; return true;
@ -1709,9 +1712,6 @@ bool FString::operator > (const FString& s) const
if ( ! string && s.string ) if ( ! string && s.string )
return false; return false;
if ( ! (string || s.string) )
return false;
return ( std::wcscmp(string, s.string) > 0 ); return ( std::wcscmp(string, s.string) > 0 );
} }

2
src/test/fstring-test.cpp
View File

@ -141,7 +141,7 @@ void FStringTest::NoArgumentTest()
CPPUNIT_ASSERT ( ! empty.includes(std::wstring(L"123")) ); CPPUNIT_ASSERT ( ! empty.includes(std::wstring(L"123")) );
CPPUNIT_ASSERT ( ! empty.includes(FString("123")) ); CPPUNIT_ASSERT ( ! empty.includes(FString("123")) );
std::stringstream out; std::ostringstream out;
out << empty; out << empty;
CPPUNIT_ASSERT ( out.str() == "" ); CPPUNIT_ASSERT ( out.str() == "" );