testing: adapted Cmdline tests to revised config descriptions

Formatting was changed and a new warning was inserte for "sync".
This commit is contained in:
Patrick Ohly 2011-10-26 07:13:16 +00:00
parent 87e1f6d9f9
commit bb222f236a
1 changed files with 64 additions and 55 deletions

View File

@ -3165,15 +3165,25 @@ protected:
help.doit();
CPPUNIT_ASSERT_EQUAL_DIFF("--sync\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"
" the items on the client\n"
" refresh-from-server = discard all local items and replace with\n"
" the items on the server\n"
" one-way-from-client = transmit changes from client\n"
" one-way-from-server = transmit changes from server\n"
" disabled (or none) = synchronization disabled\n"
" \n"
" two-way\n"
" only send/receive changes since last sync\n"
" slow\n"
" exchange all items\n"
" refresh-from-client\n"
" discard all remote items and replace with the items on the client\n"
" refresh-from-server\n"
" discard all local items and replace with the items on the server\n"
" one-way-from-client\n"
" transmit changes from client\n"
" one-way-from-server\n"
" transmit changes from server\n"
" disabled (or none)\n"
" synchronization disabled\n"
" \n"
" **WARNING**: which side is `client` and which is `server` depends on\n"
" the value of the ``peerIsClient`` property in the configuration.\n"
" \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"
@ -3314,94 +3324,93 @@ protected:
CPPUNIT_ASSERT(shared.find("databaseFormat = text/x-vcard") != shared.npos);
}
string syncProperties("syncURL:\n"
string syncProperties("syncURL (no default, unshared, required)\n"
"\n"
"username:\n"
"username (no default, unshared)\n"
"\n"
"password:\n"
"password (no default, unshared)\n"
"\n"
"logdir:\n"
"logdir (no default, shared)\n"
"\n"
"loglevel:\n"
"loglevel (0, unshared)\n"
"\n"
"printChanges:\n"
"printChanges (TRUE, unshared)\n"
"\n"
"dumpData:\n"
"dumpData (TRUE, unshared)\n"
"\n"
"maxlogdirs:\n"
"maxlogdirs (10, shared)\n"
"\n"
"autoSync:\n"
"autoSync (0, unshared)\n"
"\n"
"autoSyncInterval:\n"
"autoSyncInterval (30M, unshared)\n"
"\n"
"autoSyncDelay:\n"
"autoSyncDelay (5M, unshared)\n"
"\n"
"preventSlowSync:\n"
"preventSlowSync (TRUE, unshared)\n"
"\n"
"useProxy:\n"
"useProxy (FALSE, unshared)\n"
"\n"
"proxyHost:\n"
"proxyHost (no default, unshared)\n"
"\n"
"proxyUsername:\n"
"proxyUsername (no default, unshared)\n"
"\n"
"proxyPassword:\n"
"proxyPassword (no default, unshared)\n"
"\n"
"clientAuthType:\n"
"clientAuthType (md5, unshared)\n"
"\n"
"RetryDuration:\n"
"RetryDuration (5M, unshared)\n"
"\n"
"RetryInterval:\n"
"RetryInterval (2M, unshared)\n"
"\n"
"remoteIdentifier:\n"
"remoteIdentifier (no default, unshared)\n"
"\n"
"PeerIsClient:\n"
"PeerIsClient (FALSE, unshared)\n"
"\n"
"SyncMLVersion:\n"
"SyncMLVersion (no default, unshared)\n"
"\n"
"PeerName:\n"
"PeerName (no default, unshared)\n"
"\n"
"deviceId:\n"
"deviceId (no default, shared)\n"
"\n"
"remoteDeviceId:\n"
"remoteDeviceId (no default, unshared)\n"
"\n"
"enableWBXML:\n"
"enableWBXML (TRUE, unshared)\n"
"\n"
"maxMsgSize:\n"
"maxObjSize:\n"
"maxMsgSize (150000, unshared), maxObjSize (4000000, unshared)\n"
"\n"
"enableCompression:\n"
"enableCompression (FALSE, unshared)\n"
"\n"
"SSLServerCertificates:\n"
"SSLServerCertificates (" SYNCEVOLUTION_SSL_SERVER_CERTIFICATES ", unshared)\n"
"\n"
"SSLVerifyServer:\n"
"SSLVerifyServer (TRUE, unshared)\n"
"\n"
"SSLVerifyHost:\n"
"SSLVerifyHost (TRUE, unshared)\n"
"\n"
"WebURL:\n"
"WebURL (no default, unshared)\n"
"\n"
"IconURI:\n"
"IconURI (no default, unshared)\n"
"\n"
"ConsumerReady:\n"
"ConsumerReady (FALSE, unshared)\n"
"\n"
"peerType:\n"
"peerType (no default, unshared)\n"
"\n"
"defaultPeer:\n");
string sourceProperties("sync:\n"
"defaultPeer (no default, global)\n");
string sourceProperties("sync (disabled, unshared, required)\n"
"\n"
"uri:\n"
"uri (no default, unshared)\n"
"\n"
"backend:\n"
"backend (select backend, shared)\n"
"\n"
"syncFormat:\n"
"syncFormat (no default, unshared)\n"
"\n"
"forceSyncFormat:\n"
"forceSyncFormat (FALSE, unshared)\n"
"\n"
"database:\n"
"database = evolutionsource (no default, shared)\n"
"\n"
"databaseFormat:\n"
"databaseFormat (no default, shared)\n"
"\n"
"databaseUser:\n"
"databasePassword:\n");
"databaseUser = evolutionuser (no default, shared), databasePassword = evolutionpassword (no default, shared)\n");
{
TestCmdline cmdline("--sync-property", "?",