From bb3b36e45a9771dae2dd78c05e1bacbb970cadc9 Mon Sep 17 00:00:00 2001 From: fgerlits Date: Thu, 13 Jan 2005 16:54:55 +0000 Subject: [PATCH] added a call to close() after every use of XmlRpcClient --- .../src/WebAuthenticationClient.cxx | 24 +++++++--- .../modules/storage/src/WebStorageClient.cxx | 47 ++++++++++++------- .../src/RpcAddAudioClipToPlaylistTest.cxx | 4 +- .../scheduler/src/RpcCreatePlaylistTest.cxx | 4 +- .../scheduler/src/RpcDeletePlaylistTest.cxx | 6 ++- .../scheduler/src/RpcDisplayAudioClipTest.cxx | 6 ++- .../src/RpcDisplayAudioClipsTest.cxx | 4 +- .../scheduler/src/RpcDisplayPlaylistTest.cxx | 6 ++- .../scheduler/src/RpcDisplayPlaylistsTest.cxx | 4 +- .../scheduler/src/RpcDisplayScheduleTest.cxx | 4 +- .../scheduler/src/RpcGetSchedulerTimeTest.cxx | 4 +- .../scheduler/src/RpcGetVersionTest.cxx | 4 +- .../src/RpcRemoveFromScheduleTest.cxx | 6 ++- .../scheduler/src/RpcRescheduleTest.cxx | 6 ++- .../scheduler/src/RpcUploadPlaylistTest.cxx | 4 +- 15 files changed, 97 insertions(+), 36 deletions(-) diff --git a/livesupport/modules/authentication/src/WebAuthenticationClient.cxx b/livesupport/modules/authentication/src/WebAuthenticationClient.cxx index 7bf17b305..c752ef093 100644 --- a/livesupport/modules/authentication/src/WebAuthenticationClient.cxx +++ b/livesupport/modules/authentication/src/WebAuthenticationClient.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.8 $ + Version : $Revision: 1.9 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/src/WebAuthenticationClient.cxx,v $ ------------------------------------------------------------------------------*/ @@ -268,8 +268,10 @@ WebAuthenticationClient :: login(const std::string & login, result.clear(); if (!xmlRpcClient.execute(loginMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); throw Authentication::XmlRpcCommunicationException("Login failed."); } + xmlRpcClient.close(); if (xmlRpcClient.isFault()) { std::stringstream eMsg; @@ -319,8 +321,10 @@ WebAuthenticationClient :: logout(Ptr::Ref sessionId) result.clear(); if (!xmlRpcClient.execute(logoutMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); throw Core::XmlRpcCommunicationException("Logout failed."); } + xmlRpcClient.close(); if (xmlRpcClient.isFault()) { std::stringstream eMsg; @@ -366,9 +370,11 @@ WebAuthenticationClient :: loadPreferencesItem( result.clear(); if (!xmlRpcClient.execute(loadPreferencesMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); throw Core::XmlRpcCommunicationException( "Could not execute XML-RPC method."); } + xmlRpcClient.close(); if (xmlRpcClient.isFault()) { std::stringstream eMsg; @@ -428,9 +434,11 @@ WebAuthenticationClient :: savePreferencesItem( result.clear(); if (!xmlRpcClient.execute(savePreferencesMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); throw Core::XmlRpcCommunicationException( "Could not execute XML-RPC method."); } + xmlRpcClient.close(); if (xmlRpcClient.isFault()) { std::stringstream eMsg; @@ -481,9 +489,11 @@ WebAuthenticationClient :: deletePreferencesItem( result.clear(); if (!xmlRpcClient.execute(deletePreferencesMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); throw Core::XmlRpcCommunicationException( "Could not execute XML-RPC method."); } + xmlRpcClient.close(); if (xmlRpcClient.isFault()) { std::stringstream eMsg; @@ -527,11 +537,11 @@ WebAuthenticationClient :: reset(void) result.clear(); if (!xmlRpcClient.execute(resetStorageMethodName.c_str(), parameters, result)) { - std::string eMsg = "cannot execute XML-RPC method '"; - eMsg += resetStorageMethodName; - eMsg += "'"; - throw XmlRpcCommunicationException(eMsg); + xmlRpcClient.close(); + throw Core::XmlRpcCommunicationException( + "Could not execute XML-RPC method."); } + xmlRpcClient.close(); if (xmlRpcClient.isFault()) { std::stringstream eMsg; @@ -539,7 +549,7 @@ WebAuthenticationClient :: reset(void) << resetStorageMethodName << "' returned error message:\n" << result; - throw XmlRpcMethodFaultException(eMsg.str()); + throw Core::XmlRpcMethodFaultException(eMsg.str()); } if (! result.hasMember(resetStorageResultParamName) @@ -550,7 +560,7 @@ WebAuthenticationClient :: reset(void) << resetStorageMethodName << "' returned unexpected value:\n" << result; - throw XmlRpcMethodResponseException(eMsg.str()); + throw Core::XmlRpcMethodResponseException(eMsg.str()); } } diff --git a/livesupport/modules/storage/src/WebStorageClient.cxx b/livesupport/modules/storage/src/WebStorageClient.cxx index 73507709a..6b68d5c01 100644 --- a/livesupport/modules/storage/src/WebStorageClient.cxx +++ b/livesupport/modules/storage/src/WebStorageClient.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.24 $ + Version : $Revision: 1.25 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/WebStorageClient.cxx,v $ ------------------------------------------------------------------------------*/ @@ -317,20 +317,6 @@ static const std::string savePlaylistNewPlaylistParamName = "newPlaylist"; static const std::string savePlaylistResultParamName = "status"; -/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ storage server constants: acquirePlaylist */ - - - - - - -/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ storage server constants: releasePlaylist */ - - - - - - /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ storage server constants: deletePlaylist */ /*------------------------------------------------------------------------------ @@ -667,11 +653,13 @@ WebStorageClient :: existsPlaylist(Ptr::Ref sessionId, result.clear(); if (!xmlRpcClient.execute(existsPlaylistMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); std::string eMsg = "cannot execute XML-RPC method '"; eMsg += existsPlaylistMethodName; eMsg += "'"; throw XmlRpcCommunicationException(eMsg); } + xmlRpcClient.close(); if (xmlRpcClient.isFault()) { std::stringstream eMsg; @@ -720,6 +708,7 @@ WebStorageClient :: getPlaylist(Ptr::Ref sessionId, result.clear(); if (!xmlRpcClient.execute(getPlaylistOpenMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); std::string eMsg = "cannot execute XML-RPC method '"; eMsg += getPlaylistOpenMethodName; eMsg += "'"; @@ -777,12 +766,14 @@ WebStorageClient :: getPlaylist(Ptr::Ref sessionId, result.clear(); if (!xmlRpcClient.execute(getPlaylistCloseMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); std::string eMsg = "cannot execute XML-RPC method '"; eMsg += getPlaylistCloseMethodName; eMsg += "'"; throw XmlRpcCommunicationException(eMsg); } - + xmlRpcClient.close(); + if (xmlRpcClient.isFault()) { std::stringstream eMsg; eMsg << "XML-RPC method '" @@ -866,11 +857,13 @@ WebStorageClient :: editPlaylistGetUrl(Ptr::Ref sessionId, result.clear(); if (!xmlRpcClient.execute(editPlaylistMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); std::string eMsg = "cannot execute XML-RPC method '"; eMsg += editPlaylistMethodName; eMsg += "'"; throw XmlRpcCommunicationException(eMsg); } + xmlRpcClient.close(); if (xmlRpcClient.isFault()) { std::stringstream eMsg; @@ -929,11 +922,13 @@ WebStorageClient :: savePlaylist(Ptr::Ref sessionId, result.clear(); if (!xmlRpcClient.execute(savePlaylistMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); std::string eMsg = "cannot execute XML-RPC method '"; eMsg += savePlaylistMethodName; eMsg += "'"; throw XmlRpcCommunicationException(eMsg); } + xmlRpcClient.close(); if (xmlRpcClient.isFault()) { std::stringstream eMsg; @@ -1131,11 +1126,13 @@ WebStorageClient :: deletePlaylist(Ptr::Ref sessionId, result.clear(); if (!xmlRpcClient.execute(deletePlaylistMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); std::string eMsg = "cannot execute XML-RPC method '"; eMsg += deletePlaylistMethodName; eMsg += "'"; throw XmlRpcCommunicationException(eMsg); } + xmlRpcClient.close(); if (xmlRpcClient.isFault()) { std::stringstream eMsg; @@ -1200,11 +1197,13 @@ WebStorageClient :: createPlaylist(Ptr::Ref sessionId) result.clear(); if (!xmlRpcClient.execute(createPlaylistMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); std::string eMsg = "cannot execute XML-RPC method '"; eMsg += createPlaylistMethodName; eMsg += "'"; throw XmlRpcCommunicationException(eMsg); } + xmlRpcClient.close(); if (xmlRpcClient.isFault()) { std::stringstream eMsg; @@ -1271,11 +1270,13 @@ WebStorageClient :: existsAudioClip(Ptr::Ref sessionId, result.clear(); if (!xmlRpcClient.execute(existsAudioClipMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); std::string eMsg = "cannot execute XML-RPC method '"; eMsg += existsAudioClipMethodName; eMsg += "'"; throw XmlRpcCommunicationException(eMsg); } + xmlRpcClient.close(); if (xmlRpcClient.isFault()) { std::stringstream eMsg; @@ -1324,6 +1325,7 @@ WebStorageClient :: getAudioClip(Ptr::Ref sessionId, result.clear(); if (!xmlRpcClient.execute(getAudioClipOpenMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); std::string eMsg = "cannot execute XML-RPC method '"; eMsg += getAudioClipOpenMethodName; eMsg += "'"; @@ -1383,11 +1385,13 @@ WebStorageClient :: getAudioClip(Ptr::Ref sessionId, result.clear(); if (!xmlRpcClient.execute(getAudioClipCloseMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); std::string eMsg = "cannot execute XML-RPC method '"; eMsg += getAudioClipCloseMethodName; eMsg += "'"; throw XmlRpcCommunicationException(eMsg); } + xmlRpcClient.close(); if (xmlRpcClient.isFault()) { std::stringstream eMsg; @@ -1462,6 +1466,7 @@ WebStorageClient :: storeAudioClip(Ptr::Ref sessionId, result.clear(); if (!xmlRpcClient.execute(storeAudioClipOpenMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); std::string eMsg = "cannot execute XML-RPC method '"; eMsg += storeAudioClipOpenMethodName; eMsg += "'"; @@ -1538,11 +1543,13 @@ WebStorageClient :: storeAudioClip(Ptr::Ref sessionId, result.clear(); if (!xmlRpcClient.execute(storeAudioClipCloseMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); std::string eMsg = "cannot execute XML-RPC method '"; eMsg += storeAudioClipCloseMethodName; eMsg += "'"; throw XmlRpcCommunicationException(eMsg); } + xmlRpcClient.close(); if (xmlRpcClient.isFault()) { std::stringstream eMsg; @@ -1601,11 +1608,13 @@ WebStorageClient :: acquireAudioClip(Ptr::Ref sessionId, result.clear(); if (!xmlRpcClient.execute(acquireAudioClipMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); std::string eMsg = "cannot execute XML-RPC method '"; eMsg += acquireAudioClipMethodName; eMsg += "'"; throw XmlRpcCommunicationException(eMsg); } + xmlRpcClient.close(); if (xmlRpcClient.isFault()) { std::stringstream eMsg; @@ -1665,11 +1674,13 @@ WebStorageClient :: releaseAudioClip(Ptr::Ref sessionId, result.clear(); if (!xmlRpcClient.execute(releaseAudioClipMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); std::string eMsg = "cannot execute XML-RPC method '"; eMsg += releaseAudioClipMethodName; eMsg += "'"; throw XmlRpcCommunicationException(eMsg); } + xmlRpcClient.close(); if (xmlRpcClient.isFault()) { std::stringstream eMsg; @@ -1728,11 +1739,13 @@ WebStorageClient :: deleteAudioClip(Ptr::Ref sessionId, result.clear(); if (!xmlRpcClient.execute(deleteAudioClipMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); std::string eMsg = "cannot execute XML-RPC method '"; eMsg += deleteAudioClipMethodName; eMsg += "'"; throw XmlRpcCommunicationException(eMsg); } + xmlRpcClient.close(); if (xmlRpcClient.isFault()) { std::stringstream eMsg; @@ -1797,11 +1810,13 @@ WebStorageClient :: reset(void) result.clear(); if (!xmlRpcClient.execute(resetStorageMethodName.c_str(), parameters, result)) { + xmlRpcClient.close(); std::string eMsg = "cannot execute XML-RPC method '"; eMsg += resetStorageMethodName; eMsg += "'"; throw XmlRpcCommunicationException(eMsg); } + xmlRpcClient.close(); if (xmlRpcClient.isFault()) { std::stringstream eMsg; diff --git a/livesupport/products/scheduler/src/RpcAddAudioClipToPlaylistTest.cxx b/livesupport/products/scheduler/src/RpcAddAudioClipToPlaylistTest.cxx index ead99aea1..4db2e79f4 100644 --- a/livesupport/products/scheduler/src/RpcAddAudioClipToPlaylistTest.cxx +++ b/livesupport/products/scheduler/src/RpcAddAudioClipToPlaylistTest.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.8 $ + Version : $Revision: 1.9 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcAddAudioClipToPlaylistTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -217,4 +217,6 @@ RpcAddAudioClipToPlaylistTest :: firstTest(void) result.clear(); xmlRpcClient.execute("addAudioClipToPlaylist", parameters, result); CPPUNIT_ASSERT(!xmlRpcClient.isFault()); + +// xmlRpcClient.close(); } diff --git a/livesupport/products/scheduler/src/RpcCreatePlaylistTest.cxx b/livesupport/products/scheduler/src/RpcCreatePlaylistTest.cxx index f95a13398..ae44a8b5e 100644 --- a/livesupport/products/scheduler/src/RpcCreatePlaylistTest.cxx +++ b/livesupport/products/scheduler/src/RpcCreatePlaylistTest.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.2 $ + Version : $Revision: 1.3 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcCreatePlaylistTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -210,4 +210,6 @@ RpcCreatePlaylistTest :: firstTest(void) CPPUNIT_ASSERT(xmlRpcClient.isFault()); CPPUNIT_ASSERT(result.hasMember("faultCode")); CPPUNIT_ASSERT(int(result["faultCode"]) == 105); + + xmlRpcClient.close(); } diff --git a/livesupport/products/scheduler/src/RpcDeletePlaylistTest.cxx b/livesupport/products/scheduler/src/RpcDeletePlaylistTest.cxx index 7be671737..1de5b0603 100644 --- a/livesupport/products/scheduler/src/RpcDeletePlaylistTest.cxx +++ b/livesupport/products/scheduler/src/RpcDeletePlaylistTest.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.2 $ + Version : $Revision: 1.3 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/Attic/RpcDeletePlaylistTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -212,6 +212,8 @@ RpcDeletePlaylistTest :: firstTest(void) result.clear(); xmlRpcClient.execute("deletePlaylist", parameters, result); CPPUNIT_ASSERT(!xmlRpcClient.isFault()); + + xmlRpcClient.close(); } @@ -234,5 +236,7 @@ RpcDeletePlaylistTest :: negativeTest(void) CPPUNIT_ASSERT(xmlRpcClient.isFault()); CPPUNIT_ASSERT(result.hasMember("faultCode")); CPPUNIT_ASSERT(int(result["faultCode"]) == 903); // playlist not found + + xmlRpcClient.close(); } diff --git a/livesupport/products/scheduler/src/RpcDisplayAudioClipTest.cxx b/livesupport/products/scheduler/src/RpcDisplayAudioClipTest.cxx index c58b09ee8..e87a600c7 100644 --- a/livesupport/products/scheduler/src/RpcDisplayAudioClipTest.cxx +++ b/livesupport/products/scheduler/src/RpcDisplayAudioClipTest.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.5 $ + Version : $Revision: 1.6 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcDisplayAudioClipTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -182,6 +182,8 @@ DisplayAudioClipMethodTest :: firstTest(void) CPPUNIT_ASSERT(result.hasMember("playlength")); CPPUNIT_ASSERT(result["playlength"].getType() == XmlRpcValue::TypeInt); CPPUNIT_ASSERT(int(result["playlength"]) == 60 * 60); + + xmlRpcClient.close(); } @@ -204,4 +206,6 @@ DisplayAudioClipMethodTest :: negativeTest(void) CPPUNIT_ASSERT(xmlRpcClient.isFault()); CPPUNIT_ASSERT(result.hasMember("faultCode")); CPPUNIT_ASSERT(int(result["faultCode"]) == 603); // audio clip not found + + xmlRpcClient.close(); } diff --git a/livesupport/products/scheduler/src/RpcDisplayAudioClipsTest.cxx b/livesupport/products/scheduler/src/RpcDisplayAudioClipsTest.cxx index ddcb2b039..a57486cfb 100644 --- a/livesupport/products/scheduler/src/RpcDisplayAudioClipsTest.cxx +++ b/livesupport/products/scheduler/src/RpcDisplayAudioClipsTest.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.2 $ + Version : $Revision: 1.3 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcDisplayAudioClipsTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -188,5 +188,7 @@ DisplayAudioClipsMethodTest :: firstTest(void) CPPUNIT_ASSERT(audioClip.hasMember("playlength")); CPPUNIT_ASSERT(audioClip["playlength"].getType() == XmlRpcValue::TypeInt); CPPUNIT_ASSERT(int(audioClip["playlength"]) == 30 * 60); + + xmlRpcClient.close(); } diff --git a/livesupport/products/scheduler/src/RpcDisplayPlaylistTest.cxx b/livesupport/products/scheduler/src/RpcDisplayPlaylistTest.cxx index 7a658a324..399443c06 100644 --- a/livesupport/products/scheduler/src/RpcDisplayPlaylistTest.cxx +++ b/livesupport/products/scheduler/src/RpcDisplayPlaylistTest.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.7 $ + Version : $Revision: 1.8 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcDisplayPlaylistTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -198,6 +198,8 @@ RpcDisplayPlaylistTest :: simpleTest(void) CPPUNIT_ASSERT(std::string(result["id"]) == "0000000000000001"); CPPUNIT_ASSERT(int(result["playlength"]) == 90 * 60); + + xmlRpcClient.close(); } @@ -219,4 +221,6 @@ RpcDisplayPlaylistTest :: negativeTest(void) result.clear(); xmlRpcClient.execute("displayPlaylist", parameters, result); CPPUNIT_ASSERT(xmlRpcClient.isFault()); + + xmlRpcClient.close(); } diff --git a/livesupport/products/scheduler/src/RpcDisplayPlaylistsTest.cxx b/livesupport/products/scheduler/src/RpcDisplayPlaylistsTest.cxx index 926251568..1ba9df76a 100644 --- a/livesupport/products/scheduler/src/RpcDisplayPlaylistsTest.cxx +++ b/livesupport/products/scheduler/src/RpcDisplayPlaylistsTest.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.5 $ + Version : $Revision: 1.6 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcDisplayPlaylistsTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -183,4 +183,6 @@ DisplayPlaylistsMethodTest :: firstTest(void) CPPUNIT_ASSERT(playlist.hasMember("playlength")); CPPUNIT_ASSERT(playlist["playlength"].getType() == XmlRpcValue::TypeInt); CPPUNIT_ASSERT(int(playlist["playlength"]) == 90 * 60); + + xmlRpcClient.close(); } diff --git a/livesupport/products/scheduler/src/RpcDisplayScheduleTest.cxx b/livesupport/products/scheduler/src/RpcDisplayScheduleTest.cxx index 970c7e1ce..161cfb1ed 100644 --- a/livesupport/products/scheduler/src/RpcDisplayScheduleTest.cxx +++ b/livesupport/products/scheduler/src/RpcDisplayScheduleTest.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.4 $ + Version : $Revision: 1.5 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcDisplayScheduleTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -197,5 +197,7 @@ RpcDisplayScheduleTest :: simpleTest(void) xmlRpcClient.execute("displaySchedule", parameters, result); CPPUNIT_ASSERT(!xmlRpcClient.isFault()); CPPUNIT_ASSERT(result.size() == 0); + + xmlRpcClient.close(); } diff --git a/livesupport/products/scheduler/src/RpcGetSchedulerTimeTest.cxx b/livesupport/products/scheduler/src/RpcGetSchedulerTimeTest.cxx index bf2475ba2..f0aa7d4ae 100644 --- a/livesupport/products/scheduler/src/RpcGetSchedulerTimeTest.cxx +++ b/livesupport/products/scheduler/src/RpcGetSchedulerTimeTest.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.2 $ + Version : $Revision: 1.3 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcGetSchedulerTimeTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -160,5 +160,7 @@ RpcGetSchedulerTimeTest :: simpleTest(void) CPPUNIT_ASSERT(time1.tm_hour <= time2.tm_hour); CPPUNIT_ASSERT(time1.tm_min <= time2.tm_min); CPPUNIT_ASSERT(time1.tm_min + 1 >= time2.tm_min); + + xmlRpcClient.close(); } diff --git a/livesupport/products/scheduler/src/RpcGetVersionTest.cxx b/livesupport/products/scheduler/src/RpcGetVersionTest.cxx index 7d468a13d..ab8dcd24f 100644 --- a/livesupport/products/scheduler/src/RpcGetVersionTest.cxx +++ b/livesupport/products/scheduler/src/RpcGetVersionTest.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.2 $ + Version : $Revision: 1.3 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcGetVersionTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -152,5 +152,7 @@ RpcGetVersionTest :: simpleTest(void) CPPUNIT_ASSERT(result.hasMember("version")); std::string versionStr = result["version"]; CPPUNIT_ASSERT(versionStr.find(versionPrefix) == 0); + + xmlRpcClient.close(); } diff --git a/livesupport/products/scheduler/src/RpcRemoveFromScheduleTest.cxx b/livesupport/products/scheduler/src/RpcRemoveFromScheduleTest.cxx index 76a3ce5d3..048acb3a3 100644 --- a/livesupport/products/scheduler/src/RpcRemoveFromScheduleTest.cxx +++ b/livesupport/products/scheduler/src/RpcRemoveFromScheduleTest.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.5 $ + Version : $Revision: 1.6 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcRemoveFromScheduleTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -199,6 +199,8 @@ RpcRemoveFromScheduleTest :: simpleTest(void) result.clear(); xmlRpcClient.execute("removeFromSchedule", parameters, result); CPPUNIT_ASSERT(!xmlRpcClient.isFault()); + + xmlRpcClient.close(); } @@ -220,5 +222,7 @@ RpcRemoveFromScheduleTest :: negativeTest(void) result.clear(); xmlRpcClient.execute("removeFromSchedule", parameters, result); CPPUNIT_ASSERT(xmlRpcClient.isFault()); + + xmlRpcClient.close(); } diff --git a/livesupport/products/scheduler/src/RpcRescheduleTest.cxx b/livesupport/products/scheduler/src/RpcRescheduleTest.cxx index 74a5b56ce..49bb10560 100644 --- a/livesupport/products/scheduler/src/RpcRescheduleTest.cxx +++ b/livesupport/products/scheduler/src/RpcRescheduleTest.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.5 $ + Version : $Revision: 1.6 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcRescheduleTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -223,6 +223,8 @@ RpcRescheduleTest :: simpleTest(void) result.clear(); xmlRpcClient.execute("reschedule", parameters, result); CPPUNIT_ASSERT(xmlRpcClient.isFault()); + + xmlRpcClient.close(); } @@ -244,5 +246,7 @@ RpcRescheduleTest :: negativeTest(void) result.clear(); xmlRpcClient.execute("removeFromSchedule", parameters, result); CPPUNIT_ASSERT(xmlRpcClient.isFault()); + + xmlRpcClient.close(); } diff --git a/livesupport/products/scheduler/src/RpcUploadPlaylistTest.cxx b/livesupport/products/scheduler/src/RpcUploadPlaylistTest.cxx index e8e5ee8b3..8562da65b 100644 --- a/livesupport/products/scheduler/src/RpcUploadPlaylistTest.cxx +++ b/livesupport/products/scheduler/src/RpcUploadPlaylistTest.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.6 $ + Version : $Revision: 1.7 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcUploadPlaylistTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -191,5 +191,7 @@ RpcUploadPlaylistTest :: simpleTest(void) result.clear(); xmlRpcClient.execute("uploadPlaylist", parameters, result); CPPUNIT_ASSERT(!xmlRpcClient.isFault()); + + xmlRpcClient.close(); }