Menu
▾
▴
[Opensync-commits] r393 - branches/experimental-branch/tests
|
From: <svn...@op...> - 2005-03-22 14:29:21
|
Author: azrael
Date: 2005-03-22 15:30:03 +0100 (Tue, 22 Mar 2005)
New Revision: 393
Modified:
branches/experimental-branch/tests/check_codes.c
branches/experimental-branch/tests/check_env.c
branches/experimental-branch/tests/check_vcard.c
branches/experimental-branch/tests/support.c
Log:
Finished the changes for the mock plugin. The tests
can now be run without any plugin installed
Modified: branches/experimental-branch/tests/check_codes.c
===================================================================
--- branches/experimental-branch/tests/check_codes.c 2005-03-22 13:41:07 UTC (rev 392)
+++ branches/experimental-branch/tests/check_codes.c 2005-03-22 14:30:03 UTC (rev 393)
@@ -38,9 +38,7 @@
g_setenv("CONNECT_ERROR", "3", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -75,9 +73,7 @@
g_setenv("CONNECT_ERROR", "1", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -113,9 +109,7 @@
g_setenv("CONNECT_ERROR", "5", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -151,9 +145,7 @@
g_setenv("CONNECT_ERROR", "6", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -189,9 +181,7 @@
g_setenv("CONNECT_ERROR", "7", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -227,9 +217,7 @@
g_setenv("CONNECT_ERROR", "2", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -265,9 +253,7 @@
g_setenv("CONNECT_ERROR", "0", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -304,9 +290,7 @@
g_setenv("CONNECT_TIMEOUT", "2", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -343,9 +327,7 @@
g_setenv("CONNECT_TIMEOUT", "3", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -382,9 +364,7 @@
g_setenv("CONNECT_TIMEOUT", "2", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -422,9 +402,7 @@
g_setenv("CONNECT_TIMEOUT", "2", TRUE);
g_setenv("CONNECT_ERROR", "4", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -461,9 +439,7 @@
g_setenv("GET_CHANGES_ERROR", "2", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -502,9 +478,7 @@
g_setenv("GET_CHANGES_ERROR", "3", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -544,9 +518,7 @@
g_setenv("GET_CHANGES_ERROR", "5", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -584,9 +556,7 @@
g_setenv("GET_CHANGES_ERROR", "1", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -625,9 +595,7 @@
g_setenv("GET_CHANGES_TIMEOUT", "1", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -669,9 +637,7 @@
g_setenv("GET_CHANGES_TIMEOUT", "3", TRUE);
g_setenv("GET_CHANGES_ERROR", "4", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -711,9 +677,7 @@
g_setenv("GET_CHANGES_TIMEOUT2", "7", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -756,9 +720,7 @@
g_setenv("COMMIT_ERROR", "4", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -805,9 +767,7 @@
g_setenv("COMMIT_ERROR", "6", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -854,9 +814,7 @@
g_setenv("COMMIT_TIMEOUT", "4", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -903,9 +861,7 @@
g_setenv("COMMIT_TIMEOUT", "6", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -953,9 +909,7 @@
g_setenv("COMMIT_TIMEOUT", "4", TRUE);
g_setenv("COMMIT_ERROR", "2", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1003,9 +957,7 @@
g_setenv("COMMIT_TIMEOUT", "2", TRUE);
g_setenv("COMMIT_ERROR", "4", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1050,9 +1002,7 @@
{
char *testbed = setup_testbed("multisync_easy_new");
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1108,9 +1058,7 @@
{
char *testbed = setup_testbed("multisync_easy_new");
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1168,9 +1116,7 @@
g_setenv("SYNC_DONE_ERROR", "4", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1218,9 +1164,7 @@
g_setenv("SYNC_DONE_ERROR", "6", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1268,9 +1212,7 @@
g_setenv("SYNC_DONE_ERROR", "7", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1318,9 +1260,7 @@
g_setenv("SYNC_DONE_TIMEOUT", "4", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1368,9 +1308,7 @@
g_setenv("SYNC_DONE_TIMEOUT", "6", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1419,9 +1357,7 @@
g_setenv("SYNC_DONE_TIMEOUT", "5", TRUE);
g_setenv("SYNC_DONE_ERROR", "2", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1469,9 +1405,7 @@
g_setenv("DISCONNECT_ERROR", "4", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1520,9 +1454,7 @@
g_setenv("DISCONNECT_ERROR", "6", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1571,9 +1503,7 @@
g_setenv("DISCONNECT_ERROR", "7", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1622,9 +1552,7 @@
g_setenv("DISCONNECT_TIMEOUT", "4", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1673,9 +1601,7 @@
g_setenv("DISCONNECT_TIMEOUT", "6", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1725,9 +1651,7 @@
g_setenv("DISCONNECT_TIMEOUT", "5", TRUE);
g_setenv("DISCONNECT_ERROR", "2", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1778,9 +1702,7 @@
g_setenv("DISCONNECT_ERROR", "2", TRUE);
g_setenv("GET_CHANGES_TIMEOUT", "6", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
Modified: branches/experimental-branch/tests/check_env.c
===================================================================
--- branches/experimental-branch/tests/check_env.c 2005-03-22 13:41:07 UTC (rev 392)
+++ branches/experimental-branch/tests/check_env.c 2005-03-22 14:30:03 UTC (rev 393)
@@ -112,7 +112,7 @@
OSyncEnv *env = init_env();
OSyncError *error = NULL;
- fail_unless(osync_env_plugin_is_usable(env, "mock-sync", &error), NULL);
+ fail_unless(osync_env_plugin_is_usable(env, "file-sync", &error), NULL);
fail_unless(!osync_error_is_set(&error), NULL);
osync_env_free(env);
@@ -129,7 +129,7 @@
OSyncError *error = NULL;
- fail_unless(osync_env_plugin_is_usable(env, "mock-sync", &error), NULL);
+ fail_unless(osync_env_plugin_is_usable(env, "file-sync", &error), NULL);
fail_unless(!osync_error_is_set(&error), NULL);
osync_env_free(env);
@@ -143,7 +143,7 @@
OSyncEnv *env = init_env();
OSyncError *error = NULL;
- fail_unless(!osync_env_plugin_is_usable(env, "mock-syncc", &error), NULL);
+ fail_unless(!osync_env_plugin_is_usable(env, "file-syncc", &error), NULL);
fail_unless(osync_error_is_set(&error), NULL);
osync_env_free(env);
@@ -161,7 +161,7 @@
OSyncError *error = NULL;
- fail_unless(!osync_env_plugin_is_usable(env, "mock-sync", &error), NULL);
+ fail_unless(!osync_env_plugin_is_usable(env, "file-sync", &error), NULL);
fail_unless(osync_error_is_set(&error), NULL);
osync_env_free(env);
Modified: branches/experimental-branch/tests/check_vcard.c
===================================================================
--- branches/experimental-branch/tests/check_vcard.c 2005-03-22 13:41:07 UTC (rev 392)
+++ branches/experimental-branch/tests/check_vcard.c 2005-03-22 14:30:03 UTC (rev 393)
@@ -2,6 +2,12 @@
static void conv_vcard(const char *filename, const char *extension)
{
+ char *command = g_strdup_printf("cp %s/%s .", g_get_current_dir(), filename);
+ char *testbed = setup_testbed(NULL);
+ system(command);
+ g_free(command);
+
+
OSyncError *error = NULL;
OSyncEnv *env = init_env();
@@ -11,10 +17,12 @@
char *buffer;
int size;
- fail_unless(osync_file_read(filename, &buffer, &size, &error), NULL);
+ char *file = g_path_get_basename(filename);
+ fail_unless(osync_file_read(file, &buffer, &size, &error), NULL);
OSyncChange *change = osync_change_new();
- osync_change_set_uid(change, filename);
+ osync_change_set_uid(change, file);
+ g_free(file);
osync_change_set_data(change, buffer, size + 1, TRUE);
osync_change_set_conv_env(change, conv_env);
@@ -52,10 +60,20 @@
osync_conv_env_free(conv_env);
osync_env_finalize(env, NULL);
osync_env_free(env);
+
+ destroy_testbed(testbed);
}
-static void compare_vcard(const char *lfile, const char *rfile, OSyncConvCmpResult result)
+static void compare_vcard(const char *lfilename, const char *rfilename, OSyncConvCmpResult result)
{
+ char *command1 = g_strdup_printf("cp %s/%s lfile", g_get_current_dir(), lfilename);
+ char *command2 = g_strdup_printf("cp %s/%s rfile", g_get_current_dir(), rfilename);
+ char *testbed = setup_testbed(NULL);
+ system(command1);
+ g_free(command1);
+ system(command2);
+ g_free(command2);
+
OSyncError *error = NULL;
OSyncEnv *env = init_env();
@@ -65,10 +83,10 @@
char *buffer;
int size;
- fail_unless(osync_file_read(lfile, &buffer, &size, &error), NULL);
+ fail_unless(osync_file_read("lfile", &buffer, &size, &error), NULL);
OSyncChange *lchange = osync_change_new();
- osync_change_set_uid(lchange, lfile);
+ osync_change_set_uid(lchange, "lfile");
osync_change_set_data(lchange, buffer, size + 1, TRUE);
osync_change_set_conv_env(lchange, conv_env);
osync_change_set_objformat_string(lchange, "plain");
@@ -78,11 +96,10 @@
osync_change_set_objformat(lchange, sourceformat);
osync_change_set_objtype(lchange, osync_objformat_get_objtype(sourceformat));
+ fail_unless(osync_file_read("rfile", &buffer, &size, &error), NULL);
- fail_unless(osync_file_read(rfile, &buffer, &size, &error), NULL);
-
OSyncChange *rchange = osync_change_new();
- osync_change_set_uid(rchange, lfile);
+ osync_change_set_uid(rchange, "rfile");
osync_change_set_data(rchange, buffer, size + 1, TRUE);
osync_change_set_conv_env(rchange, conv_env);
osync_change_set_objformat_string(rchange, "plain");
@@ -97,6 +114,7 @@
osync_conv_env_free(conv_env);
osync_env_finalize(env, NULL);
osync_env_free(env);
+ destroy_testbed(testbed);
}
START_TEST (conv_vcard_evolution2_full1)
@@ -243,37 +261,37 @@
}
END_TEST
-START_TEST (comparvformat_mismatch1)
+START_TEST (compare_vformat_mismatch1)
{
compare_vcard("data/vcards/evolution2/compare/1-different.vcf", "data/vcards/kdepim/compare/1-different.vcf", CONV_DATA_MISMATCH);
}
END_TEST
-START_TEST (comparvformat_similar1)
+START_TEST (compare_vformat_similar1)
{
compare_vcard("data/vcards/evolution2/compare/1-conflict.vcf", "data/vcards/kdepim/compare/1-conflict.vcf", CONV_DATA_SIMILAR);
}
END_TEST
-START_TEST (comparvformat_mismatch2)
+START_TEST (compare_vformat_mismatch2)
{
compare_vcard("data/vcards/evolution2/compare/2-conflict.vcf", "data/vcards/kdepim/compare/2-conflict.vcf", CONV_DATA_MISMATCH);
}
END_TEST
-START_TEST (comparvformat_similar2)
+START_TEST (compare_vformat_similar2)
{
compare_vcard("data/vcards/evolution2/compare/2-different.vcf", "data/vcards/kdepim/compare/2-different.vcf", CONV_DATA_SIMILAR);
}
END_TEST
-START_TEST (comparvformat_same1)
+START_TEST (compare_vformat_same1)
{
compare_vcard("data/vcards/evolution2/compare/1-same.vcf", "data/vcards/kdepim/compare/1-same.vcf", CONV_DATA_SAME);
}
END_TEST
-START_TEST (comparvformat_same2)
+START_TEST (compare_vformat_same2)
{
compare_vcard("data/vcards/evolution2/compare/2-same.vcf", "data/vcards/kdepim/compare/2-same.vcf", CONV_DATA_SAME);
}
@@ -311,12 +329,12 @@
create_case(s, "conv_vcard_kde_21_umlaute", conv_vcard_kde_21_umlaute);
create_case(s, "conv_vcard_kde_30_umlaute", conv_vcard_kde_30_umlaute);
- create_case(s, "comparvformat_mismatch1", comparvformat_mismatch1);
- create_case(s, "comparvformat_mismatch2", comparvformat_mismatch2);
- create_case(s, "comparvformat_similar1", comparvformat_similar1);
- create_case(s, "comparvformat_similar2", comparvformat_similar2);
- create_case(s, "comparvformat_same1", comparvformat_same1);
- create_case(s, "comparvformat_same2", comparvformat_same2);
+ create_case(s, "compare_vformat_mismatch1", compare_vformat_mismatch1);
+ create_case(s, "compare_vformat_mismatch2", compare_vformat_mismatch2);
+ create_case(s, "compare_vformat_similar1", compare_vformat_similar1);
+ create_case(s, "compare_vformat_similar2", compare_vformat_similar2);
+ create_case(s, "compare_vformat_same1", compare_vformat_same1);
+ create_case(s, "compare_vformat_same2", compare_vformat_same2);
return s;
}
Modified: branches/experimental-branch/tests/support.c
===================================================================
--- branches/experimental-branch/tests/support.c 2005-03-22 13:41:07 UTC (rev 392)
+++ branches/experimental-branch/tests/support.c 2005-03-22 14:30:03 UTC (rev 393)
@@ -442,6 +442,8 @@
load_format(osync, "xml-vcal.so");
load_format(osync, "xml-vcard.so");
load_format(osync, "xml-vnote.so");
+ load_format(osync, "xml-evolution.so");
+ load_format(osync, "xml-kde.so");
load_format(osync, "mockformat.so");
return osync;
|
