From 75d4ff95020694c3236c5d4334b14f8ae07db24b Mon Sep 17 00:00:00 2001 From: fgerlits Date: Wed, 1 Dec 2004 16:05:32 +0000 Subject: [PATCH] changed error reporting in the XML-RPC methods from ad-hoc to standard XML-RPC fault responses --- ...istTest.cxx => RpcDisplayPlaylistTest.cxx} | 23 ++++++++--------- ...laylistTest.h => RpcDisplayPlaylistTest.h} | 16 ++++++------ ...uleTest.cxx => RpcDisplayScheduleTest.cxx} | 18 ++++++------- ...cheduleTest.h => RpcDisplayScheduleTest.h} | 16 ++++++------ ...Test.cxx => RpcRemoveFromScheduleTest.cxx} | 24 +++++++++--------- ...duleTest.h => RpcRemoveFromScheduleTest.h} | 16 ++++++------ ...scheduleTest.cxx => RpcRescheduleTest.cxx} | 25 ++++++++++--------- ...FromScheduleTest.h => RpcRescheduleTest.h} | 16 ++++++------ ...loadTest.cxx => RpcUploadPlaylistTest.cxx} | 18 ++++++------- ...onUploadTest.h => RpcUploadPlaylistTest.h} | 16 ++++++------ 10 files changed, 94 insertions(+), 94 deletions(-) rename livesupport/products/scheduler/src/{SchedulerDaemonDisplayPlaylistTest.cxx => RpcDisplayPlaylistTest.cxx} (90%) rename livesupport/products/scheduler/src/{SchedulerDaemonDisplayPlaylistTest.h => RpcDisplayPlaylistTest.h} (90%) rename livesupport/products/scheduler/src/{SchedulerDaemonDisplayScheduleTest.cxx => RpcDisplayScheduleTest.cxx} (91%) rename livesupport/products/scheduler/src/{SchedulerDaemonDisplayScheduleTest.h => RpcDisplayScheduleTest.h} (90%) rename livesupport/products/scheduler/src/{SchedulerDaemonRemoveFromScheduleTest.cxx => RpcRemoveFromScheduleTest.cxx} (90%) rename livesupport/products/scheduler/src/{SchedulerDaemonRescheduleTest.h => RpcRemoveFromScheduleTest.h} (91%) rename livesupport/products/scheduler/src/{SchedulerDaemonRescheduleTest.cxx => RpcRescheduleTest.cxx} (91%) rename livesupport/products/scheduler/src/{SchedulerDaemonRemoveFromScheduleTest.h => RpcRescheduleTest.h} (90%) rename livesupport/products/scheduler/src/{SchedulerDaemonUploadTest.cxx => RpcUploadPlaylistTest.cxx} (92%) rename livesupport/products/scheduler/src/{SchedulerDaemonUploadTest.h => RpcUploadPlaylistTest.h} (91%) diff --git a/livesupport/products/scheduler/src/SchedulerDaemonDisplayPlaylistTest.cxx b/livesupport/products/scheduler/src/RpcDisplayPlaylistTest.cxx similarity index 90% rename from livesupport/products/scheduler/src/SchedulerDaemonDisplayPlaylistTest.cxx rename to livesupport/products/scheduler/src/RpcDisplayPlaylistTest.cxx index fdd7bfc69..48047ab83 100644 --- a/livesupport/products/scheduler/src/SchedulerDaemonDisplayPlaylistTest.cxx +++ b/livesupport/products/scheduler/src/RpcDisplayPlaylistTest.cxx @@ -22,8 +22,8 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.3 $ - Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/Attic/SchedulerDaemonDisplayPlaylistTest.cxx,v $ + Version : $Revision: 1.1 $ + Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcDisplayPlaylistTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -46,7 +46,7 @@ #include "SchedulerDaemon.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" -#include "SchedulerDaemonDisplayPlaylistTest.h" +#include "RpcDisplayPlaylistTest.h" using namespace std; using namespace XmlRpc; @@ -60,7 +60,7 @@ using namespace LiveSupport::Authentication; /* ================================================ local constants & macros */ -CPPUNIT_TEST_SUITE_REGISTRATION(SchedulerDaemonDisplayPlaylistTest); +CPPUNIT_TEST_SUITE_REGISTRATION(RpcDisplayPlaylistTest); /** * The name of the configuration file for the scheduler daemon. @@ -83,7 +83,7 @@ static const std::string authenticationClientConfigFileName = * Configure a Configurable with an XML file. *----------------------------------------------------------------------------*/ void -SchedulerDaemonDisplayPlaylistTest :: configure( +RpcDisplayPlaylistTest :: configure( Ptr::Ref configurable, const std::string & fileName) throw (std::invalid_argument, @@ -101,7 +101,7 @@ SchedulerDaemonDisplayPlaylistTest :: configure( * Set up the test environment *----------------------------------------------------------------------------*/ void -SchedulerDaemonDisplayPlaylistTest :: setUp(void) throw () +RpcDisplayPlaylistTest :: setUp(void) throw () { Ptr::Ref daemon = SchedulerDaemon::getInstance(); @@ -144,7 +144,7 @@ SchedulerDaemonDisplayPlaylistTest :: setUp(void) throw ( * Clean up the test environment *----------------------------------------------------------------------------*/ void -SchedulerDaemonDisplayPlaylistTest :: tearDown(void) throw () +RpcDisplayPlaylistTest :: tearDown(void) throw () { Ptr::Ref daemon = SchedulerDaemon::getInstance(); @@ -161,7 +161,7 @@ SchedulerDaemonDisplayPlaylistTest :: tearDown(void) throw ( * A simple smoke test. *----------------------------------------------------------------------------*/ void -SchedulerDaemonDisplayPlaylistTest :: simpleTest(void) +RpcDisplayPlaylistTest :: simpleTest(void) throw (CPPUNIT_NS::Exception) { XmlRpcValue parameters; @@ -174,7 +174,7 @@ SchedulerDaemonDisplayPlaylistTest :: simpleTest(void) result.clear(); xmlRpcClient.execute("displayPlaylist", parameters, result); - CPPUNIT_ASSERT(!result.hasMember("errorCode")); + CPPUNIT_ASSERT(!xmlRpcClient.isFault()); CPPUNIT_ASSERT(((int) result["id"]) == 1); CPPUNIT_ASSERT(((int) result["playlength"]) == (60 * 60)); } @@ -184,7 +184,7 @@ SchedulerDaemonDisplayPlaylistTest :: simpleTest(void) * A simple negative test. *----------------------------------------------------------------------------*/ void -SchedulerDaemonDisplayPlaylistTest :: negativeTest(void) +RpcDisplayPlaylistTest :: negativeTest(void) throw (CPPUNIT_NS::Exception) { XmlRpcValue parameters; @@ -197,6 +197,5 @@ SchedulerDaemonDisplayPlaylistTest :: negativeTest(void) result.clear(); xmlRpcClient.execute("displayPlaylist", parameters, result); - CPPUNIT_ASSERT(result.valid()); - CPPUNIT_ASSERT(result.hasMember("errorCode")); + CPPUNIT_ASSERT(xmlRpcClient.isFault()); } diff --git a/livesupport/products/scheduler/src/SchedulerDaemonDisplayPlaylistTest.h b/livesupport/products/scheduler/src/RpcDisplayPlaylistTest.h similarity index 90% rename from livesupport/products/scheduler/src/SchedulerDaemonDisplayPlaylistTest.h rename to livesupport/products/scheduler/src/RpcDisplayPlaylistTest.h index 1c1d4774b..0cf2e4594 100644 --- a/livesupport/products/scheduler/src/SchedulerDaemonDisplayPlaylistTest.h +++ b/livesupport/products/scheduler/src/RpcDisplayPlaylistTest.h @@ -22,12 +22,12 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.2 $ - Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/Attic/SchedulerDaemonDisplayPlaylistTest.h,v $ + Version : $Revision: 1.1 $ + Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcDisplayPlaylistTest.h,v $ ------------------------------------------------------------------------------*/ -#ifndef SchedulerDaemonDisplayPlaylistTest_h -#define SchedulerDaemonDisplayPlaylistTest_h +#ifndef RpcDisplayPlaylistTest_h +#define RpcDisplayPlaylistTest_h #ifndef __cplusplus #error This is a C++ include file @@ -64,12 +64,12 @@ using namespace LiveSupport::Core; * Unit test to test the displayPlaylist XML-RPC call. * * @author $Author: fgerlits $ - * @version $Revision: 1.2 $ + * @version $Revision: 1.1 $ * @see SchedulerDaemon */ -class SchedulerDaemonDisplayPlaylistTest : public CPPUNIT_NS::TestFixture +class RpcDisplayPlaylistTest : public CPPUNIT_NS::TestFixture { - CPPUNIT_TEST_SUITE(SchedulerDaemonDisplayPlaylistTest); + CPPUNIT_TEST_SUITE(RpcDisplayPlaylistTest); CPPUNIT_TEST(simpleTest); CPPUNIT_TEST(negativeTest); CPPUNIT_TEST_SUITE_END(); @@ -142,5 +142,5 @@ class SchedulerDaemonDisplayPlaylistTest : public CPPUNIT_NS::TestFixture } // namespace Scheduler } // namespace LiveSupport -#endif // SchedulerDaemonDisplayPlaylistTest_h +#endif // RpcDisplayPlaylistTest_h diff --git a/livesupport/products/scheduler/src/SchedulerDaemonDisplayScheduleTest.cxx b/livesupport/products/scheduler/src/RpcDisplayScheduleTest.cxx similarity index 91% rename from livesupport/products/scheduler/src/SchedulerDaemonDisplayScheduleTest.cxx rename to livesupport/products/scheduler/src/RpcDisplayScheduleTest.cxx index 86167bba1..9f8cf045d 100644 --- a/livesupport/products/scheduler/src/SchedulerDaemonDisplayScheduleTest.cxx +++ b/livesupport/products/scheduler/src/RpcDisplayScheduleTest.cxx @@ -22,8 +22,8 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.4 $ - Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/Attic/SchedulerDaemonDisplayScheduleTest.cxx,v $ + Version : $Revision: 1.1 $ + Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcDisplayScheduleTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -46,7 +46,7 @@ #include "SchedulerDaemon.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" -#include "SchedulerDaemonDisplayScheduleTest.h" +#include "RpcDisplayScheduleTest.h" using namespace std; using namespace XmlRpc; @@ -60,7 +60,7 @@ using namespace LiveSupport::Authentication; /* ================================================ local constants & macros */ -CPPUNIT_TEST_SUITE_REGISTRATION(SchedulerDaemonDisplayScheduleTest); +CPPUNIT_TEST_SUITE_REGISTRATION(RpcDisplayScheduleTest); /** * The name of the configuration file for the scheduler daemon. @@ -83,7 +83,7 @@ static const std::string authenticationClientConfigFileName = * Configure a Configurable with an XML file. *----------------------------------------------------------------------------*/ void -SchedulerDaemonDisplayScheduleTest :: configure( +RpcDisplayScheduleTest :: configure( Ptr::Ref configurable, const std::string & fileName) throw (std::invalid_argument, @@ -101,7 +101,7 @@ SchedulerDaemonDisplayScheduleTest :: configure( * Set up the test environment *----------------------------------------------------------------------------*/ void -SchedulerDaemonDisplayScheduleTest :: setUp(void) throw () +RpcDisplayScheduleTest :: setUp(void) throw () { Ptr::Ref daemon = SchedulerDaemon::getInstance(); @@ -144,7 +144,7 @@ SchedulerDaemonDisplayScheduleTest :: setUp(void) throw ( * Clean up the test environment *----------------------------------------------------------------------------*/ void -SchedulerDaemonDisplayScheduleTest :: tearDown(void) throw () +RpcDisplayScheduleTest :: tearDown(void) throw () { Ptr::Ref daemon = SchedulerDaemon::getInstance(); @@ -161,7 +161,7 @@ SchedulerDaemonDisplayScheduleTest :: tearDown(void) throw ( * Test a simple query, resulting in an empty result set. *----------------------------------------------------------------------------*/ void -SchedulerDaemonDisplayScheduleTest :: simpleTest(void) +RpcDisplayScheduleTest :: simpleTest(void) throw (CPPUNIT_NS::Exception) { XmlRpcValue parameters; @@ -190,7 +190,7 @@ SchedulerDaemonDisplayScheduleTest :: simpleTest(void) result.clear(); xmlRpcClient.execute("displaySchedule", parameters, result); - CPPUNIT_ASSERT(!result.hasMember("errorCode")); + CPPUNIT_ASSERT(!xmlRpcClient.isFault()); CPPUNIT_ASSERT(result.size() == 0); } diff --git a/livesupport/products/scheduler/src/SchedulerDaemonDisplayScheduleTest.h b/livesupport/products/scheduler/src/RpcDisplayScheduleTest.h similarity index 90% rename from livesupport/products/scheduler/src/SchedulerDaemonDisplayScheduleTest.h rename to livesupport/products/scheduler/src/RpcDisplayScheduleTest.h index f0be3cefc..9c8120b23 100644 --- a/livesupport/products/scheduler/src/SchedulerDaemonDisplayScheduleTest.h +++ b/livesupport/products/scheduler/src/RpcDisplayScheduleTest.h @@ -22,12 +22,12 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.2 $ - Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/Attic/SchedulerDaemonDisplayScheduleTest.h,v $ + Version : $Revision: 1.1 $ + Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcDisplayScheduleTest.h,v $ ------------------------------------------------------------------------------*/ -#ifndef SchedulerDaemonDisplayScheduleTest_h -#define SchedulerDaemonDisplayScheduleTest_h +#ifndef RpcDisplayScheduleTest_h +#define RpcDisplayScheduleTest_h #ifndef __cplusplus #error This is a C++ include file @@ -64,12 +64,12 @@ using namespace LiveSupport::Core; * Unit test to test the displaySchedule XML-RPC call. * * @author $Author: fgerlits $ - * @version $Revision: 1.2 $ + * @version $Revision: 1.1 $ * @see SchedulerDaemon */ -class SchedulerDaemonDisplayScheduleTest : public CPPUNIT_NS::TestFixture +class RpcDisplayScheduleTest : public CPPUNIT_NS::TestFixture { - CPPUNIT_TEST_SUITE(SchedulerDaemonDisplayScheduleTest); + CPPUNIT_TEST_SUITE(RpcDisplayScheduleTest); CPPUNIT_TEST(simpleTest); CPPUNIT_TEST_SUITE_END(); @@ -133,5 +133,5 @@ class SchedulerDaemonDisplayScheduleTest : public CPPUNIT_NS::TestFixture } // namespace Scheduler } // namespace LiveSupport -#endif // SchedulerDaemonDisplayScheduleTest_h +#endif // RpcDisplayScheduleTest_h diff --git a/livesupport/products/scheduler/src/SchedulerDaemonRemoveFromScheduleTest.cxx b/livesupport/products/scheduler/src/RpcRemoveFromScheduleTest.cxx similarity index 90% rename from livesupport/products/scheduler/src/SchedulerDaemonRemoveFromScheduleTest.cxx rename to livesupport/products/scheduler/src/RpcRemoveFromScheduleTest.cxx index 7ca138b11..ecc27db50 100644 --- a/livesupport/products/scheduler/src/SchedulerDaemonRemoveFromScheduleTest.cxx +++ b/livesupport/products/scheduler/src/RpcRemoveFromScheduleTest.cxx @@ -22,8 +22,8 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.3 $ - Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/Attic/SchedulerDaemonRemoveFromScheduleTest.cxx,v $ + Version : $Revision: 1.1 $ + Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcRemoveFromScheduleTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -46,7 +46,7 @@ #include "SchedulerDaemon.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" -#include "SchedulerDaemonRemoveFromScheduleTest.h" +#include "RpcRemoveFromScheduleTest.h" using namespace std; using namespace XmlRpc; @@ -60,7 +60,7 @@ using namespace LiveSupport::Authentication; /* ================================================ local constants & macros */ -CPPUNIT_TEST_SUITE_REGISTRATION(SchedulerDaemonRemoveFromScheduleTest); +CPPUNIT_TEST_SUITE_REGISTRATION(RpcRemoveFromScheduleTest); /** * The name of the configuration file for the scheduler daemon. @@ -83,7 +83,7 @@ static const std::string authenticationClientConfigFileName = * Configure a Configurable with an XML file. *----------------------------------------------------------------------------*/ void -SchedulerDaemonRemoveFromScheduleTest :: configure( +RpcRemoveFromScheduleTest :: configure( Ptr::Ref configurable, const std::string & fileName) throw (std::invalid_argument, @@ -101,7 +101,7 @@ SchedulerDaemonRemoveFromScheduleTest :: configure( * Set up the test environment *----------------------------------------------------------------------------*/ void -SchedulerDaemonRemoveFromScheduleTest :: setUp(void) throw () +RpcRemoveFromScheduleTest :: setUp(void) throw () { Ptr::Ref daemon = SchedulerDaemon::getInstance(); @@ -144,7 +144,7 @@ SchedulerDaemonRemoveFromScheduleTest :: setUp(void) thro * Clean up the test environment *----------------------------------------------------------------------------*/ void -SchedulerDaemonRemoveFromScheduleTest :: tearDown(void) throw () +RpcRemoveFromScheduleTest :: tearDown(void) throw () { Ptr::Ref daemon = SchedulerDaemon::getInstance(); @@ -161,7 +161,7 @@ SchedulerDaemonRemoveFromScheduleTest :: tearDown(void) thro * A simple smoke test. *----------------------------------------------------------------------------*/ void -SchedulerDaemonRemoveFromScheduleTest :: simpleTest(void) +RpcRemoveFromScheduleTest :: simpleTest(void) throw (CPPUNIT_NS::Exception) { XmlRpcValue parameters; @@ -183,7 +183,7 @@ SchedulerDaemonRemoveFromScheduleTest :: simpleTest(void) result.clear(); xmlRpcClient.execute("uploadPlaylist", parameters, result); - CPPUNIT_ASSERT(!result.hasMember("errorCode")); + CPPUNIT_ASSERT(!xmlRpcClient.isFault()); CPPUNIT_ASSERT(result.hasMember("scheduleEntryId")); Ptr::Ref entryId(new UniqueId(int(result["scheduleEntryId"]))); @@ -191,7 +191,7 @@ SchedulerDaemonRemoveFromScheduleTest :: simpleTest(void) result.clear(); xmlRpcClient.execute("removeFromSchedule", parameters, result); - CPPUNIT_ASSERT(!result.hasMember("errorCode")); + CPPUNIT_ASSERT(!xmlRpcClient.isFault()); } @@ -199,7 +199,7 @@ SchedulerDaemonRemoveFromScheduleTest :: simpleTest(void) * A simple negative test. *----------------------------------------------------------------------------*/ void -SchedulerDaemonRemoveFromScheduleTest :: negativeTest(void) +RpcRemoveFromScheduleTest :: negativeTest(void) throw (CPPUNIT_NS::Exception) { XmlRpcValue parameters; @@ -212,6 +212,6 @@ SchedulerDaemonRemoveFromScheduleTest :: negativeTest(void) result.clear(); xmlRpcClient.execute("removeFromSchedule", parameters, result); - CPPUNIT_ASSERT(result.hasMember("errorCode")); + CPPUNIT_ASSERT(xmlRpcClient.isFault()); } diff --git a/livesupport/products/scheduler/src/SchedulerDaemonRescheduleTest.h b/livesupport/products/scheduler/src/RpcRemoveFromScheduleTest.h similarity index 91% rename from livesupport/products/scheduler/src/SchedulerDaemonRescheduleTest.h rename to livesupport/products/scheduler/src/RpcRemoveFromScheduleTest.h index e5b96b4d0..f2d5b620c 100644 --- a/livesupport/products/scheduler/src/SchedulerDaemonRescheduleTest.h +++ b/livesupport/products/scheduler/src/RpcRemoveFromScheduleTest.h @@ -22,12 +22,12 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.2 $ - Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/Attic/SchedulerDaemonRescheduleTest.h,v $ + Version : $Revision: 1.1 $ + Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcRemoveFromScheduleTest.h,v $ ------------------------------------------------------------------------------*/ -#ifndef SchedulerDaemonRescheduleTest_h -#define SchedulerDaemonRescheduleTest_h +#ifndef RpcRemoveFromScheduleTest_h +#define RpcRemoveFromScheduleTest_h #ifndef __cplusplus #error This is a C++ include file @@ -64,12 +64,12 @@ using namespace LiveSupport::Core; * Unit test to test the removeFromSchedule XML-RPC call. * * @author $Author: fgerlits $ - * @version $Revision: 1.2 $ + * @version $Revision: 1.1 $ * @see SchedulerDaemon */ -class SchedulerDaemonRescheduleTest : public CPPUNIT_NS::TestFixture +class RpcRemoveFromScheduleTest : public CPPUNIT_NS::TestFixture { - CPPUNIT_TEST_SUITE(SchedulerDaemonRescheduleTest); + CPPUNIT_TEST_SUITE(RpcRemoveFromScheduleTest); CPPUNIT_TEST(simpleTest); CPPUNIT_TEST(negativeTest); CPPUNIT_TEST_SUITE_END(); @@ -142,5 +142,5 @@ class SchedulerDaemonRescheduleTest : public CPPUNIT_NS::TestFixture } // namespace Scheduler } // namespace LiveSupport -#endif // SchedulerDaemonRescheduleTest_h +#endif // RpcRemoveFromScheduleTest_h diff --git a/livesupport/products/scheduler/src/SchedulerDaemonRescheduleTest.cxx b/livesupport/products/scheduler/src/RpcRescheduleTest.cxx similarity index 91% rename from livesupport/products/scheduler/src/SchedulerDaemonRescheduleTest.cxx rename to livesupport/products/scheduler/src/RpcRescheduleTest.cxx index 1252b2239..11fef47ce 100644 --- a/livesupport/products/scheduler/src/SchedulerDaemonRescheduleTest.cxx +++ b/livesupport/products/scheduler/src/RpcRescheduleTest.cxx @@ -22,8 +22,8 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.3 $ - Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/Attic/SchedulerDaemonRescheduleTest.cxx,v $ + Version : $Revision: 1.1 $ + Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcRescheduleTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -46,7 +46,7 @@ #include "SchedulerDaemon.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" -#include "SchedulerDaemonRescheduleTest.h" +#include "RpcRescheduleTest.h" using namespace XmlRpc; using namespace LiveSupport::Core; @@ -59,7 +59,7 @@ using namespace LiveSupport::Authentication; /* ================================================ local constants & macros */ -CPPUNIT_TEST_SUITE_REGISTRATION(SchedulerDaemonRescheduleTest); +CPPUNIT_TEST_SUITE_REGISTRATION(RpcRescheduleTest); /** * The name of the configuration file for the scheduler daemon. @@ -82,7 +82,7 @@ static const std::string authenticationClientConfigFileName = * Configure a Configurable with an XML file. *----------------------------------------------------------------------------*/ void -SchedulerDaemonRescheduleTest :: configure( +RpcRescheduleTest :: configure( Ptr::Ref configurable, const std::string & fileName) throw (std::invalid_argument, @@ -100,7 +100,7 @@ SchedulerDaemonRescheduleTest :: configure( * Set up the test environment *----------------------------------------------------------------------------*/ void -SchedulerDaemonRescheduleTest :: setUp(void) throw () +RpcRescheduleTest :: setUp(void) throw () { Ptr::Ref daemon = SchedulerDaemon::getInstance(); @@ -143,7 +143,7 @@ SchedulerDaemonRescheduleTest :: setUp(void) throw () * Clean up the test environment *----------------------------------------------------------------------------*/ void -SchedulerDaemonRescheduleTest :: tearDown(void) throw () +RpcRescheduleTest :: tearDown(void) throw () { Ptr::Ref daemon = SchedulerDaemon::getInstance(); @@ -160,7 +160,7 @@ SchedulerDaemonRescheduleTest :: tearDown(void) throw () * A simple smoke test. *----------------------------------------------------------------------------*/ void -SchedulerDaemonRescheduleTest :: simpleTest(void) +RpcRescheduleTest :: simpleTest(void) throw (CPPUNIT_NS::Exception) { XmlRpcValue parameters; @@ -182,6 +182,7 @@ SchedulerDaemonRescheduleTest :: simpleTest(void) result.clear(); xmlRpcClient.execute("uploadPlaylist", parameters, result); + CPPUNIT_ASSERT(!xmlRpcClient.isFault()); CPPUNIT_ASSERT(result.hasMember("scheduleEntryId")); Ptr::Ref entryId(new UniqueId(int(result["scheduleEntryId"]))); @@ -198,7 +199,7 @@ SchedulerDaemonRescheduleTest :: simpleTest(void) result.clear(); xmlRpcClient.execute("reschedule", parameters, result); - CPPUNIT_ASSERT(!result.hasMember("errorCode")); + CPPUNIT_ASSERT(!xmlRpcClient.isFault()); // now reschedule it unto itself, should fail parameters["sessionId"] = sessionId->getId(); @@ -213,7 +214,7 @@ SchedulerDaemonRescheduleTest :: simpleTest(void) result.clear(); xmlRpcClient.execute("reschedule", parameters, result); - CPPUNIT_ASSERT(result.hasMember("errorCode")); + CPPUNIT_ASSERT(xmlRpcClient.isFault()); } @@ -221,7 +222,7 @@ SchedulerDaemonRescheduleTest :: simpleTest(void) * A simple negative test. *----------------------------------------------------------------------------*/ void -SchedulerDaemonRescheduleTest :: negativeTest(void) +RpcRescheduleTest :: negativeTest(void) throw (CPPUNIT_NS::Exception) { XmlRpcValue parameters; @@ -234,6 +235,6 @@ SchedulerDaemonRescheduleTest :: negativeTest(void) result.clear(); xmlRpcClient.execute("removeFromSchedule", parameters, result); - CPPUNIT_ASSERT(result.hasMember("errorCode")); + CPPUNIT_ASSERT(xmlRpcClient.isFault()); } diff --git a/livesupport/products/scheduler/src/SchedulerDaemonRemoveFromScheduleTest.h b/livesupport/products/scheduler/src/RpcRescheduleTest.h similarity index 90% rename from livesupport/products/scheduler/src/SchedulerDaemonRemoveFromScheduleTest.h rename to livesupport/products/scheduler/src/RpcRescheduleTest.h index fa3f0d221..61967892d 100644 --- a/livesupport/products/scheduler/src/SchedulerDaemonRemoveFromScheduleTest.h +++ b/livesupport/products/scheduler/src/RpcRescheduleTest.h @@ -22,12 +22,12 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.2 $ - Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/Attic/SchedulerDaemonRemoveFromScheduleTest.h,v $ + Version : $Revision: 1.1 $ + Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcRescheduleTest.h,v $ ------------------------------------------------------------------------------*/ -#ifndef SchedulerDaemonRemoveFromScheduleTest_h -#define SchedulerDaemonRemoveFromScheduleTest_h +#ifndef RpcRescheduleTest_h +#define RpcRescheduleTest_h #ifndef __cplusplus #error This is a C++ include file @@ -64,12 +64,12 @@ using namespace LiveSupport::Core; * Unit test to test the removeFromSchedule XML-RPC call. * * @author $Author: fgerlits $ - * @version $Revision: 1.2 $ + * @version $Revision: 1.1 $ * @see SchedulerDaemon */ -class SchedulerDaemonRemoveFromScheduleTest : public CPPUNIT_NS::TestFixture +class RpcRescheduleTest : public CPPUNIT_NS::TestFixture { - CPPUNIT_TEST_SUITE(SchedulerDaemonRemoveFromScheduleTest); + CPPUNIT_TEST_SUITE(RpcRescheduleTest); CPPUNIT_TEST(simpleTest); CPPUNIT_TEST(negativeTest); CPPUNIT_TEST_SUITE_END(); @@ -142,5 +142,5 @@ class SchedulerDaemonRemoveFromScheduleTest : public CPPUNIT_NS::TestFixture } // namespace Scheduler } // namespace LiveSupport -#endif // SchedulerDaemonRemoveFromScheduleTest_h +#endif // RpcRescheduleTest_h diff --git a/livesupport/products/scheduler/src/SchedulerDaemonUploadTest.cxx b/livesupport/products/scheduler/src/RpcUploadPlaylistTest.cxx similarity index 92% rename from livesupport/products/scheduler/src/SchedulerDaemonUploadTest.cxx rename to livesupport/products/scheduler/src/RpcUploadPlaylistTest.cxx index a0485049e..fca2574b5 100644 --- a/livesupport/products/scheduler/src/SchedulerDaemonUploadTest.cxx +++ b/livesupport/products/scheduler/src/RpcUploadPlaylistTest.cxx @@ -22,8 +22,8 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.5 $ - Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/Attic/SchedulerDaemonUploadTest.cxx,v $ + Version : $Revision: 1.1 $ + Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcUploadPlaylistTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -48,7 +48,7 @@ #include "LiveSupport/Core/UniqueId.h" #include "SchedulerDaemon.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" -#include "SchedulerDaemonUploadTest.h" +#include "RpcUploadPlaylistTest.h" using namespace std; using namespace XmlRpc; @@ -62,7 +62,7 @@ using namespace LiveSupport::Authentication; /* ================================================ local constants & macros */ -CPPUNIT_TEST_SUITE_REGISTRATION(SchedulerDaemonUploadTest); +CPPUNIT_TEST_SUITE_REGISTRATION(RpcUploadPlaylistTest); /** * The name of the configuration file for the scheduler daemon. @@ -85,7 +85,7 @@ static const std::string authenticationClientConfigFileName = * Configure a Configurable with an XML file. *----------------------------------------------------------------------------*/ void -SchedulerDaemonUploadTest :: configure( +RpcUploadPlaylistTest :: configure( Ptr::Ref configurable, const std::string & fileName) throw (std::invalid_argument, @@ -103,7 +103,7 @@ SchedulerDaemonUploadTest :: configure( * Set up the test environment *----------------------------------------------------------------------------*/ void -SchedulerDaemonUploadTest :: setUp(void) throw () +RpcUploadPlaylistTest :: setUp(void) throw () { Ptr::Ref daemon = SchedulerDaemon::getInstance(); @@ -146,7 +146,7 @@ SchedulerDaemonUploadTest :: setUp(void) throw () * Clean up the test environment *----------------------------------------------------------------------------*/ void -SchedulerDaemonUploadTest :: tearDown(void) throw () +RpcUploadPlaylistTest :: tearDown(void) throw () { Ptr::Ref daemon = SchedulerDaemon::getInstance(); @@ -163,7 +163,7 @@ SchedulerDaemonUploadTest :: tearDown(void) throw () * Test a simple upload. *----------------------------------------------------------------------------*/ void -SchedulerDaemonUploadTest :: simpleTest(void) +RpcUploadPlaylistTest :: simpleTest(void) throw (CPPUNIT_NS::Exception) { XmlRpcValue parameters; @@ -185,6 +185,6 @@ SchedulerDaemonUploadTest :: simpleTest(void) result.clear(); xmlRpcClient.execute("uploadPlaylist", parameters, result); - CPPUNIT_ASSERT(!result.hasMember("errorCode")); + CPPUNIT_ASSERT(!xmlRpcClient.isFault()); } diff --git a/livesupport/products/scheduler/src/SchedulerDaemonUploadTest.h b/livesupport/products/scheduler/src/RpcUploadPlaylistTest.h similarity index 91% rename from livesupport/products/scheduler/src/SchedulerDaemonUploadTest.h rename to livesupport/products/scheduler/src/RpcUploadPlaylistTest.h index c596f1c9f..21dfc1dcb 100644 --- a/livesupport/products/scheduler/src/SchedulerDaemonUploadTest.h +++ b/livesupport/products/scheduler/src/RpcUploadPlaylistTest.h @@ -22,12 +22,12 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.2 $ - Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/Attic/SchedulerDaemonUploadTest.h,v $ + Version : $Revision: 1.1 $ + Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcUploadPlaylistTest.h,v $ ------------------------------------------------------------------------------*/ -#ifndef SchedulerDaemonUploadTest_h -#define SchedulerDaemonUploadTest_h +#ifndef RpcUploadPlaylistTest_h +#define RpcUploadPlaylistTest_h #ifndef __cplusplus #error This is a C++ include file @@ -64,12 +64,12 @@ using namespace LiveSupport::Core; * Unit test to test the uploadPlaylist XML-RPC call. * * @author $Author: fgerlits $ - * @version $Revision: 1.2 $ + * @version $Revision: 1.1 $ * @see SchedulerDaemon */ -class SchedulerDaemonUploadTest : public CPPUNIT_NS::TestFixture +class RpcUploadPlaylistTest : public CPPUNIT_NS::TestFixture { - CPPUNIT_TEST_SUITE(SchedulerDaemonUploadTest); + CPPUNIT_TEST_SUITE(RpcUploadPlaylistTest); CPPUNIT_TEST(simpleTest); CPPUNIT_TEST_SUITE_END(); @@ -133,5 +133,5 @@ class SchedulerDaemonUploadTest : public CPPUNIT_NS::TestFixture } // namespace Scheduler } // namespace LiveSupport -#endif // SchedulerDaemonUploadTest_h +#endif // RpcUploadPlaylistTest_h