test additional aspects of --template and --print-servers
git-svn-id: https://zeitsenke.de/svn/SyncEvolution/trunk@548 15ad00c4-1369-45f4-8270-35d70d36bdcd
This commit is contained in:
parent
4df1de7eed
commit
b46e154524
|
@ -528,7 +528,7 @@ static string diffStrings(const string &lhs, const string &rhs)
|
||||||
++lit;
|
++lit;
|
||||||
}
|
}
|
||||||
|
|
||||||
while (lit != string_split_iterator()) {
|
while (rit != string_split_iterator()) {
|
||||||
res << "> " << *rit << endl;
|
res << "> " << *rit << endl;
|
||||||
++rit;
|
++rit;
|
||||||
}
|
}
|
||||||
|
@ -567,8 +567,11 @@ class SyncEvolutionCmdlineTest : public CppUnit::TestFixture {
|
||||||
CPPUNIT_TEST_SUITE(SyncEvolutionCmdlineTest);
|
CPPUNIT_TEST_SUITE(SyncEvolutionCmdlineTest);
|
||||||
CPPUNIT_TEST(testFramework);
|
CPPUNIT_TEST(testFramework);
|
||||||
CPPUNIT_TEST(testSetupScheduleWorld);
|
CPPUNIT_TEST(testSetupScheduleWorld);
|
||||||
|
CPPUNIT_TEST(testSetupDefault);
|
||||||
|
CPPUNIT_TEST(testSetupRenamed);
|
||||||
CPPUNIT_TEST(testSetupFunambol);
|
CPPUNIT_TEST(testSetupFunambol);
|
||||||
CPPUNIT_TEST(testSetupSynthesis);
|
CPPUNIT_TEST(testSetupSynthesis);
|
||||||
|
CPPUNIT_TEST(testPrintServers);
|
||||||
CPPUNIT_TEST(testTemplate);
|
CPPUNIT_TEST(testTemplate);
|
||||||
|
|
||||||
CPPUNIT_TEST_SUITE_END();
|
CPPUNIT_TEST_SUITE_END();
|
||||||
|
@ -653,13 +656,44 @@ protected:
|
||||||
root += "/syncevolution/scheduleworld";
|
root += "/syncevolution/scheduleworld";
|
||||||
rm_r(root);
|
rm_r(root);
|
||||||
TestCmdline cmdline("--configure",
|
TestCmdline cmdline("--configure",
|
||||||
"--template", "scheduleworld",
|
|
||||||
"scheduleworld",
|
"scheduleworld",
|
||||||
NULL);
|
NULL);
|
||||||
cmdline.doit();
|
cmdline.doit();
|
||||||
string res = scanFiles(root);
|
string res = scanFiles(root);
|
||||||
CPPUNIT_ASSERT_EQUAL_DIFF(string(m_scheduleWorldConfig), res);
|
CPPUNIT_ASSERT_EQUAL_DIFF(string(m_scheduleWorldConfig), res);
|
||||||
}
|
}
|
||||||
|
void testSetupDefault() {
|
||||||
|
string root;
|
||||||
|
ScopedEnvChange xdg("XDG_CONFIG_HOME", m_testDir);
|
||||||
|
ScopedEnvChange home("HOME", m_testDir);
|
||||||
|
|
||||||
|
root = m_testDir;
|
||||||
|
root += "/syncevolution/some-other-server";
|
||||||
|
rm_r(root);
|
||||||
|
TestCmdline cmdline("--configure",
|
||||||
|
"--template", "default",
|
||||||
|
"some-other-server",
|
||||||
|
NULL);
|
||||||
|
cmdline.doit();
|
||||||
|
string res = scanFiles(root);
|
||||||
|
CPPUNIT_ASSERT_EQUAL_DIFF(string(m_scheduleWorldConfig), res);
|
||||||
|
}
|
||||||
|
void testSetupRenamed() {
|
||||||
|
string root;
|
||||||
|
ScopedEnvChange xdg("XDG_CONFIG_HOME", m_testDir);
|
||||||
|
ScopedEnvChange home("HOME", m_testDir);
|
||||||
|
|
||||||
|
root = m_testDir;
|
||||||
|
root += "/syncevolution/scheduleworld2";
|
||||||
|
rm_r(root);
|
||||||
|
TestCmdline cmdline("--configure",
|
||||||
|
"--template", "scheduleworld",
|
||||||
|
"scheduleworld2",
|
||||||
|
NULL);
|
||||||
|
cmdline.doit();
|
||||||
|
string res = scanFiles(root);
|
||||||
|
CPPUNIT_ASSERT_EQUAL_DIFF(string(m_scheduleWorldConfig), res);
|
||||||
|
}
|
||||||
void testSetupFunambol() {
|
void testSetupFunambol() {
|
||||||
string root;
|
string root;
|
||||||
ScopedEnvChange xdg("XDG_CONFIG_HOME", m_testDir);
|
ScopedEnvChange xdg("XDG_CONFIG_HOME", m_testDir);
|
||||||
|
@ -669,7 +703,6 @@ protected:
|
||||||
root += "/syncevolution/funambol";
|
root += "/syncevolution/funambol";
|
||||||
rm_r(root);
|
rm_r(root);
|
||||||
TestCmdline cmdline("--configure",
|
TestCmdline cmdline("--configure",
|
||||||
"--template", "funambol",
|
|
||||||
"funambol",
|
"funambol",
|
||||||
NULL);
|
NULL);
|
||||||
cmdline.doit();
|
cmdline.doit();
|
||||||
|
@ -715,7 +748,6 @@ protected:
|
||||||
root += "/syncevolution/synthesis";
|
root += "/syncevolution/synthesis";
|
||||||
rm_r(root);
|
rm_r(root);
|
||||||
TestCmdline cmdline("--configure",
|
TestCmdline cmdline("--configure",
|
||||||
"--template", "synthesis",
|
|
||||||
"synthesis",
|
"synthesis",
|
||||||
NULL);
|
NULL);
|
||||||
cmdline.doit();
|
cmdline.doit();
|
||||||
|
@ -765,6 +797,25 @@ protected:
|
||||||
CPPUNIT_ASSERT_EQUAL_DIFF("", help.m_err.str());
|
CPPUNIT_ASSERT_EQUAL_DIFF("", help.m_err.str());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void testPrintServers() {
|
||||||
|
ScopedEnvChange xdg("XDG_CONFIG_HOME", m_testDir);
|
||||||
|
ScopedEnvChange home("HOME", m_testDir);
|
||||||
|
|
||||||
|
rm_r(m_testDir);
|
||||||
|
testSetupScheduleWorld();
|
||||||
|
testSetupSynthesis();
|
||||||
|
testSetupFunambol();
|
||||||
|
|
||||||
|
TestCmdline cmdline("--print-servers", NULL);
|
||||||
|
cmdline.doit();
|
||||||
|
CPPUNIT_ASSERT_EQUAL_DIFF("Configured servers:\n"
|
||||||
|
" scheduleworld = SyncEvolutionCmdlineTest/syncevolution/scheduleworld\n"
|
||||||
|
" synthesis = SyncEvolutionCmdlineTest/syncevolution/synthesis\n"
|
||||||
|
" funambol = SyncEvolutionCmdlineTest/syncevolution/funambol\n",
|
||||||
|
cmdline.m_out.str());
|
||||||
|
CPPUNIT_ASSERT_EQUAL_DIFF("", cmdline.m_err.str());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
const string m_testDir;
|
const string m_testDir;
|
||||||
const string m_scheduleWorldConfig;
|
const string m_scheduleWorldConfig;
|
||||||
|
|
Loading…
Reference in New Issue