changed version string for something better
This commit is contained in:
parent
c0cc88833e
commit
49d0912802
3 changed files with 14 additions and 10 deletions
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
|
|
||||||
Author : $Author: maroy $
|
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 $
|
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.
|
* The version string.
|
||||||
*----------------------------------------------------------------------------*/
|
*----------------------------------------------------------------------------*/
|
||||||
const std::string GetVersionMethod::versionStr =
|
const std::string GetVersionMethod::versionStr =
|
||||||
"Scheduler Daemon (" PACKAGE_VERSION ")";
|
"LiveSupport Scheduler Daemon "
|
||||||
|
PACKAGE_VERSION " "
|
||||||
|
__DATE__;
|
||||||
|
|
||||||
|
|
||||||
/* =============================================== local function prototypes */
|
/* =============================================== local function prototypes */
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
|
|
||||||
Author : $Author: maroy $
|
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 $
|
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);
|
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 */
|
/* =============================================== local function prototypes */
|
||||||
|
@ -107,6 +107,7 @@ GetVersionMethodTest :: firstTest(void)
|
||||||
CPPUNIT_FAIL(eMsg.str());
|
CPPUNIT_FAIL(eMsg.str());
|
||||||
}
|
}
|
||||||
CPPUNIT_ASSERT(result.hasMember("version"));
|
CPPUNIT_ASSERT(result.hasMember("version"));
|
||||||
CPPUNIT_ASSERT(result["version"] == versionStr);
|
std::string versionStr = result["version"];
|
||||||
|
CPPUNIT_ASSERT(versionStr.find(versionPrefix) == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
|
|
||||||
Author : $Author: maroy $
|
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 $
|
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";
|
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 */
|
/* =============================================== local function prototypes */
|
||||||
|
@ -149,6 +149,7 @@ SchedulerDaemonGetVersionTest :: simpleTest(void)
|
||||||
xmlRpcClient.execute("getVersion", parameters, result);
|
xmlRpcClient.execute("getVersion", parameters, result);
|
||||||
CPPUNIT_ASSERT(!result.hasMember("errorCode"));
|
CPPUNIT_ASSERT(!result.hasMember("errorCode"));
|
||||||
CPPUNIT_ASSERT(result.hasMember("version"));
|
CPPUNIT_ASSERT(result.hasMember("version"));
|
||||||
CPPUNIT_ASSERT(result["version"] == versionStr);
|
std::string versionStr = result["version"];
|
||||||
|
CPPUNIT_ASSERT(versionStr.find(versionPrefix) == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue