From a5e90892da7de8f10dae70b75f1fb51587eaf8db Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Mon, 26 Mar 2012 02:26:40 +0200 Subject: tests: changed CPPUNIT_ASSERT to CPPUNIT_ASSERT_EQUAL for better error msgs --- test/base/songloading.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'test/base/songloading.cpp') 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; } -- cgit v1.2.3