Menu
▾
▴
[Opensync-commits] r392 - in branches/experimental-branch: . opensync tests tests/mock-plugin
|
From: <svn...@op...> - 2005-03-22 13:40:28
|
Author: azrael
Date: 2005-03-22 14:41:07 +0100 (Tue, 22 Mar 2005)
New Revision: 392
Modified:
branches/experimental-branch/configure.in
branches/experimental-branch/opensync/opensync_plugin.c
branches/experimental-branch/tests/check_env.c
branches/experimental-branch/tests/check_filter.c
branches/experimental-branch/tests/check_multisync.c
branches/experimental-branch/tests/check_sync.c
branches/experimental-branch/tests/mock-plugin/Makefile.am
branches/experimental-branch/tests/mock-plugin/mock_format.c
branches/experimental-branch/tests/mock-plugin/mock_sync.c
branches/experimental-branch/tests/support.c
Log:
Finished implemting the mock plugin
Updated the tests to use the new plugin instead
of the file-sync plugin
Modified: branches/experimental-branch/configure.in
===================================================================
--- branches/experimental-branch/configure.in 2005-03-21 23:38:39 UTC (rev 391)
+++ branches/experimental-branch/configure.in 2005-03-22 13:41:07 UTC (rev 392)
@@ -164,6 +164,7 @@
opensync/Makefile
tools/Makefile
tests/Makefile
+tests/mock-plugin/Makefile
formats/Makefile
formats/vformats-xml/Makefile
osengine/Makefile
Modified: branches/experimental-branch/opensync/opensync_plugin.c
===================================================================
--- branches/experimental-branch/opensync/opensync_plugin.c 2005-03-21 23:38:39 UTC (rev 391)
+++ branches/experimental-branch/opensync/opensync_plugin.c 2005-03-22 13:41:07 UTC (rev 392)
@@ -121,6 +121,7 @@
OSyncPlugin *osync_plugin_load(OSyncEnv *env, const char *path, OSyncError **error)
{
osync_trace(TRACE_ENTRY, "osync_plugin_load(%p, %s, %p)", env, path, error);
+
/* Check if this platform supports dynamic
* loading of modules */
if (!g_module_supported()) {
@@ -136,7 +137,6 @@
memset(&(plugin->info.functions), 0, sizeof(OSyncPluginFunctions));
if (!plugin->real_plugin) {
- osync_debug("OSPLG", 0, "Unable to open plugin %s", path);
osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to open plugin %s: %s", path, g_module_error());
osync_plugin_free(plugin);
osync_trace(TRACE_EXIT_ERROR, "osync_plugin_load: %s", osync_error_print(error));
@@ -186,7 +186,7 @@
osync_trace(TRACE_ENTRY, "osync_format_plugin_load(%p, %s, %p)", env, path, error);
/* Check if this platform supports dynamic
* loading of modules */
- osync_debug("OSFRM", 3, "Loading formats plugin from %s", path);
+
if (!g_module_supported()) {
osync_error_set(error, OSYNC_ERROR_GENERIC, "This platform does not support loading of modules");
osync_debug("OSPLG", 0, "This platform does not support loading of modules");
Modified: branches/experimental-branch/tests/check_env.c
===================================================================
--- branches/experimental-branch/tests/check_env.c 2005-03-21 23:38:39 UTC (rev 391)
+++ branches/experimental-branch/tests/check_env.c 2005-03-22 13:41:07 UTC (rev 392)
@@ -108,45 +108,52 @@
START_TEST (env_check_plugin_true1)
{
+ char *testbed = setup_testbed(NULL);
OSyncEnv *env = init_env();
OSyncError *error = NULL;
- fail_unless(osync_env_plugin_is_usable(env, "file-sync", &error), NULL);
+ fail_unless(osync_env_plugin_is_usable(env, "mock-sync", &error), NULL);
fail_unless(!osync_error_is_set(&error), NULL);
osync_env_free(env);
+ destroy_testbed(testbed);
}
END_TEST
START_TEST (env_check_plugin_true2)
{
+ char *testbed = setup_testbed(NULL);
g_setenv("IS_AVAILABLE", "1", TRUE);
OSyncEnv *env = init_env();
OSyncError *error = NULL;
- fail_unless(osync_env_plugin_is_usable(env, "file-sync", &error), NULL);
+ fail_unless(osync_env_plugin_is_usable(env, "mock-sync", &error), NULL);
fail_unless(!osync_error_is_set(&error), NULL);
osync_env_free(env);
+ destroy_testbed(testbed);
}
END_TEST
START_TEST (env_check_plugin_false)
{
+ char *testbed = setup_testbed(NULL);
OSyncEnv *env = init_env();
OSyncError *error = NULL;
- fail_unless(!osync_env_plugin_is_usable(env, "file-syncc", &error), NULL);
+ fail_unless(!osync_env_plugin_is_usable(env, "mock-syncc", &error), NULL);
fail_unless(osync_error_is_set(&error), NULL);
osync_env_free(env);
+ destroy_testbed(testbed);
}
END_TEST
START_TEST (env_check_plugin_false2)
{
+ char *testbed = setup_testbed(NULL);
g_setenv("IS_AVAILABLE", "1", TRUE);
g_setenv("IS_NOT_AVAILABLE", "1", TRUE);
@@ -154,10 +161,11 @@
OSyncError *error = NULL;
- fail_unless(!osync_env_plugin_is_usable(env, "file-sync", &error), NULL);
+ fail_unless(!osync_env_plugin_is_usable(env, "mock-sync", &error), NULL);
fail_unless(osync_error_is_set(&error), NULL);
osync_env_free(env);
+ destroy_testbed(testbed);
}
END_TEST
Modified: branches/experimental-branch/tests/check_filter.c
===================================================================
--- branches/experimental-branch/tests/check_filter.c 2005-03-21 23:38:39 UTC (rev 391)
+++ branches/experimental-branch/tests/check_filter.c 2005-03-22 13:41:07 UTC (rev 392)
@@ -3,9 +3,8 @@
START_TEST (filter_setup)
{
char *testbed = setup_testbed("filter_setup");
- OSyncEnv *osync = osync_env_new();
- osync_env_initialize(osync, NULL);
- mark_point();
+ OSyncEnv *osync = init_env();
+
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
fail_unless(group != NULL, NULL);
mark_point();
@@ -32,9 +31,7 @@
START_TEST (filter_flush)
{
char *testbed = setup_testbed("filter_setup");
- OSyncEnv *osync = osync_env_new();
- osync_env_initialize(osync, NULL);
- mark_point();
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
fail_unless(group != NULL, NULL);
mark_point();
@@ -63,9 +60,7 @@
START_TEST (filter_sync_deny_all)
{
char *testbed = setup_testbed("filter_sync_deny_all");
- OSyncEnv *osync = osync_env_new();
- osync_env_initialize(osync, NULL);
- mark_point();
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
fail_unless(group != NULL, NULL);
mark_point();
@@ -94,9 +89,7 @@
START_TEST (filter_sync_custom)
{
char *testbed = setup_testbed("filter_sync_custom");
- OSyncEnv *osync = osync_env_new();
- osync_env_initialize(osync, NULL);
- mark_point();
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
fail_unless(group != NULL, NULL);
mark_point();
@@ -199,9 +192,7 @@
START_TEST (filter_sync_vcard_only)
{
char *testbed = setup_testbed("filter_sync_vcard_only");
- OSyncEnv *osync = osync_env_new();
- osync_env_initialize(osync, NULL);
- mark_point();
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
fail_unless(group != NULL, NULL);
mark_point();
@@ -239,9 +230,7 @@
/* Check if the destobjtype of the changes is being
* set when the change type os DELETE */
char *testbed = setup_testbed("destobjtype_delete");
- OSyncEnv *osync = osync_env_new();
- osync_env_initialize(osync, NULL);
- mark_point();
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
fail_unless(group != NULL, NULL);
mark_point();
Modified: branches/experimental-branch/tests/check_multisync.c
===================================================================
--- branches/experimental-branch/tests/check_multisync.c 2005-03-21 23:38:39 UTC (rev 391)
+++ branches/experimental-branch/tests/check_multisync.c 2005-03-22 13:41:07 UTC (rev 392)
@@ -28,9 +28,9 @@
fail_unless(num_engine_end_conflicts = 1, NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -88,9 +88,9 @@
fail_unless(num_read == 1, NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -150,9 +150,9 @@
fail_unless(num_engine_end_conflicts = 1, NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -212,9 +212,9 @@
fail_unless(num_engine_end_conflicts = 1, NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -257,9 +257,9 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -326,9 +326,9 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -536,9 +536,9 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -609,9 +609,9 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -688,9 +688,9 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -818,9 +818,9 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -942,12 +942,12 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 2, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata-dupe", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata-dupe", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 2);
@@ -970,9 +970,9 @@
synchronize_once(engine, NULL);
maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata-dupe", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata-dupe", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 1);
@@ -1043,15 +1043,15 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 3, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata-dupe-dupe", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata-dupe-dupe", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata-dupe-dupe", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata-dupe-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata-dupe-dupe", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata-dupe-dupe", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 3);
@@ -1077,9 +1077,9 @@
synchronize_once(engine, NULL);
maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata-dupe", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata-dupe", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 1);
@@ -1155,9 +1155,9 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -1235,9 +1235,9 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -1314,12 +1314,12 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 2, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata-dupe", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata-dupe", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 2);
@@ -1386,15 +1386,15 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 3, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata2", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata2", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata2", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata2", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata2", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata2", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 3);
@@ -1443,21 +1443,21 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
maptable = mappingtable_load(group, 5, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1-dupe", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1-dupe", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1-dupe", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata2", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata2", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata2", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata2-dupe", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata2-dupe", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata2-dupe", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1-dupe", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1-dupe", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata2", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata2", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata2", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata2-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata2-dupe", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata2-dupe", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 5);
@@ -1533,15 +1533,15 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 3, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata2", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata2", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata2", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata2", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata2", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata2", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 3);
@@ -1590,15 +1590,15 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
maptable = mappingtable_load(group, 3, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata2", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata2", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata2", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata2", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata2", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata2", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 3);
@@ -1667,12 +1667,12 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 2, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 2);
@@ -1718,12 +1718,12 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" != \"x\""), NULL);
maptable = mappingtable_load(group, 2, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 2);
@@ -1751,12 +1751,12 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" != \"x\""), NULL);
maptable = mappingtable_load(group, 2, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 2);
@@ -1786,12 +1786,12 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
maptable = mappingtable_load(group, 2, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 2);
@@ -1860,11 +1860,11 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" != \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 2, 0);
- check_mapping(maptable, 1, -1, 2, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 2, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
+ check_mapping(maptable, 1, -1, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 2);
@@ -1894,12 +1894,12 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
maptable = mappingtable_load(group, 2, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 2);
Modified: branches/experimental-branch/tests/check_sync.c
===================================================================
--- branches/experimental-branch/tests/check_sync.c 2005-03-21 23:38:39 UTC (rev 391)
+++ branches/experimental-branch/tests/check_sync.c 2005-03-22 13:41:07 UTC (rev 392)
@@ -32,8 +32,9 @@
OSyncEngine *engine = osync_engine_new(group, NULL);
osync_engine_set_memberstatus_callback(engine, member_status, NULL);
- osync_engine_init(engine, NULL);
- synchronize_once(engine, NULL);
+ OSyncError *error = NULL;
+ osync_engine_init(engine, &error);
+ synchronize_once(engine, &error);
osync_engine_finalize(engine);
osync_engine_free(engine);
@@ -84,8 +85,8 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 2, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 2, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 2, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
check_hash(table, "testdata");
@@ -191,8 +192,8 @@
fail_unless(num_written == 0, NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 2, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 2, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 2, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -226,10 +227,10 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 2, 0);
- check_mapping(maptable, 1, -1, 2, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 2, "testdata-dupe", "file", "data");
- check_mapping(maptable, 2, -1, 2, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 2, "testdata-dupe", "file", "data");
+ check_mapping(maptable, 1, -1, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 2, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 2, "testdata-dupe", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 2);
@@ -253,8 +254,8 @@
fail_unless(num_conflicts == 0, NULL);
maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 2, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 2, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 2, "testdata", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 1);
@@ -287,12 +288,12 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 3, 0);
- check_mapping(maptable, 1, -1, 2, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 2, "testdata-dupe", "file", "data");
- check_mapping(maptable, 1, -1, 2, "testdata-dupe-dupe", "file", "data");
- check_mapping(maptable, 2, -1, 2, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 2, "testdata-dupe", "file", "data");
- check_mapping(maptable, 2, -1, 2, "testdata-dupe-dupe", "file", "data");
+ check_mapping(maptable, 1, -1, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 2, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 2, "testdata-dupe-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 2, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 2, "testdata-dupe-dupe", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 3);
@@ -315,8 +316,8 @@
fail_unless(num_conflicts == 0, NULL);
maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 2, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 2, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 2, "testdata", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 1);
@@ -359,8 +360,8 @@
fail_unless(num_conflicts == 1, NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 2, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 2, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 2, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -514,8 +515,7 @@
START_TEST (sync_easy_dualdel)
{
char *testbed = setup_testbed("sync_easy_dualdel");
- 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;
@@ -551,7 +551,8 @@
}
END_TEST
-START_TEST (sync_subdirs_new)
+//This cannot work with the mock plugin
+/*START_TEST (sync_subdirs_new)
{
char *testbed = setup_testbed("sync_subdirs_new");
OSyncEnv *osync = init_env();
@@ -576,14 +577,14 @@
fail_unless(!system("test \"x$(diff -x \".*\" -r data1 data2)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 3, 0);
- check_mapping(maptable, 1, -1, 2, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 2, "testdata", "file", "data");
+ check_mapping(maptable, 1, -1, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 2, "testdata", "mockformat", "data");
- check_mapping(maptable, 1, -1, 2, "subdir/testdata", "file", "data");
- check_mapping(maptable, 2, -1, 2, "subdir/testdata", "file", "data");
+ check_mapping(maptable, 1, -1, 2, "subdir/testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 2, "subdir/testdata", "mockformat", "data");
- check_mapping(maptable, 1, -1, 2, "subdir/testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 2, "subdir/testdata1", "file", "data");
+ check_mapping(maptable, 1, -1, 2, "subdir/testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 2, "subdir/testdata1", "mockformat", "data");
mappingtable_close(maptable);
@@ -625,7 +626,7 @@
destroy_testbed(testbed);
}
-END_TEST
+END_TEST*/
Suite *env_suite(void)
{
@@ -646,7 +647,7 @@
create_case(s, "sync_moddel", sync_moddel);
create_case(s, "sync_conflict_moddel", sync_conflict_moddel);
create_case(s, "sync_conflict_duplicate", sync_conflict_duplicate);
- create_case(s, "sync_subdirs_new", sync_subdirs_new);
+ //create_case(s, "sync_subdirs_new", sync_subdirs_new);
return s;
}
Modified: branches/experimental-branch/tests/mock-plugin/Makefile.am
===================================================================
--- branches/experimental-branch/tests/mock-plugin/Makefile.am 2005-03-21 23:38:39 UTC (rev 391)
+++ branches/experimental-branch/tests/mock-plugin/Makefile.am 2005-03-22 13:41:07 UTC (rev 392)
@@ -4,8 +4,12 @@
EXTRA_DIST = mock_sync.h
-noinst_LTLIBRARIES = mock_sync.la
+lib_LTLIBRARIES = mock_sync.la mockformat.la
mock_sync_la_SOURCES = mock_sync.c
mock_sync_la_LDFLAGS = -avoid-version -export-dynamic -module
mock_sync_la_LIBADD = @PACKAGE_LIBS@ @LIBS@ @XML_LIBS@
+
+mockformat_la_SOURCES = mock_format.c
+mockformat_la_LDFLAGS = -avoid-version -export-dynamic -module
+mockformat_la_LIBADD = @PACKAGE_LIBS@ @LIBS@
Modified: branches/experimental-branch/tests/mock-plugin/mock_format.c
===================================================================
--- branches/experimental-branch/tests/mock-plugin/mock_format.c 2005-03-21 23:38:39 UTC (rev 391)
+++ branches/experimental-branch/tests/mock-plugin/mock_format.c 2005-03-22 13:41:07 UTC (rev 392)
@@ -25,8 +25,6 @@
static OSyncConvCmpResult compare_file(OSyncChange *leftchange, OSyncChange *rightchange)
{
osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, leftchange, rightchange);
- fs_fileinfo *leftfile = (fs_fileinfo *)osync_change_get_data(leftchange);
- fs_fileinfo *rightfile = (fs_fileinfo *)osync_change_get_data(rightchange);
osync_bool data_same = FALSE;
osync_bool path_same = FALSE;
@@ -34,13 +32,11 @@
if (!strcmp(osync_change_get_uid(leftchange), osync_change_get_uid(rightchange)))
path_same = TRUE;
- osync_trace(TRACE_INTERNAL, "%i %i", leftfile->size, rightfile->size);
-
- if (leftfile->size == rightfile->size) {
- if (leftfile->data == rightfile->data) {
+ if (osync_change_get_datasize(leftchange) == osync_change_get_datasize(rightchange)) {
+ if (osync_change_get_data(leftchange) == osync_change_get_data(rightchange)) {
data_same = TRUE;
} else {
- if (!memcmp(leftfile->data, rightfile->data, leftfile->size))
+ if (!memcmp(osync_change_get_data(leftchange), osync_change_get_data(rightchange), osync_change_get_datasize(leftchange)))
data_same = TRUE;
}
}
@@ -60,37 +56,26 @@
static osync_bool conv_file_to_plain(void *user_data, char *input, int inpsize, char **output, int *outpsize, osync_bool *free_input, OSyncError **error)
{
osync_debug("FILE", 4, "start: %s", __func__);
- fs_fileinfo *file = (fs_fileinfo *)input;
*free_input = FALSE;
- *output = file->data;
- *outpsize = file->size;
+ *output = input;
+ *outpsize = inpsize;
return TRUE;
}
static osync_bool conv_plain_to_file(void *user_data, char *input, int inpsize, char **output, int *outpsize, osync_bool *free_input, OSyncError **error)
{
osync_debug("FILE", 4, "start: %s", __func__);
- fs_fileinfo *file = g_malloc0(sizeof(fs_fileinfo));
-
- file->data = input;
- file->size = inpsize;
*free_input = FALSE;
- *output = (char *)file;
- *outpsize = sizeof(file);
+ *output = input;
+ *outpsize = inpsize;
return TRUE;
}
static void destroy_file(char *input, size_t inpsize)
{
- fs_fileinfo *file = (fs_fileinfo *)input;
- if (inpsize != sizeof(fs_fileinfo)) {
- osync_debug("FILE", 0, "destroy_file: Wrong data size: %d, but it should be %u", inpsize, sizeof(fs_fileinfo));
- return;
- }
- g_free(file->data);
- g_free(file);
+ g_free(input);
}
static void duplicate_file(OSyncChange *change)
@@ -104,19 +89,15 @@
static osync_bool copy_file(const char *input, int inpsize, char **output, int *outpsize)
{
osync_debug("FILE", 4, "start: %s", __func__);
-
- fs_fileinfo *oldfile = (fs_fileinfo *)input;
- fs_fileinfo *newfile = g_malloc0(sizeof(fs_fileinfo));
- newfile->filestats = oldfile->filestats;
- newfile->size = oldfile->size;
+ char *new = NULL;
- if (oldfile->size) {
- newfile->data = g_malloc0(oldfile->size);
- memcpy(newfile->data, oldfile->data, oldfile->size);
+ if (inpsize) {
+ new = g_malloc0(inpsize);
+ memcpy(new, input, inpsize);
}
- *output = (char *)newfile;
+ *output = new;
*outpsize = inpsize;
return TRUE;
}
@@ -124,14 +105,9 @@
static void create_file(OSyncChange *change)
{
osync_debug("FILE", 4, "start: %s", __func__);
-
- fs_fileinfo *newfile = g_malloc0(sizeof(fs_fileinfo));
char *data = osync_rand_str(g_random_int_range(1, 100));
- newfile->data = data;
- newfile->size = strlen(data) + 1;
-
- osync_change_set_data(change, (char *)newfile, sizeof(newfile), TRUE);
+ osync_change_set_data(change, data, strlen(data) + 1, TRUE);
if (!osync_change_get_uid(change))
osync_change_set_uid(change, osync_rand_str(6));
}
@@ -139,9 +115,8 @@
static char *print_file(OSyncChange *change)
{
osync_debug("FILE", 4, "start: %s", __func__);
- fs_fileinfo *file = (fs_fileinfo *)osync_change_get_data(change);
- char *printable = g_strdup_printf ("File: %s\nSize: %i", osync_change_get_uid(change), file->size);
+ char *printable = g_strdup_printf ("File: %s\nSize: %i", osync_change_get_uid(change), osync_change_get_datasize(change));
return printable;
}
Modified: branches/experimental-branch/tests/mock-plugin/mock_sync.c
===================================================================
--- branches/experimental-branch/tests/mock-plugin/mock_sync.c 2005-03-21 23:38:39 UTC (rev 391)
+++ branches/experimental-branch/tests/mock-plugin/mock_sync.c 2005-03-22 13:41:07 UTC (rev 392)
@@ -20,6 +20,58 @@
#include "mock_sync.h"
+/*Load the state from a xml file and return it in the conn struct*/
+static osync_bool mock_parse_settings(mock_env *env, char *data, int size, OSyncError **error)
+{
+ osync_trace(TRACE_ENTRY, "%s(%p, %p, %i)", __func__, env, data, size);
+ xmlDocPtr doc;
+ xmlNodePtr cur;
+
+ //set defaults
+ env->path = NULL;
+
+ doc = xmlParseMemory(data, size);
+
+ if (!doc) {
+ osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to parse settings");
+ osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
+ return FALSE;
+ }
+
+ cur = xmlDocGetRootElement(doc);
+
+ if (!cur) {
+ xmlFreeDoc(doc);
+ osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to get root element of the settings");
+ osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
+ return FALSE;
+ }
+
+ if (xmlStrcmp(cur->name, "config")) {
+ xmlFreeDoc(doc);
+ osync_error_set(error, OSYNC_ERROR_GENERIC, "Config valid is not valid");
+ osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
+ return FALSE;
+ }
+
+ cur = cur->xmlChildrenNode;
+
+ while (cur != NULL) {
+ char *str = xmlNodeGetContent(cur);
+ if (str) {
+ if (!xmlStrcmp(cur->name, (const xmlChar *)"path")) {
+ env->path = g_strdup(str);
+ }
+ xmlFree(str);
+ }
+ cur = cur->next;
+ }
+
+ xmlFreeDoc(doc);
+ osync_trace(TRACE_EXIT, "%s", __func__);
+ return TRUE;
+}
+
static osync_bool mock_get_error(OSyncMember *member, const char *domain)
{
const char *env = g_getenv(domain);
@@ -50,14 +102,19 @@
osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
return NULL;
}
+ char *configdata;
+ int configsize;
+ mock_env *env = g_malloc0(sizeof(mock_env));
- char *configdata;
- if (!osync_member_get_config(member, &configdata, NULL, error)) {
+ if (!osync_member_get_config(member, &configdata, &configsize, error)) {
osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
return NULL;
}
- mock_env *env = (mock_env *)configdata;
+ if (!mock_parse_settings(env, configdata, configsize, error)) {
+ g_free(env);
+ return NULL;
+ }
env->member = member;
env->hashtable = osync_hashtable_new();
@@ -148,7 +205,7 @@
osync_change_set_member(change, env->member);
osync_change_set_uid(change, de);
- osync_change_set_objformat_string(change, "file");
+ osync_change_set_objformat_string(change, "mockformat");
struct stat buf;
stat(filename, &buf);
@@ -178,7 +235,8 @@
}
}
g_dir_close(dir);
-
+ osync_hashtable_report_deleted(env->hashtable, ctx, "data");
+
osync_context_report_success(ctx);
}
@@ -372,7 +430,7 @@
void get_info(OSyncPluginInfo *info)
{
- info->name = "mock-sync";
+ info->name = "file-sync";
info->longname = "Mock Plugin";
info->description = "Mock Plugin";
info->version = 1;
Modified: branches/experimental-branch/tests/support.c
===================================================================
--- branches/experimental-branch/tests/support.c 2005-03-21 23:38:39 UTC (rev 391)
+++ branches/experimental-branch/tests/support.c 2005-03-22 13:41:07 UTC (rev 392)
@@ -23,14 +23,35 @@
setuid(65534);
char *testbed = g_strdup_printf("%s/testbed.XXXXXX", g_get_tmp_dir());
mkdtemp(testbed);
- char *command = g_strdup_printf("cp -a %s%sdata/%s/* %s", g_getenv("srcdir") ? g_getenv("srcdir") : "", g_getenv("srcdir") ? "/" : "", fkt_name, testbed);
+
+ char *command = NULL;
+ if (fkt_name) {
+ command = g_strdup_printf("cp -a %s%sdata/%s/* %s", g_getenv("srcdir") ? g_getenv("srcdir") : "", g_getenv("srcdir") ? "/" : "", fkt_name, testbed);
+ if (system(command))
+ abort();
+ g_free(command);
+ }
+
+ command = g_strdup_printf("cp -a %s%smock-plugin/.libs/*.so %s", g_getenv("srcdir") ? g_getenv("srcdir") : "", g_getenv("srcdir") ? "/" : "", testbed);
if (system(command))
abort();
+ g_free(command);
+
+ command = g_strdup_printf("cp -a %s%s../formats/.libs/*.so %s", g_getenv("srcdir") ? g_getenv("srcdir") : "", g_getenv("srcdir") ? "/" : "", testbed);
+ if (system(command))
+ abort();
+ g_free(command);
+
+ command = g_strdup_printf("cp -a %s%s../formats/vformats-xml/.libs/*.so %s", g_getenv("srcdir") ? g_getenv("srcdir") : "", g_getenv("srcdir") ? "/" : "", testbed);
+ if (system(command))
+ abort();
+ g_free(command);
+
olddir = g_get_current_dir();
if (chdir(testbed))
abort();
- g_free(command);
- osync_debug("TEST", 4, "Seting up %s at %s\n", fkt_name, testbed);
+
+ osync_debug("TEST", 4, "Seting up %s at %s", fkt_name, testbed);
printf(".");
fflush(NULL);
reset_env();
@@ -388,16 +409,41 @@
fail_unless(found == TRUE, NULL);
}
+static void load_format(OSyncEnv *env, const char *name)
+{
+ OSyncError *error = NULL;
+ char *path = g_strdup_printf("%s/%s", g_get_current_dir(), name);
+ fail_unless(osync_format_plugin_load(env, path, &error), NULL);
+ g_free(path);
+}
+
OSyncEnv *init_env(void)
{
mark_point();
OSyncEnv *osync = osync_env_new();
mark_point();
osync_env_set_option(osync, "LOAD_GROUPS", "FALSE");
+ osync_env_set_option(osync, "LOAD_FORMATS", "FALSE");
+ osync_env_set_option(osync, "LOAD_PLUGINS", "FALSE");
mark_point();
OSyncError *error = NULL;
fail_unless(osync_env_initialize(osync, &error), NULL);
fail_unless(!osync_error_is_set(&error), NULL);
+
+ char *path = g_strdup_printf("%s/%s", g_get_current_dir(), "mock_sync.so");
+ fail_unless(osync_plugin_load(osync, path, &error) != NULL, NULL);
+ g_free(path);
+
+ load_format(osync, "contact.so");
+ load_format(osync, "data.so");
+ load_format(osync, "event.so");
+ load_format(osync, "note.so");
+ load_format(osync, "todo.so");
+ load_format(osync, "xml-vcal.so");
+ load_format(osync, "xml-vcard.so");
+ load_format(osync, "xml-vnote.so");
+ load_format(osync, "mockformat.so");
+
return osync;
}
|
