diff --git a/livesupport/products/scheduler/src/GetVersionMethod.cxx b/livesupport/products/scheduler/src/GetVersionMethod.cxx index 94d280836..53237081f 100644 --- a/livesupport/products/scheduler/src/GetVersionMethod.cxx +++ b/livesupport/products/scheduler/src/GetVersionMethod.cxx @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.1 $ + Version : $Revision: 1.2 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/GetVersionMethod.cxx,v $ ------------------------------------------------------------------------------*/ @@ -67,7 +67,9 @@ const std::string GetVersionMethod::methodName = "getVersion"; * The version string. *----------------------------------------------------------------------------*/ const std::string GetVersionMethod::versionStr = - "Scheduler Daemon (" PACKAGE_VERSION ")"; + "LiveSupport Scheduler Daemon " + PACKAGE_VERSION " " + __DATE__; /* =============================================== local function prototypes */ diff --git a/livesupport/products/scheduler/src/GetVersionMethodTest.cxx b/livesupport/products/scheduler/src/GetVersionMethodTest.cxx index 0fb349559..5dc6483f8 100644 --- a/livesupport/products/scheduler/src/GetVersionMethodTest.cxx +++ b/livesupport/products/scheduler/src/GetVersionMethodTest.cxx @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.1 $ + Version : $Revision: 1.2 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/GetVersionMethodTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -58,9 +58,9 @@ using namespace LiveSupport::Scheduler; CPPUNIT_TEST_SUITE_REGISTRATION(GetVersionMethodTest); /** - * The persumed version string. + * The prefix of the persumed version string. */ -static const std::string versionStr = "Scheduler Daemon (" PACKAGE_VERSION ")"; +static const std::string versionPrefix = "LiveSupport Scheduler Daemon"; /* =============================================== local function prototypes */ @@ -107,6 +107,7 @@ GetVersionMethodTest :: firstTest(void) CPPUNIT_FAIL(eMsg.str()); } CPPUNIT_ASSERT(result.hasMember("version")); - CPPUNIT_ASSERT(result["version"] == versionStr); + std::string versionStr = result["version"]; + CPPUNIT_ASSERT(versionStr.find(versionPrefix) == 0); } diff --git a/livesupport/products/scheduler/src/SchedulerDaemonGetVersionTest.cxx b/livesupport/products/scheduler/src/SchedulerDaemonGetVersionTest.cxx index f823c8345..f54c85767 100644 --- a/livesupport/products/scheduler/src/SchedulerDaemonGetVersionTest.cxx +++ b/livesupport/products/scheduler/src/SchedulerDaemonGetVersionTest.cxx @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.1 $ + Version : $Revision: 1.2 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/Attic/SchedulerDaemonGetVersionTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -66,9 +66,9 @@ CPPUNIT_TEST_SUITE_REGISTRATION(SchedulerDaemonGetVersionTest); static const std::string configFileName = "etc/scheduler.xml"; /** - * The persumed version string. + * The prefix of the persumed version string. */ -static const std::string versionStr = "Scheduler Daemon (" PACKAGE_VERSION ")"; +static const std::string versionPrefix = "LiveSupport Scheduler Daemon"; /* =============================================== local function prototypes */ @@ -149,6 +149,7 @@ SchedulerDaemonGetVersionTest :: simpleTest(void) xmlRpcClient.execute("getVersion", parameters, result); CPPUNIT_ASSERT(!result.hasMember("errorCode")); CPPUNIT_ASSERT(result.hasMember("version")); - CPPUNIT_ASSERT(result["version"] == versionStr); + std::string versionStr = result["version"]; + CPPUNIT_ASSERT(versionStr.find(versionPrefix) == 0); }