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-08 17:57:17 +01:00
parent a0bf6bd00c
commit 27cefbf99b
2 changed files with 89 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/fstring.cpp
View File

@ -1834,6 +1834,9 @@ FString FString::replace (const FString& from, const FString& to)
if ( from.isNull() || to.isNull() ) if ( from.isNull() || to.isNull() )
return s; return s;
if ( from.isEmpty() || to.isEmpty() )
return s;
p = s.string; p = s.string;
from_length = from.getLength(); from_length = from.getLength();
to_length = to.getLength(); to_length = to.getLength();
@ -2132,7 +2135,7 @@ FString FString::replace (const wchar_t from, const FString& to)
if ( ! (string && *string) ) if ( ! (string && *string) )
return s; return s;
if ( to.isNull() ) if ( to.isNull() || to.isEmpty() )
return s; return s;
p = s.string; p = s.string;
@ -2322,7 +2325,10 @@ FString FString::expandTabs (int tabstop) const
{ {
uInt len = tab_split[i].getLength(); uInt len = tab_split[i].getLength();
uInt tab_len = uInt(tabstop); uInt tab_len = uInt(tabstop);
outstr += tab_split[i] + FString(tab_len - (len % tab_len), L' '); if ( i == last - 1 )
outstr += tab_split[i];
else
outstr += tab_split[i] + FString(tab_len - (len % tab_len), L' ');
} }
return outstr; return outstr;

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

@ -83,6 +83,7 @@ class FStringTest : public CPPUNIT_NS::TestFixture
void subStringTest(); void subStringTest();
void insertTest(); void insertTest();
void replaceTest(); void replaceTest();
void controlCodesTest();
private: private:
FString* s; FString* s;
@ -115,6 +116,7 @@ class FStringTest : public CPPUNIT_NS::TestFixture
CPPUNIT_TEST (subStringTest); CPPUNIT_TEST (subStringTest);
CPPUNIT_TEST (insertTest); CPPUNIT_TEST (insertTest);
CPPUNIT_TEST (replaceTest); CPPUNIT_TEST (replaceTest);
CPPUNIT_TEST (controlCodesTest);
// End of test suite definition // End of test suite definition
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
@ -436,32 +438,13 @@ void FStringTest::additionAssignmentTest()
void FStringTest::additionTest() void FStringTest::additionTest()
{ {
const FString s1("abc"); const FString s1("abc");
FString s2 = s1 + FString("def"); CPPUNIT_ASSERT ( s1 + FString("def") == L"abcdef" );
CPPUNIT_ASSERT ( s2 == L"abcdef" ); CPPUNIT_ASSERT ( s1 + std::wstring(L"def") == L"abcdef" );
CPPUNIT_ASSERT ( s1 + const_cast<wchar_t*>(L"def") == L"abcdef" );
s2.clear(); CPPUNIT_ASSERT ( s1 + std::string("def") == L"abcdef" );
s2 = s1 + std::wstring(L"def"); CPPUNIT_ASSERT ( s1 + const_cast<char*>("def") == L"abcdef" );
CPPUNIT_ASSERT ( s2 == L"abcdef" ); CPPUNIT_ASSERT ( s1 + wchar_t(L'd') == L"abcd" );
CPPUNIT_ASSERT ( s1 + char('d') == L"abcd" );
s2.clear();
s2 = s1 + const_cast<wchar_t*>(L"def");
CPPUNIT_ASSERT ( s2 == L"abcdef" );
s2.clear();
s2 = s1 + std::string("def");
CPPUNIT_ASSERT ( s2 == L"abcdef" );
s2.clear();
s2 = s1 + const_cast<char*>("def");
CPPUNIT_ASSERT ( s2 == L"abcdef" );
s2.clear();
s2 = s1 + wchar_t(L'd');
CPPUNIT_ASSERT ( s2 == L"abcd" );
s2.clear();
s2 = s1 + char('d');
CPPUNIT_ASSERT ( s2 == L"abcd" );
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -919,8 +902,11 @@ void FStringTest::formatTest()
fnum2.setFormatedNumber(-9223372036854775807); fnum2.setFormatedNumber(-9223372036854775807);
CPPUNIT_ASSERT ( fnum2 == "-9 223 372 036 854 775 807" ); CPPUNIT_ASSERT ( fnum2 == "-9 223 372 036 854 775 807" );
fnum2.setFormatedNumber(-9223372036854775807, '\0'); fnum2.setFormatedNumber(long(9223372036854775807), '\0');
CPPUNIT_ASSERT ( fnum2 == "-9 223 372 036 854 775 807" ); CPPUNIT_ASSERT ( fnum2 == "9 223 372 036 854 775 807" );
fnum2.setFormatedNumber(uLong(9223372036854775807), '\0');
CPPUNIT_ASSERT ( fnum2 == "9 223 372 036 854 775 807" );
#else #else
// 32-bit architecture // 32-bit architecture
fnum1.setFormatedNumber(0xffffffff, '\''); fnum1.setFormatedNumber(0xffffffff, '\'');
@ -929,8 +915,11 @@ void FStringTest::formatTest()
fnum2.setFormatedNumber(-2147483647); fnum2.setFormatedNumber(-2147483647);
CPPUNIT_ASSERT ( fnum2 == "-2 147 483 647" ); CPPUNIT_ASSERT ( fnum2 == "-2 147 483 647" );
fnum2.setFormatedNumber(-2147483647, '\0'); fnum2.setFormatedNumber(long(2147483647), '\0');
CPPUNIT_ASSERT ( fnum2 == "-2 147 483 647" ); CPPUNIT_ASSERT ( fnum2 == "2 147 483 647" );
fnum2.setFormatedNumber(uLong(2147483647), '\0');
CPPUNIT_ASSERT ( fnum2 == "2 147 483 647" );
#endif #endif
} }
@ -1433,6 +1422,68 @@ void FStringTest::replaceTest()
s = "A big ball and a small ball"; s = "A big ball and a small ball";
CPPUNIT_ASSERT ( s.replace("ball", "globe") CPPUNIT_ASSERT ( s.replace("ball", "globe")
== "A big globe and a small globe" ); == "A big globe and a small globe" );
s = "ABC";
FString empty;
CPPUNIT_ASSERT ( s.replace(from1, empty) == "ABC" );
CPPUNIT_ASSERT ( s.replace(from3, empty) == "ABC" );
CPPUNIT_ASSERT ( s.replace(from5, to5) == "ABC" );
CPPUNIT_ASSERT ( s.replace(empty, to1) == "ABC" );
empty = "";
CPPUNIT_ASSERT ( s.replace(from1, empty) == "ABC" );
CPPUNIT_ASSERT ( s.replace(from3, empty) == "ABC" );
CPPUNIT_ASSERT ( s.replace(from5, to5) == "ABC" );
CPPUNIT_ASSERT ( s.replace(empty, to1) == "ABC" );
s.clear();
CPPUNIT_ASSERT ( s.replace(from1, to1).isNull() );
CPPUNIT_ASSERT ( s.replace(from1, to1).isEmpty() );
CPPUNIT_ASSERT ( s.replace(from5, to5).isNull() );
CPPUNIT_ASSERT ( s.replace(from5, to5).isEmpty() );
}
//----------------------------------------------------------------------
void FStringTest::controlCodesTest()
{
FString bs_str = "t\b\bTesT\bt";
CPPUNIT_ASSERT ( bs_str.removeBackspaces() == "Test" );
bs_str = "ABC\b\b\b\b";
CPPUNIT_ASSERT ( bs_str.removeBackspaces() == "" );
CPPUNIT_ASSERT ( bs_str.removeBackspaces().isEmpty() );
FString del_str = "apple \177\177\177pietree";
CPPUNIT_ASSERT ( del_str.removeDel() == "apple tree" );
del_str = "\177\177\177\177ABC";
CPPUNIT_ASSERT ( del_str.removeDel() == "" );
CPPUNIT_ASSERT ( del_str.removeDel().isEmpty() );
FString tab_str = "one line";
CPPUNIT_ASSERT ( tab_str.expandTabs() == "one line" );
tab_str = "one\ttwo";
CPPUNIT_ASSERT ( tab_str.expandTabs() == "one two" );
tab_str = "one\t\btwo";
CPPUNIT_ASSERT ( tab_str.expandTabs() == "one \btwo" );
tab_str = "1\t2\t2";
CPPUNIT_ASSERT ( tab_str.expandTabs() == "1 2 2" );
tab_str = "12\t22\t2";
CPPUNIT_ASSERT ( tab_str.expandTabs() == "12 22 2" );
tab_str = "123\t222\t2";
CPPUNIT_ASSERT ( tab_str.expandTabs() == "123 222 2" );
tab_str = "1234\t2222\t2";
CPPUNIT_ASSERT ( tab_str.expandTabs() == "1234 2222 2" );
tab_str = "12345\t22222\t2";
CPPUNIT_ASSERT ( tab_str.expandTabs() == "12345 22222 2" );
tab_str = "123456\t222222\t2";
CPPUNIT_ASSERT ( tab_str.expandTabs() == "123456 222222 2" );
tab_str = "1234567\t2222222\t2";
CPPUNIT_ASSERT ( tab_str.expandTabs() == "1234567 2222222 2" );
tab_str = "12345678\t22222222\t2";
CPPUNIT_ASSERT ( tab_str.expandTabs()
== "12345678 22222222 2" );
tab_str = "12345678\t2";
std::cout << "\n<<" << tab_str.expandTabs() << ">>\n";
CPPUNIT_ASSERT ( tab_str.expandTabs() == "12345678 2" );
} }
// Put the test suite in the registry // Put the test suite in the registry