Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

small fixes to make all unit tests in modules/core except PlaylistTest compile and pass

Browse source
This commit is contained in:
fgerlits 2010-01-08 15:27:06 +00:00
parent 0bd2f98717
commit fe4ea304c0
5 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
campcaster/src/modules/core/etc/Makefile.in
View file

@ -61,9 +61,8 @@ USR_BIN_DIR = ${USR_DIR}/bin
USR_LIB_DIR = ${USR_DIR}/lib USR_LIB_DIR = ${USR_DIR}/lib
GENRB = @GENRB@ GENRB = @GENRB@
GENRBOPTS = --destdir ${TMP_DIR} \ GENRBOPTS = --destdir ${TMP_DIR}/${PACKAGE_NAME} \
--encoding utf-8 \ --encoding utf-8 \
--package-name ${PACKAGE_NAME} \
--strict --strict
VPATH = ${SRC_DIR} VPATH = ${SRC_DIR}

4
campcaster/src/modules/core/include/LiveSupport/Core/PlaylistElement.h
View file

@ -26,8 +26,8 @@
Location : $URL$ Location : $URL$
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
#ifndef PlaylistElement_h #ifndef LiveSupport_Core_PlaylistElement_h
#define PlaylistElement_h #define LiveSupport_Core_PlaylistElement_h
#ifndef __cplusplus #ifndef __cplusplus
#error This is a C++ include file #error This is a C++ include file

5
campcaster/src/modules/core/src/PlaylistElementTest.cxx
View file

@ -150,7 +150,10 @@ PlaylistElementTest :: firstTest(void)
CPPUNIT_ASSERT(*playlistElement->getXmlElementString() == CPPUNIT_ASSERT(*playlistElement->getXmlElementString() ==
"<playlistElement id=\"0000000000000111\" " "<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\" " "<audioClip id=\"0000000000010003\" "
"title=\"three\" " "title=\"three\" "
"playlength=\"00:00:11.000000\"/>\n" "playlength=\"00:00:11.000000\"/>\n"

4
campcaster/src/modules/core/src/RdsContainerTest.cxx
View file

@ -144,7 +144,7 @@ RdsContainerTest :: toStringTest(void)
{ {
Ptr<const Glib::ustring>::Ref string = rdsContainer->toString(); Ptr<const Glib::ustring>::Ref string = rdsContainer->toString();
CPPUNIT_ASSERT(string); CPPUNIT_ASSERT(string);
CPPUNIT_ASSERT(*string == "PS=BBC Four\n" CPPUNIT_ASSERT(*string == "PS=BBC Four\r\n"
"RT=C. Monster - Monsterpiece Theater\n"); "RT=C. Monster - Monsterpiece Theater\r\n");
} }

1
campcaster/src/modules/core/src/ThreadTest.cxx
View file

@ -90,6 +90,7 @@ ThreadTest :: simpleTest(void)
CPPUNIT_ASSERT(runnable->getState() == TestRunnable::created); CPPUNIT_ASSERT(runnable->getState() == TestRunnable::created);
thread->start(); thread->start();
Thread::yield(); Thread::yield();
TimeConversion::sleep(sleepTime);
CPPUNIT_ASSERT(runnable->getState() == TestRunnable::running); CPPUNIT_ASSERT(runnable->getState() == TestRunnable::running);
TimeConversion::sleep(sleepTime); TimeConversion::sleep(sleepTime);
CPPUNIT_ASSERT(runnable->getState() == TestRunnable::running); CPPUNIT_ASSERT(runnable->getState() == TestRunnable::running);