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

testing: callers of getItems() need to know which file was used (Bugzilla #2421) 

Without that information, the wrong files are compared, leading to false
test failures. Because getItems() is also called indirectly via import(),
this change ripples through several functions.
This commit is contained in:
Patrick Ohly 2009-07-08 18:38:58 +02:00
parent 445bceb9a8
commit 2ae283ee2c
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/ClientTest.cpp
View File

@ -782,14 +782,15 @@ void LocalTests::testImport() {
std::auto_ptr<SyncSource> source;
SOURCE_ASSERT_NO_FAILURE(source.get(), source.reset(createSourceA()));
SOURCE_ASSERT_EQUAL(source.get(), STATUS_OK, source->beginSync(SYNC_NONE));
SOURCE_ASSERT_EQUAL(source.get(), 0, config.import(client, *source.get(), config.testcases));
std::string testcases;
SOURCE_ASSERT_EQUAL(source.get(), 0, config.import(client, *source.get(), config.testcases, testcases));
SOURCE_ASSERT_EQUAL(source.get(), STATUS_OK, source->endSync());
CPPUNIT_ASSERT_NO_THROW(source.reset());
// export again and compare against original file
std::auto_ptr<SyncSource> copy;
SOURCE_ASSERT_NO_FAILURE(copy.get(), copy.reset(createSourceA()));
compareDatabases(config.testcases, *copy.get());
compareDatabases(testcases.c_str(), *copy.get());
CPPUNIT_ASSERT_NO_THROW(source.reset());
}
@ -2483,7 +2484,8 @@ bool SyncTests::doConversionCallback(bool *success,
}
std::list<std::string> items;
ClientTest::getItems(config->testcases, items);
std::string testcases;
ClientTest::getItems(config->testcases, items, testcases);
std::string converted = getCurrentTest();
converted += ".converted.";
converted += config->sourceName;
@ -2504,7 +2506,7 @@ bool SyncTests::doConversionCallback(bool *success,
}
}
out.close();
CPPUNIT_ASSERT(config->compare(client, config->testcases, converted.c_str()));
CPPUNIT_ASSERT(config->compare(client, testcases.c_str(), converted.c_str()));
}
// abort sync after completing the test successfully (no exception so far!)
@ -3239,17 +3241,20 @@ int ClientTest::dump(ClientTest &client, SyncSource &source, const char *file)
return 0;
}
void ClientTest::getItems(const char *file, list<string> &items)
void ClientTest::getItems(const char *file, list<string> &items, std::string &testcases)
{
items.clear();
// import the file
std::ifstream input;
string server = getenv("CLIENT_TEST_SERVER");
input.open ((string (file) + '.' + server +".tem").c_str());
testcases = string(file) + '.' + server +".tem";
input.open(testcases.c_str());
if(input.fail())
input.open(file);
if(input.fail()) {
testcases = file;
input.open(testcases.c_str());
}
CPPUNIT_ASSERT(!input.bad());
CPPUNIT_ASSERT(input.is_open());
std::string data, line;
@ -3277,10 +3282,10 @@ void ClientTest::getItems(const char *file, list<string> &items)
}
}
int ClientTest::import(ClientTest &client, SyncSource &source, const char *file)
int ClientTest::import(ClientTest &client, SyncSource &source, const char *file, std::string &realfile)
{
list<string> items;
getItems(file, items);
getItems(file, items, realfile);
BOOST_FOREACH(string &data, items) {
importItem(&source, data);
}

12
test/ClientTest.h
View File

@ -251,13 +251,17 @@ class ClientTest {
/**
* utility function for splitting file into items with blank lines as separator
*
* @retval realfile If <file>.<server>.tem exists, then it is used instead
* of the generic version. The caller gets the name of the
* file that was opened here.
*/
static void getItems(const char *file, std::list<std::string> &items);
static void getItems(const char *file, std::list<std::string> &items, std::string &realfile);
/**
* utility function for importing items with blank lines as separator
*/
static int import(ClientTest &client, SyncSource &source, const char *file);
static int import(ClientTest &client, SyncSource &source, const char *file, std::string &realfile);
/**
* utility function for comparing vCard and iCal files with the external
@ -477,9 +481,11 @@ class ClientTest {
*
* @param source sync source A already created and with beginSync() called
* @param file the name of the file to import
* @retval realfile the name of the file that was really imported;
* this may depend on the current server that is being tested
* @return error code, 0 for success
*/
int (*import)(ClientTest &client, SyncSource &source, const char *file);
int (*import)(ClientTest &client, SyncSource &source, const char *file, std::string &realfile);
/**
* a function which compares two files with items in the format used by "dump"