From fe4ea304c0bbfe9950550e07b1dd17e6939a1783 Mon Sep 17 00:00:00 2001
From: fgerlits <fgerlits@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Fri, 8 Jan 2010 15:27:06 +0000
Subject: [PATCH] small fixes to make all unit tests in modules/core except
 PlaylistTest compile and pass

---
 campcaster/src/modules/core/etc/Makefile.in                  | 3 +--
 .../modules/core/include/LiveSupport/Core/PlaylistElement.h  | 4 ++--
 campcaster/src/modules/core/src/PlaylistElementTest.cxx      | 5 ++++-
 campcaster/src/modules/core/src/RdsContainerTest.cxx         | 4 ++--
 campcaster/src/modules/core/src/ThreadTest.cxx               | 1 +
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/campcaster/src/modules/core/etc/Makefile.in b/campcaster/src/modules/core/etc/Makefile.in
index cd895a23d..20f98db02 100644
--- a/campcaster/src/modules/core/etc/Makefile.in
+++ b/campcaster/src/modules/core/etc/Makefile.in
@@ -61,9 +61,8 @@ USR_BIN_DIR     = ${USR_DIR}/bin
 USR_LIB_DIR     = ${USR_DIR}/lib
 
 GENRB     = @GENRB@
-GENRBOPTS = --destdir ${TMP_DIR} \
+GENRBOPTS = --destdir ${TMP_DIR}/${PACKAGE_NAME} \
             --encoding utf-8 \
-            --package-name ${PACKAGE_NAME} \
             --strict
 
 VPATH    = ${SRC_DIR}
diff --git a/campcaster/src/modules/core/include/LiveSupport/Core/PlaylistElement.h b/campcaster/src/modules/core/include/LiveSupport/Core/PlaylistElement.h
index defba7dd3..db17e7f12 100644
--- a/campcaster/src/modules/core/include/LiveSupport/Core/PlaylistElement.h
+++ b/campcaster/src/modules/core/include/LiveSupport/Core/PlaylistElement.h
@@ -26,8 +26,8 @@
     Location : $URL$
 
 ------------------------------------------------------------------------------*/
-#ifndef PlaylistElement_h
-#define PlaylistElement_h
+#ifndef LiveSupport_Core_PlaylistElement_h
+#define LiveSupport_Core_PlaylistElement_h
 
 #ifndef __cplusplus
 #error This is a C++ include file
diff --git a/campcaster/src/modules/core/src/PlaylistElementTest.cxx b/campcaster/src/modules/core/src/PlaylistElementTest.cxx
index cd8f3067e..b0a2505de 100644
--- a/campcaster/src/modules/core/src/PlaylistElementTest.cxx
+++ b/campcaster/src/modules/core/src/PlaylistElementTest.cxx
@@ -150,7 +150,10 @@ PlaylistElementTest :: firstTest(void)
                                         
         CPPUNIT_ASSERT(*playlistElement->getXmlElementString() ==
                                 "<playlistElement id=\"0000000000000111\" "
-                                "relativeOffset=\"00:00:00.000000\">\n"
+                                "relativeOffset=\"00:00:00.000000\" "
+                                "clipStart=\"00:00:00.000000\" "
+                                "clipEnd=\"00:00:00.000000\" "
+                                "clipLength=\"00:00:00.000000\">\n"
                                         "<audioClip id=\"0000000000010003\" "
                                         "title=\"three\" "
                                         "playlength=\"00:00:11.000000\"/>\n"
diff --git a/campcaster/src/modules/core/src/RdsContainerTest.cxx b/campcaster/src/modules/core/src/RdsContainerTest.cxx
index 5359f0dfa..5618eac5d 100644
--- a/campcaster/src/modules/core/src/RdsContainerTest.cxx
+++ b/campcaster/src/modules/core/src/RdsContainerTest.cxx
@@ -144,7 +144,7 @@ RdsContainerTest :: toStringTest(void)
 {
     Ptr<const Glib::ustring>::Ref   string = rdsContainer->toString();
     CPPUNIT_ASSERT(string);
-    CPPUNIT_ASSERT(*string == "PS=BBC Four\n"
-                              "RT=C. Monster - Monsterpiece Theater\n");    
+    CPPUNIT_ASSERT(*string == "PS=BBC Four\r\n"
+                              "RT=C. Monster - Monsterpiece Theater\r\n");    
 }
 
diff --git a/campcaster/src/modules/core/src/ThreadTest.cxx b/campcaster/src/modules/core/src/ThreadTest.cxx
index c41cd2223..44cb9b124 100644
--- a/campcaster/src/modules/core/src/ThreadTest.cxx
+++ b/campcaster/src/modules/core/src/ThreadTest.cxx
@@ -90,6 +90,7 @@ ThreadTest :: simpleTest(void)
     CPPUNIT_ASSERT(runnable->getState() == TestRunnable::created);
     thread->start();
     Thread::yield();
+    TimeConversion::sleep(sleepTime);
     CPPUNIT_ASSERT(runnable->getState() == TestRunnable::running);
     TimeConversion::sleep(sleepTime);
     CPPUNIT_ASSERT(runnable->getState() == TestRunnable::running);