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/ringbuffer.cpp | 58 +++++++++++++++++++++++------------------------ test/base/songloading.cpp | 40 ++++++++++++++++---------------- 2 files changed, 49 insertions(+), 49 deletions(-) (limited to 'test/base') diff --git a/test/base/ringbuffer.cpp b/test/base/ringbuffer.cpp index 99631108..73c85d65 100644 --- a/test/base/ringbuffer.cpp +++ b/test/base/ringbuffer.cpp @@ -63,7 +63,7 @@ namespace usdx // negative value when the given buffer is NULL void testReadNullBuffer() { - CPPUNIT_ASSERT( -1 == rbuff->read(NULL,10) ); + CPPUNIT_ASSERT_EQUAL(-1, rbuff->read(NULL,10)); } // check if the read function reports an error in form of a @@ -71,21 +71,21 @@ namespace usdx void testReadNegativeCount() { char buffer[10]; - CPPUNIT_ASSERT( -1 == rbuff->read(buffer,-1) ); + CPPUNIT_ASSERT_EQUAL(-1, rbuff->read(buffer,-1)); } // check the returnvalue when reading on a empty ringbuffer void testReadEmptyRingBuffer() { char buffer[10]; - CPPUNIT_ASSERT( 0 == rbuff->read(buffer,10) ); + CPPUNIT_ASSERT_EQUAL(0, rbuff->read(buffer,10)); } // check in the read function reports an error in form of a // negative value when the given buffer is NULL void testWriteNullBuffer() { - CPPUNIT_ASSERT( -1 == rbuff->write(NULL,10) ); + CPPUNIT_ASSERT_EQUAL(-1, rbuff->write(NULL,10)); } // check if the read function reports an error in form of a @@ -93,7 +93,7 @@ namespace usdx void testWriteNegativeCount() { char buffer[10]; - CPPUNIT_ASSERT( -1 == rbuff->write(buffer,-1) ); + CPPUNIT_ASSERT_EQUAL(-1, rbuff->write(buffer,-1)); } // checks the retrunvalue when writeing over the limits of a @@ -101,7 +101,7 @@ namespace usdx void testWriteOverflow() { char buffer[20]; - CPPUNIT_ASSERT( 0 == rbuff->read(buffer,20) ); + CPPUNIT_ASSERT_EQUAL(0, rbuff->read(buffer,20)); } // check if the read value is ajusted correctly, when @@ -111,12 +111,12 @@ namespace usdx char w1Buffer[4]="AAA"; char w2Buffer[4]="BBB"; char rBuffer[7]="CCCCCC"; - CPPUNIT_ASSERT( 3 == rbuff->write(w1Buffer,3) ); - CPPUNIT_ASSERT( 3 == rbuff->write(w1Buffer,3) ); - CPPUNIT_ASSERT( 3 == rbuff->write(w1Buffer,3) ); - CPPUNIT_ASSERT( 4 == rbuff->write(w2Buffer,4) ); - CPPUNIT_ASSERT( 6 == rbuff->read(rBuffer,6) ); - CPPUNIT_ASSERT( 0 == strcmp("AAAAAA",rBuffer) ); + CPPUNIT_ASSERT_EQUAL(3, rbuff->write(w1Buffer,3)); + CPPUNIT_ASSERT_EQUAL(3, rbuff->write(w1Buffer,3)); + CPPUNIT_ASSERT_EQUAL(3, rbuff->write(w1Buffer,3)); + CPPUNIT_ASSERT_EQUAL(4, rbuff->write(w2Buffer,4)); + CPPUNIT_ASSERT_EQUAL(6, rbuff->read(rBuffer,6)); + CPPUNIT_ASSERT_EQUAL(0, strcmp("AAAAAA",rBuffer)); } // check if inputdata equals outputdata @@ -125,10 +125,10 @@ namespace usdx char w1Buffer[4]="AAA"; char w2Buffer[4]="BBB"; char rBuffer[7]="CCCCCC"; - CPPUNIT_ASSERT( 3 == rbuff->write(w1Buffer,3) ); - CPPUNIT_ASSERT( 4 == rbuff->write(w2Buffer,4) ); - CPPUNIT_ASSERT( 7 == rbuff->read(rBuffer,7) ); - CPPUNIT_ASSERT( 0 == strcmp("AAABBB",rBuffer) ); + CPPUNIT_ASSERT_EQUAL(3, rbuff->write(w1Buffer,3)); + CPPUNIT_ASSERT_EQUAL(4, rbuff->write(w2Buffer,4)); + CPPUNIT_ASSERT_EQUAL(7, rbuff->read(rBuffer,7)); + CPPUNIT_ASSERT_EQUAL(0, strcmp("AAABBB",rBuffer)); } // check what happens when read trys to read more data than @@ -137,9 +137,9 @@ namespace usdx { char wBuffer[4]="AAA"; char rBuffer[5]="BBBB"; - CPPUNIT_ASSERT( 4 == rbuff->write(wBuffer,4) ); - CPPUNIT_ASSERT( 4 == rbuff->read(rBuffer,5) ); - CPPUNIT_ASSERT( 0 == strcmp("AAA",rBuffer) ); + CPPUNIT_ASSERT_EQUAL(4, rbuff->write(wBuffer,4)); + CPPUNIT_ASSERT_EQUAL(4, rbuff->read(rBuffer,5)); + CPPUNIT_ASSERT_EQUAL(0, strcmp("AAA",rBuffer)); } // check if the correct ringbuffer size is reported @@ -147,9 +147,9 @@ namespace usdx { char w1Buffer[4]="AAA"; char w2Buffer[5]="BBBB"; - CPPUNIT_ASSERT( 4 == rbuff->write(w1Buffer,4) ); - CPPUNIT_ASSERT( 5 == rbuff->write(w2Buffer,5) ); - CPPUNIT_ASSERT( 10 == rbuff->get_size() ); + CPPUNIT_ASSERT_EQUAL(4, rbuff->write(w1Buffer,4)); + CPPUNIT_ASSERT_EQUAL(5, rbuff->write(w2Buffer,5)); + CPPUNIT_ASSERT_EQUAL(10, rbuff->get_size()); } // check if the available space in the ringbuffer @@ -157,9 +157,9 @@ namespace usdx { char w1Buffer[4]="AAA"; char w2Buffer[5]="BBBB"; - CPPUNIT_ASSERT( 4 == rbuff->write(w1Buffer,4) ); - CPPUNIT_ASSERT( 5 == rbuff->write(w2Buffer,5) ); - CPPUNIT_ASSERT( 9 == rbuff->get_available() ); + CPPUNIT_ASSERT_EQUAL(4, rbuff->write(w1Buffer,4)); + CPPUNIT_ASSERT_EQUAL(5, rbuff->write(w2Buffer,5)); + CPPUNIT_ASSERT_EQUAL(9, rbuff->get_available()); } // check if the flush function clears the buffer correctly @@ -168,11 +168,11 @@ namespace usdx char w1Buffer[4]="AAA"; char w2Buffer[4]="BBB"; char rBuffer[4]="CCC"; - CPPUNIT_ASSERT( 4 == rbuff->write(w1Buffer,4) ); + CPPUNIT_ASSERT_EQUAL(4, rbuff->write(w1Buffer,4)); rbuff->flush(); - CPPUNIT_ASSERT( 4 == rbuff->write(w2Buffer,4) ); - CPPUNIT_ASSERT( 4 == rbuff->read(rBuffer,4) ); - CPPUNIT_ASSERT( 0 == strcmp("BBB",rBuffer) ); + CPPUNIT_ASSERT_EQUAL(4, rbuff->write(w2Buffer,4)); + CPPUNIT_ASSERT_EQUAL(4, rbuff->read(rBuffer,4)); + CPPUNIT_ASSERT_EQUAL(0, strcmp("BBB",rBuffer)); } }; 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