From f2aac90b341038e00b4bfb028317de89b792cb24 Mon Sep 17 00:00:00 2001
From: Robin Nehls <nehls@mi.fu-berlin.de>
Date: Fri, 22 Jan 2010 18:49:17 +0100
Subject: Enabled tests for now correctly implemented headerfields
---
test/base/songloading.cpp | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/test/base/songloading.cpp b/test/base/songloading.cpp
index 343e7acb..e7595b0a 100644
--- a/test/base/songloading.cpp
+++ b/test/base/songloading.cpp
@@ -48,31 +48,29 @@ namespace usdx
void testSongloadingTxtHeader()
{
Song *song = Songloader::get_instance()->load_header("testdata/testsong_correct.txt");
- Songloader::get_instance()->load_song(song);
-
- CPPUNIT_ASSERT( "Test Ärtist" == song->get_artist() );
+
+ CPPUNIT_ASSERT( "Test Ärtist" == song->get_artist() );
CPPUNIT_ASSERT( "Test Title" == song->get_title() );
CPPUNIT_ASSERT( "Test.mp3" == song->get_mp3() );
- // TODO bpm array
- //CPPUNIT_ASSERT( 42.23 == song->get_bpm() );
- //CPPUNIT_ASSERT( 10 == song->get_gap() );
+ 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() );
CPPUNIT_ASSERT( "Test Genre" == song->get_genre() );
- //CPPUNIT_ASSERT( false == song->get_relative() );
+ 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.3 == song->get_videogap() );
- //CPPUNIT_ASSERT( 0 == song->get_start() );
+ 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_end() );
- //CPPUNIT_ASSERT( 0 == song->get_notesgap() );
- // TODO encodeing class
+ CPPUNIT_ASSERT( 7 == song->get_year() );
+ CPPUNIT_ASSERT( 666 == song->get_stop() );
+ CPPUNIT_ASSERT( 0 == song->get_notes_gap() );
+ // TODO
//CPPUNIT_ASSERT( UTF-8 == song->get_encodeing() );
delete song;
- delete Songloader::get_instance();
}
};
--
cgit v1.2.3