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

AutoSync: fixed testing

Browse source 
Instantiating an ActiveSyncSource for testing must work with
empty database names now. Testing no longer forces the
database to be set.

While at it rewrote the code to avoid the explicit pointer.
This commit is contained in:
Patrick Ohly 2012-07-20 12:52:37 +00:00
parent abc81eb117
commit f1b14c6418
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/backends/activesync/ActiveSyncSourceRegister.cpp
View file

@ -188,26 +188,24 @@ static TestingSyncSource *createEASSource(const ClientTestConfig::createsource_t
const std::string &clientID,
int source, bool isSourceA)
{
TestingSyncSource *res = create(client, clientID, source, isSourceA);
std::auto_ptr<TestingSyncSource> res(create(client, clientID, source, isSourceA));
// Mangle username: if the base username in the config is account
// "foo", then source B uses "foo_B", because otherwise it'll end
// up sharing change tracking with source A.
if (!isSourceA) {
ActiveSyncSource *eassource = static_cast<ActiveSyncSource *>(res);
ActiveSyncSource *eassource = static_cast<ActiveSyncSource *>(res.get());
std::string account = eassource->getSyncConfig().getSyncUsername();
account += "_B";
eassource->getSyncConfig().setSyncUsername(account, true);
}
if (boost::ends_with(res->getDatabaseID(), "_1")) {
// only default database currently supported,
// use that instead of first named database
res->setDatabaseID("");
return res;
if (res->getDatabaseID().empty()) {
return res.release();
} else {
// sorry, no database
delete res;
SE_LOG_ERROR(NULL, NULL, "cannot create EAS source for database %s, check config",
res->getDatabaseID().c_str());
return NULL;
}
}