Menu
▾
▴
[Opensync-commits] r5262 - in trunk: . opensync/plugin tests/plugin-tests
|
From: <dg...@su...> - 2009-02-06 23:31:05
|
Author: Graham Cobb Date: Sat Feb 7 00:29:07 2009 New Revision: 5262 URL: http://www.opensync.org/changeset/5262 Log: Bug #1032: Change osync_plugin_config_get_advancedoption_value_by_name to return the option value, not the option itself Modified: trunk/ChangeLog trunk/opensync/plugin/opensync_plugin_config.c trunk/opensync/plugin/opensync_plugin_config.h trunk/tests/plugin-tests/check_plugin_config.c Modified: trunk/ChangeLog ============================================================================== --- trunk/ChangeLog Wed Feb 4 16:37:58 2009 (r5261) +++ trunk/ChangeLog Sat Feb 7 00:29:07 2009 (r5262) @@ -9,6 +9,15 @@ 2009-02-03 Graham Cobb <g+...@co...> + * tests/plugin-tests/check_plugin_config.c (plugin_config_advancedoption_set_get): Use new definition + of osync_plugin_config_get_advancedoption_value_by_name + + * opensync/plugin/opensync_plugin_config.c (osync_plugin_config_get_advancedoption_value_by_name): Return + option value [Bug #1032] + + * opensync/plugin/opensync_plugin_config.h: Fix osync_plugin_config_get_advancedoption_value_by_name + to return a const char * [Bug #1032] + * tests/ipc-tests/check_ipc.c (ipc_loop_timeout_with_idle): Change test parameters so test completes within 30 second limit. Modified: trunk/opensync/plugin/opensync_plugin_config.c ============================================================================== --- trunk/opensync/plugin/opensync_plugin_config.c Wed Feb 4 16:37:58 2009 (r5261) +++ trunk/opensync/plugin/opensync_plugin_config.c Sat Feb 7 00:29:07 2009 (r5262) @@ -1388,7 +1388,7 @@ return config->advancedoptions; } -OSyncPluginAdvancedOption *osync_plugin_config_get_advancedoption_value_by_name(OSyncPluginConfig *config, const char *name) +const char *osync_plugin_config_get_advancedoption_value_by_name(OSyncPluginConfig *config, const char *name) { OSyncList *opt; @@ -1401,7 +1401,7 @@ osync_assert(opt_name); if (!strcmp(opt_name, name)) - return option; + return osync_plugin_advancedoption_get_value(option); } return NULL; Modified: trunk/opensync/plugin/opensync_plugin_config.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_config.h Wed Feb 4 16:37:58 2009 (r5261) +++ trunk/opensync/plugin/opensync_plugin_config.h Sat Feb 7 00:29:07 2009 (r5262) @@ -124,9 +124,9 @@ * * @param config An OSyncPluginConfig to search * @param name The name of the advanced option to get - * @returns The first OSyncPluginAdvancedOption with the given name or NULL if not found + * @returns The value associated with the first OSyncPluginAdvancedOption with the given name or NULL if not found */ -OSYNC_EXPORT OSyncPluginAdvancedOption *osync_plugin_config_get_advancedoption_value_by_name(OSyncPluginConfig *config, const char *name); +OSYNC_EXPORT const char *osync_plugin_config_get_advancedoption_value_by_name(OSyncPluginConfig *config, const char *name); /**@brief Add an advanced option to a config * Modified: trunk/tests/plugin-tests/check_plugin_config.c ============================================================================== --- trunk/tests/plugin-tests/check_plugin_config.c Wed Feb 4 16:37:58 2009 (r5261) +++ trunk/tests/plugin-tests/check_plugin_config.c Sat Feb 7 00:29:07 2009 (r5262) @@ -273,6 +273,7 @@ fail_unless(error == NULL, NULL); fail_unless(option != NULL, NULL); osync_plugin_advancedoption_set_name(option, "foo"); + osync_plugin_advancedoption_set_value(option, "value for foo"); osync_plugin_config_add_advancedoption(config, option); OSyncList *advanced_options; @@ -280,9 +281,9 @@ fail_unless(osync_list_length(advanced_options) == 1, NULL); fail_unless(advanced_options->data == option, NULL); - OSyncPluginAdvancedOption *test_option = NULL; + const char *test_option = NULL; test_option = osync_plugin_config_get_advancedoption_value_by_name(config, "foo"); - fail_unless(test_option == option); + fail_unless(test_option == osync_plugin_advancedoption_get_value(option)); test_option = osync_plugin_config_get_advancedoption_value_by_name(config, "foo2"); fail_unless(test_option == NULL, NULL); @@ -297,16 +298,17 @@ fail_unless(error == NULL, NULL); fail_unless(option2 != NULL, NULL); osync_plugin_advancedoption_set_name(option2, "bar"); + osync_plugin_advancedoption_set_value(option2, "value for bar"); osync_plugin_config_add_advancedoption(config, option2); advanced_options = osync_plugin_config_get_advancedoptions(config); fail_unless(osync_list_length(advanced_options) == 2, NULL); test_option = osync_plugin_config_get_advancedoption_value_by_name(config, "foo"); - fail_unless(test_option == option); + fail_unless(test_option == osync_plugin_advancedoption_get_value(option)); test_option = osync_plugin_config_get_advancedoption_value_by_name(config, "bar"); - fail_unless(test_option == option2, NULL); + fail_unless(test_option == osync_plugin_advancedoption_get_value(option2), NULL); /* Removal */ OSyncPluginAdvancedOption *option3 = osync_plugin_advancedoption_new(&error); @@ -325,7 +327,7 @@ test_option = osync_plugin_config_get_advancedoption_value_by_name(config, "foo"); fail_unless(test_option == NULL); test_option = osync_plugin_config_get_advancedoption_value_by_name(config, "bar"); - fail_unless(test_option == option2); + fail_unless(test_option == osync_plugin_advancedoption_get_value(option2)); osync_plugin_config_remove_advancedoption(config, option2); fail_unless(osync_plugin_config_get_advancedoptions(config) == NULL, NULL); |
