Fixing ticket #2291 - part 1, playlistExcutor unit test back in business

This commit is contained in:
fberckel 2008-02-24 08:49:25 +00:00
parent 0ad5ce8011
commit df5c9843c2
6 changed files with 20 additions and 16 deletions

View File

@ -50,6 +50,9 @@ LIB_DIR = ${BASE_DIR}/lib
SRC_DIR = ${BASE_DIR}/src
TMP_DIR = ${BASE_DIR}/tmp
VAR_DIR = ${BASE_DIR}/var
TMP_CC_DIR = /tmp/campcaster
REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd)
@ -174,6 +177,8 @@ distclean: clean docclean
${RMDIR} ${TMP_DIR}/config* ${TMP_DIR}/autom4te* ${TMP_DIR}/ac*.m4
check: all ${TEST_RUNNER}
${MKDIR} ${TMP_CC_DIR}
${CP} ${VAR_DIR}/* ${TMP_CC_DIR}/
${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT}
check_two: all ${TWOTEST_RUNNER}

View File

@ -156,7 +156,7 @@ AudioPlayerFactoryGstreamerTest :: simplePlayTest(void)
audioPlayer = audioPlayerFactory->getAudioPlayer();
// CPPUNIT_ASSERT_NO_THROW(
audioPlayer->open("file:///home/nebojsa/testFiles/simple.smil");
audioPlayer->open("file:///tmp/campcaster/simple.smil");
// );
// CPPUNIT_ASSERT(!audioPlayer->isPlaying());
// CPPUNIT_ASSERT_NO_THROW(

View File

@ -187,7 +187,7 @@ my_bus_callback (GstBus *bus,
if(cnt<0){
// if(cnt<5){
char tmp[255]={0};
sprintf(tmp, "file:///home/nebojsa/testFiles/%d.ogg", cnt+1);//use when file name needed
sprintf(tmp, "file:///tmp/campcaster/%d.mp3", cnt+1);//use when file name needed
if(pContext){
pContext->closeContext();
delete pContext;
@ -398,7 +398,7 @@ Error:
loop = g_main_loop_new (NULL, FALSE);
//quick test for smil parser
smil = new SmilHandler();
smil->openSmilFile("file:///home/nebojsa/src/campcaster/src/modules/playlistExecutor/var/animatedSmil.smil");
smil->openSmilFile("file:///tmp/campcaster/animatedSmil.smil");
pContext=new GstreamerPlayContext();
pContext->setParentData((gpointer)pContext);
@ -419,15 +419,14 @@ Error:
pContext=new GstreamerPlayContext();
pContext->setParentData((gpointer)pContext);
// pContext->setAudioDevice("default");
// pContext->openSource("/usr/share/sounds/kubuntu-login.ogg");
// pContext->openSource("file:///usr/share/sounds/kubuntu-login.ogg");
pContext->openSource("file:///home/nebojsa/src/campcaster/var/jingles/B92 - Brian Eno.ogg");
// pContext->openSource("file:///home/nebojsa/src/campcaster/var/jingles/LS Live FEED.ogg");
// pContext->openSource("file:///tmp/campcaster/kubuntu-login.ogg");
pContext->openSource("file:///tmp/campcaster/B92 - Brian Eno.ogg");
// pContext->openSource("file:///tmp/campcaster/LS Live FEED.ogg");
// pContext->openSource("http://www.sicksiteradio.com/contents/radio_shows/sicksiteradio57.mp3");
// pContext->openSource("file:///home/nebojsa/testFiles/3n.mp3");
// pContextNext=new GstreamerPlayContext("file:///home/nebojsa/testFiles/1.ogg");
// pContext->openSource("file:///tmp/campcaster/test-short.mp3");
// pContextNext=new GstreamerPlayContext("file:///tmp/campcaster/test.mp3");
// cnt++;
pContext->playContext();

View File

@ -2,7 +2,7 @@
<smil xmlns = "http://www.w3.org/2001/SMIL20/Language">
<body>
<par>
<audio src="file:///home/nebojsa/src/campcaster/src/modules/playlistExecutor/var/test10001.mp3" begin="0s">
<audio src="file:///tmp/campcaster/test10001.mp3" begin="0s">
<animate attributeName = "soundLevel"
from = "100%"
to = "0%"
@ -12,7 +12,7 @@
fill = "freeze"
/>
</audio>
<audio src="file:///home/nebojsa/src/campcaster/src/modules/playlistExecutor/var/test10002.mp3" begin="6.23s">
<audio src="file:///tmp/campcaster/test10002.mp3" begin="6.23s">
<animate attributeName = "soundLevel"
from = "0%"
to = "100%"
@ -22,7 +22,7 @@
fill = "freeze"
/>
</audio>
<audio src="file:///home/nebojsa/src/campcaster/src/modules/playlistExecutor/var/test10003.mp3" begin="18.45s">
<audio src="file:///tmp/campcaster/test10003.mp3" begin="18.45s">
</audio>
</par>
</body>

View File

@ -2,9 +2,9 @@
<smil xmlns = "http://www.w3.org/2001/SMIL20/Language">
<body>
<par>
<audio src="file:var/test10001.mp3" begin="0s"/>
<audio src="file:var/test10002.mp3" begin="11.23s"/>
<audio src="file:var/test10003.mp3" begin="23.45s"/>
<audio src="file:///tmp/campcaster/test10001.mp3" begin="0s"/>
<audio src="file:///tmp/campcaster/test10002.mp3" begin="11.23s"/>
<audio src="file:///tmp/campcaster/test10003.mp3" begin="23.45s"/>
</par>
</body>
</smil>

View File

@ -2,7 +2,7 @@
<smil xmlns = "http://www.w3.org/2001/SMIL20/Language">
<body>
<par>
<audio src="file:var/test-short.mp3"/>
<audio src="file:///tmp/campcaster/test-short.mp3"/>
</par>
</body>
</smil>