maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nightly testing: adapted Cmdline test to string changes

Browse source
This commit is contained in:
Patrick Ohly 2010-09-09 11:38:05 +02:00
parent a62e0d0a9d
commit 5a8574b7b1
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/syncevo/Cmdline.cpp
View file

@ -1496,9 +1496,10 @@ static string lastLine(const string &buffer)
// true if <word> =
static bool isPropAssignment(const string &buffer) {
// ignore these 2 comments
// ignore these comments (occur in type description)
if (boost::starts_with(buffer, "KCalExtended = ") ||
boost::starts_with(buffer, "QtContacts = ")) {
boost::starts_with(buffer, "mkcal = ") ||
boost::starts_with(buffer, "QtContacts = ")) {
return false;
}
@ -2356,7 +2357,7 @@ protected:
TestCmdline help("--sync", " ?", NULL);
help.doit();
CPPUNIT_ASSERT_EQUAL_DIFF("--sync\n"
" requests a certain synchronization mode:\n"
" Requests a certain synchronization mode when initiating a sync:\n"
" two-way = only send/receive changes since last sync\n"
" slow = exchange all items\n"
" refresh-from-client = discard all remote items and replace with\n"
@ -2365,7 +2366,13 @@ protected:
" the items on the server\n"
" one-way-from-client = transmit changes from client\n"
" one-way-from-server = transmit changes from server\n"
" none (or disabled) = synchronization disabled\n",
" disabled (or none) = synchronization disabled\n"
" When accepting a sync session in a SyncML server (HTTP server), only\n"
" sources with sync != disabled are made available to the client,\n"
" which chooses the final sync mode based on its own configuration.\n"
" When accepting a sync session in a SyncML client (local sync with\n"
" the server contacting SyncEvolution on a device), the sync mode\n"
" specified in the client is typically overriden by the server.\n",
help.m_out.str());
CPPUNIT_ASSERT_EQUAL_DIFF("", help.m_err.str());