diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2010-01-28 11:32:39 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-01-05 17:17:46 +0100 |
| commit | 271c7cabf5e16a1afed560b9f707b3955b3ec725 (patch) | |
| tree | 026b6678c6973205e32698af795830d58c5121d6 /test | |
| parent | 2adaea29500b412c342838e22df2f8b4ac2eb02d (diff) | |
| download | usdx-271c7cabf5e16a1afed560b9f707b3955b3ec725.tar.gz usdx-271c7cabf5e16a1afed560b9f707b3955b3ec725.tar.xz usdx-271c7cabf5e16a1afed560b9f707b3955b3ec725.zip | |
converted all strings and chars to wstrings and wchar_ts
all strings with displayable content are now the wide strings for
proper
unicode handling
added boost dependency for proper reading unicode from files
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile | 2 | ||||
| -rw-r--r-- | test/base/songloading.cpp | 25 |
2 files changed, 13 insertions, 14 deletions
diff --git a/test/Makefile b/test/Makefile index c9360cfe..a9dd4e9b 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,5 +1,5 @@ CXXFLAGS:=-Wall -Werror -lcppunit -I../src/ -I../src/base -I../src/menu -I../src/media -I../src/screens -g -LDFLAGS:=-lsqlite3 -lSDL -llog4cxx +LDFLAGS:=-lsqlite3 -lSDL -llog4cxx -lboost_program_options-mt PROJECT:=usdx-tests TARGET:=$(PROJECT) diff --git a/test/base/songloading.cpp b/test/base/songloading.cpp index e8fd1bde..9f7fcb47 100644 --- a/test/base/songloading.cpp +++ b/test/base/songloading.cpp @@ -62,22 +62,23 @@ namespace usdx void testSongloadingTxtHeader() { Song *song = Songloader::get_instance()->load_header("testdata/testsong_correct.txt"); - - CPPUNIT_ASSERT( "Test Ärtist" == song->get_artist() ); - CPPUNIT_ASSERT( "Test Title" == song->get_title() ); - CPPUNIT_ASSERT( "Test.mp3" == song->get_mp3() ); + + CPPUNIT_ASSERT( L"Test Ärtist" == song->get_artist() ); + CPPUNIT_ASSERT( 11 == song->get_artist().length() ); + CPPUNIT_ASSERT( L"Test Title" == song->get_title() ); + CPPUNIT_ASSERT( L"Test.mp3" == song->get_mp3() ); CPPUNIT_ASSERT( 42.23f == song->get_bpm(0) ); - CPPUNIT_ASSERT( 42.23f == song->get_bpm(10) ); + CPPUNIT_ASSERT( 42.23f == song->get_bpm(10) ); CPPUNIT_ASSERT( 10 == song->get_gap() ); - CPPUNIT_ASSERT( "Test[BG].jpg" == song->get_background() ); - CPPUNIT_ASSERT( "Test[CO].jpg" == song->get_cover() ); - CPPUNIT_ASSERT( "Test Genre" == song->get_genre() ); + CPPUNIT_ASSERT( L"Test[BG].jpg" == song->get_background() ); + CPPUNIT_ASSERT( L"Test[CO].jpg" == song->get_cover() ); + CPPUNIT_ASSERT( L"Test Genre" == song->get_genre() ); CPPUNIT_ASSERT( false == song->get_relative() ); - CPPUNIT_ASSERT( "Cpp" == song->get_language() ); - CPPUNIT_ASSERT( "Test[VD#12,3].mkv" == song->get_video() ); + CPPUNIT_ASSERT( L"Cpp" == song->get_language() ); + CPPUNIT_ASSERT( L"Test[VD#12,3].mkv" == song->get_video() ); CPPUNIT_ASSERT( 12.3f == song->get_video_gap() ); CPPUNIT_ASSERT( 0 == song->get_start() ); - CPPUNIT_ASSERT( "Test0r" == song->get_creator() ); + CPPUNIT_ASSERT( L"Test0r" == song->get_creator() ); CPPUNIT_ASSERT( 7 == song->get_year() ); CPPUNIT_ASSERT( 666 == song->get_stop() ); CPPUNIT_ASSERT( 0 == song->get_notes_gap() ); @@ -131,8 +132,6 @@ namespace usdx Songloader::get_instance()-> load_header("testdata/testsong_missing_bpm.txt"); } - - }; CPPUNIT_TEST_SUITE_REGISTRATION(SongloadingTest); |