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

ClientTestConfig: turned plain function pointer for "createSourceA/B" into boost::function 

The intention is that backends shall be able to bind additional
parameters to their implementation of the callbacks. The default
implementation used by most (all?) backends was adapted, so no
changes there are necessary.
This commit is contained in:
Patrick Ohly 2011-03-02 11:50:40 +01:00
parent b2d6c401e2
commit 9351512a2a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/client-test-app.cpp
View File

@ -40,6 +40,8 @@
#include <syncevo/util.h>
#include <syncevo/VolatileConfigNode.h>
#include <boost/bind.hpp>
#include <syncevo/declarations.h>
#ifdef ENABLE_BUTEO_TESTS
@ -309,7 +311,7 @@ public:
static void getSourceConfig(const RegisterSyncSourceTest *test, Config &config) {
memset(&config, 0, sizeof(config));
ClientTest::getTestData(test->m_testCaseName.c_str(), config);
config.createSourceA = createSource;
config.createSourceA = boost::bind(createSource, _1, _2, _3);
config.createSourceB = createSource;
config.sourceName = test->m_configName.c_str();
@ -482,11 +484,11 @@ private:
// implement Evolution shutdown workaround (see lockEvolution above)
evClient.checkEvolutionSource(name);
return evClient.createSource(name, isSourceA);
return evClient.createNamedSource(name, isSourceA);
}
/** called internally in this class */
TestingSyncSource *createSource(const string &name, bool isSourceA) {
TestingSyncSource *createNamedSource(const string &name, bool isSourceA) {
string database = getDatabaseName(name);
boost::shared_ptr<SyncConfig> context(new SyncConfig("source-config@client-test"));
SyncSourceNodes nodes = context->getSyncSourceNodes(name,
@ -545,7 +547,7 @@ private:
if (!basename.empty() &&
lockEvolution.find(basename) == lockEvolution.end()) {
lockEvolution[basename].reset(createSource(name, true));
lockEvolution[basename].reset(createNamedSource(name, true));
lockEvolution[basename]->open();
ClientTest::registerCleanup(CleanupSources);
}

2
src/syncevo/SyncSource.h
View File

@ -203,7 +203,7 @@ struct ClientTestConfig{
* @param isSourceA true if the requested SyncSource is the first one accessing that
* data, otherwise the second
*/
typedef TestingSyncSource *(*createsource_t)(ClientTest &client, int source, bool isSourceA);
typedef boost::function<TestingSyncSource *(ClientTest &, int, bool)> createsource_t;
/**
* Creates a sync source which references the primary database;