From df5c9843c228664117edd91e585197681283bfee Mon Sep 17 00:00:00 2001
From: fberckel <fberckel@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Sun, 24 Feb 2008 08:49:25 +0000
Subject: [PATCH] Fixing ticket #2291 - part 1, playlistExcutor unit test back
 in business

---
 .../src/modules/playlistExecutor/etc/Makefile.in  |  5 +++++
 .../src/AudioPlayerFactoryGstreamerTest.cxx       |  2 +-
 .../modules/playlistExecutor/src/TestRunner.cxx   | 15 +++++++--------
 .../playlistExecutor/var/animatedSmil.smil        |  6 +++---
 .../playlistExecutor/var/sequentialSmil.smil      |  6 +++---
 .../modules/playlistExecutor/var/simpleSmil.smil  |  2 +-
 6 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/campcaster/src/modules/playlistExecutor/etc/Makefile.in b/campcaster/src/modules/playlistExecutor/etc/Makefile.in
index 3d11f0aef..13a197004 100644
--- a/campcaster/src/modules/playlistExecutor/etc/Makefile.in
+++ b/campcaster/src/modules/playlistExecutor/etc/Makefile.in
@@ -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}
diff --git a/campcaster/src/modules/playlistExecutor/src/AudioPlayerFactoryGstreamerTest.cxx b/campcaster/src/modules/playlistExecutor/src/AudioPlayerFactoryGstreamerTest.cxx
index 989764d52..8d36d6e67 100644
--- a/campcaster/src/modules/playlistExecutor/src/AudioPlayerFactoryGstreamerTest.cxx
+++ b/campcaster/src/modules/playlistExecutor/src/AudioPlayerFactoryGstreamerTest.cxx
@@ -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(
diff --git a/campcaster/src/modules/playlistExecutor/src/TestRunner.cxx b/campcaster/src/modules/playlistExecutor/src/TestRunner.cxx
index 6f569b3c4..408121e9e 100644
--- a/campcaster/src/modules/playlistExecutor/src/TestRunner.cxx
+++ b/campcaster/src/modules/playlistExecutor/src/TestRunner.cxx
@@ -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();
 
diff --git a/campcaster/src/modules/playlistExecutor/var/animatedSmil.smil b/campcaster/src/modules/playlistExecutor/var/animatedSmil.smil
index c1e7b2bf8..ffbb710b5 100644
--- a/campcaster/src/modules/playlistExecutor/var/animatedSmil.smil
+++ b/campcaster/src/modules/playlistExecutor/var/animatedSmil.smil
@@ -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>
diff --git a/campcaster/src/modules/playlistExecutor/var/sequentialSmil.smil b/campcaster/src/modules/playlistExecutor/var/sequentialSmil.smil
index 92be03461..98e0f0b3a 100644
--- a/campcaster/src/modules/playlistExecutor/var/sequentialSmil.smil
+++ b/campcaster/src/modules/playlistExecutor/var/sequentialSmil.smil
@@ -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>
diff --git a/campcaster/src/modules/playlistExecutor/var/simpleSmil.smil b/campcaster/src/modules/playlistExecutor/var/simpleSmil.smil
index cb6c244b7..b87db1aff 100644
--- a/campcaster/src/modules/playlistExecutor/var/simpleSmil.smil
+++ b/campcaster/src/modules/playlistExecutor/var/simpleSmil.smil
@@ -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>