diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2012-03-26 02:26:40 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-01-13 22:40:52 +0100 |
| commit | a5e90892da7de8f10dae70b75f1fb51587eaf8db (patch) | |
| tree | 42f9f092375e65a3b0228aed87865d9bedded2de /test/base/songloading.cpp | |
| parent | 9bd2b5f28805c9a5d0df28f6323b4c895e3fd9f4 (diff) | |
| download | usdx-a5e90892da7de8f10dae70b75f1fb51587eaf8db.tar.gz usdx-a5e90892da7de8f10dae70b75f1fb51587eaf8db.tar.xz usdx-a5e90892da7de8f10dae70b75f1fb51587eaf8db.zip | |
tests: changed CPPUNIT_ASSERT to CPPUNIT_ASSERT_EQUAL for better error msgs
Diffstat (limited to 'test/base/songloading.cpp')
| -rw-r--r-- | test/base/songloading.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/test/base/songloading.cpp b/test/base/songloading.cpp index 03824669..614fb22d 100644 --- a/test/base/songloading.cpp +++ b/test/base/songloading.cpp @@ -62,28 +62,28 @@ namespace usdx { Song *song = Songloader::get_instance()->load_header("testdata/testsong_correct.txt"); - CPPUNIT_ASSERT( "Test Ärtist" == song->get_artist() ); + CPPUNIT_ASSERT_EQUAL(std::string("Test Ärtist"), song->get_artist()); // FIXIT: unicode length is not counted correctly - // CPPUNIT_ASSERT( 11 == song->get_artist().length() ); - CPPUNIT_ASSERT( "Test Title" == song->get_title() ); - CPPUNIT_ASSERT( "Test.mp3" == song->get_mp3() ); - CPPUNIT_ASSERT( 42.23f == song->get_bpm(0) ); - 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_file() ); - CPPUNIT_ASSERT( "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( 12.3f == song->get_video_gap() ); - CPPUNIT_ASSERT( 0 == song->get_start() ); - CPPUNIT_ASSERT( "Test0r" == song->get_creator() ); - CPPUNIT_ASSERT( 7 == song->get_year() ); - CPPUNIT_ASSERT( 666 == song->get_stop() ); - CPPUNIT_ASSERT( 0 == song->get_notes_gap() ); + // CPPUNIT_ASSERT_EQUAL(11, song->get_artist().length()); + CPPUNIT_ASSERT_EQUAL(std::string("Test Title"), song->get_title()); + CPPUNIT_ASSERT_EQUAL(std::string("Test.mp3"), song->get_mp3()); + CPPUNIT_ASSERT_EQUAL(42.23f, song->get_bpm(0)); + CPPUNIT_ASSERT_EQUAL(42.23f, song->get_bpm(10)); + CPPUNIT_ASSERT_EQUAL(10.0f, song->get_gap()); + CPPUNIT_ASSERT_EQUAL(std::string("Test[BG].jpg"), song->get_background()); + CPPUNIT_ASSERT_EQUAL(std::string("Test[CO].jpg"), song->get_cover_file()); + CPPUNIT_ASSERT_EQUAL(std::string("Test Genre"), song->get_genre()); + CPPUNIT_ASSERT_EQUAL(false, song->get_relative()); + CPPUNIT_ASSERT_EQUAL(std::string("Cpp"), song->get_language()); + CPPUNIT_ASSERT_EQUAL(std::string("Test[VD#12,3].mkv"), song->get_video()); + CPPUNIT_ASSERT_EQUAL(12.3f, song->get_video_gap()); + CPPUNIT_ASSERT_EQUAL(0.0f, song->get_start()); + CPPUNIT_ASSERT_EQUAL(std::string("Test0r"), song->get_creator()); + CPPUNIT_ASSERT_EQUAL(7, song->get_year()); + CPPUNIT_ASSERT_EQUAL(666, song->get_stop()); + CPPUNIT_ASSERT_EQUAL(0, song->get_notes_gap()); // TODO - //CPPUNIT_ASSERT( UTF-8 == song->get_encodeing() ); + //CPPUNIT_ASSERT_EQUAL(UTF-8, song->get_encodeing()); delete song; } |