Changeset 3455

Timestamp:

07/16/08 18:07:06 (1 month ago)

Author:

dgollub

Message:

Implemeted OSyncPluginAdvancedOption to set advanced plugin
configuration which don't fit in OSyncPluginConfig.

Implemented parsing/assembling of <AdvancedOptions?>.

Added testcases plugin_config_advancedoption and
plugin_config_advancedoption_param.

Files:

• trunk/opensync/CMakeLists.txt (modified) (1 diff)
• trunk/opensync/opensync-plugin.h (modified) (1 diff)
• trunk/opensync/opensync.h (modified) (1 diff)
• trunk/opensync/plugin/opensync_plugin_config.c (modified) (7 diffs)
• trunk/opensync/plugin/opensync_plugin_config.h (modified) (1 diff)
• trunk/opensync/plugin/opensync_plugin_config_internals.h (modified) (1 diff)
• trunk/tests/plugin-tests/check_plugin_config.c (modified) (7 diffs)

trunk/opensync/CMakeLists.txt

@@ -45 +45 @@
-   merger/opensync_merger.c
-   module/opensync_module.c
+   plugin/opensync_plugin_advancedoptions.c
-   plugin/opensync_plugin_authentication.c
-   plugin/opensync_plugin.c

trunk/opensync/opensync-plugin.h

@@ -28 +28 @@
-#include "plugin/opensync_plugin_info.h"
-#include "plugin/opensync_plugin_config.h"
+#include "plugin/opensync_plugin_advancedoptions.h"
-#include "plugin/opensync_plugin_authentication.h"
-#include "plugin/opensync_plugin_connection.h"

trunk/opensync/opensync.h

@@ -149 +149 @@
-typedef struct OSyncPluginConfig OSyncPluginConfig;
-typedef struct OSyncPluginAuthentication OSyncPluginAuthentication;
+typedef struct OSyncPluginAdvancedOption OSyncPluginAdvancedOption;
+typedef struct OSyncPluginAdvancedOptionParameter OSyncPluginAdvancedOptionParameter;
-typedef struct OSyncPluginConnection OSyncPluginConnection;
-typedef struct OSyncPluginLocalization OSyncPluginLocalization;

trunk/opensync/plugin/opensync_plugin_config.c

@@ -25 +25 @@
-#include "opensync-format.h"
-#include "opensync_plugin_config_internals.h"
+#include "opensync_plugin_advancedoptions_internals.h"
-
-#include "opensync_xml.h"
+
+static OSyncPluginAdvancedOptionParameter *_osync_plugin_config_parse_advancedoption_param(OSyncPluginAdvancedOption *option, xmlNode *cur, OSyncError **error)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, option, cur, error);
+
+        OSyncPluginAdvancedOptionParameter *param = osync_plugin_advancedoption_param_new(error);
+        if (!param)
+                goto error;
+
+        for (; cur != NULL; cur = cur->next) {
+
+                if (cur->type != XML_ELEMENT_NODE)
+                        continue;
+
+                char *str = (char*)xmlNodeGetContent(cur);
+                if (!str)
+                        continue;
+
+                if (!xmlStrcmp(cur->name, BAD_CAST "DisplayName"))
+                        osync_plugin_advancedoption_param_set_displayname(param, str);
+                else if (!xmlStrcmp(cur->name, BAD_CAST "Name"))
+                        osync_plugin_advancedoption_param_set_name(param, str);
+                else if (!xmlStrcmp(cur->name, BAD_CAST "Type"))
+                        osync_plugin_advancedoption_param_set_type(param, 
+                                        osync_plugin_advancedoption_type_string_to_val(str));
+                else if (!xmlStrcmp(cur->name, BAD_CAST "ValEnum"))
+                        osync_plugin_advancedoption_param_add_valenum(param, str);
+
+                xmlFree(str);
+        }
+
+        osync_trace(TRACE_EXIT, "%s", __func__);
+        return param;
+
+error:
+        osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
+        return NULL;
+}
+
+static OSyncPluginAdvancedOption *_osync_plugin_config_parse_advancedoption(OSyncPluginConfig *config, xmlNode *cur, OSyncError **error)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, config, cur, error);
+
+        OSyncPluginAdvancedOptionParameter *param;
+        OSyncPluginAdvancedOption *option = osync_plugin_advancedoption_new(error);
+        if (!option)
+                goto error;
+
+        for (; cur != NULL; cur = cur->next) {
+
+                if (cur->type != XML_ELEMENT_NODE)
+                        continue;
+
+                char *str = (char*)xmlNodeGetContent(cur);
+                if (!str)
+                        continue;
+
+                if (!xmlStrcmp(cur->name, BAD_CAST "DisplayName"))
+                        osync_plugin_advancedoption_set_displayname(option, str);
+                else if (!xmlStrcmp(cur->name, BAD_CAST "MaxOccurs"))
+                        osync_plugin_advancedoption_set_maxoccurs(option, atoi(str));
+                else if (!xmlStrcmp(cur->name, BAD_CAST "MaxSize"))
+                        osync_plugin_advancedoption_set_maxsize(option, atoi(str));
+                else if (!xmlStrcmp(cur->name, BAD_CAST "Name"))
+                        osync_plugin_advancedoption_set_name(option, str);
+                else if (!xmlStrcmp(cur->name, BAD_CAST "Parameter")) {
+                        if (!(param = _osync_plugin_config_parse_advancedoption_param(option, cur->xmlChildrenNode, error)))
+                                goto error;
+
+                        option->parameters = osync_list_prepend(option->parameters, param);
+
+                } else if (!xmlStrcmp(cur->name, BAD_CAST "Type")) {
+                        osync_plugin_advancedoption_set_type(option, osync_plugin_advancedoption_type_string_to_val(str));
+                } else if (!xmlStrcmp(cur->name, BAD_CAST "ValEnum"))
+                        osync_plugin_advancedoption_add_valenum(option, str);
+
+                xmlFree(str);
+        }
+
+        option->parameters = osync_list_reverse(option->parameters);
+
+        osync_trace(TRACE_EXIT, "%s: %p", __func__, option);
+        return option;
+
+error:
+        osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
+        return NULL;
+}
+
+static osync_bool _osync_plugin_config_parse_advancedoptions(OSyncPluginConfig *config, xmlNode *cur, OSyncError **error)
+{
+        OSyncPluginAdvancedOption *option;
+
+        for (; cur != NULL; cur = cur->next) {
+
+                if (cur->type != XML_ELEMENT_NODE)
+                        continue;
+
+                if (!xmlStrcmp(cur->name, (const xmlChar *)"AdvancedOption")) {
+                        if (!(option = _osync_plugin_config_parse_advancedoption(config, cur->xmlChildrenNode, error)))
+                                goto error;
+
+                        config->advancedoptions = osync_list_prepend(config->advancedoptions, option);
+                }
+        }
+
+        config->advancedoptions = osync_list_reverse(config->advancedoptions);
+
+        return TRUE;
+
+error:
+        return FALSE; 
+}
-
-static osync_bool _osync_plugin_config_parse_authentication(OSyncPluginConfig *config, xmlNode *cur, OSyncError **error)
@@ -522 +636 @@
-                        continue;
-
-
+
+
+
-                        ret = _osync_plugin_config_parse_authentication(config, cur->xmlChildrenNode, error);
-                } else if (!xmlStrcmp(cur->name, (const xmlChar *)"Connection")) {
@@ -871 +987 @@
-}
-
+static osync_bool _osync_plugin_config_assemble_advancedoption_param(xmlNode *cur, OSyncPluginAdvancedOptionParameter *param, OSyncError **error)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, cur, param, error);
+
+        xmlNode *node = xmlNewChild(cur, NULL, (xmlChar*)"Parameter", NULL);
+        if (!node) {
+                osync_error_set(error, OSYNC_ERROR_GENERIC, "No memory left to assemble configuration.");
+                goto error;
+        }
+
+        /* DisplayName */
+        if (osync_plugin_advancedoption_param_get_displayname(param))
+                xmlNewChild(node, NULL, BAD_CAST "DisplayName", 
+                                BAD_CAST osync_plugin_advancedoption_param_get_displayname(param));
+
+        /* Name */
+        if (!osync_plugin_advancedoption_param_get_name(param)) {
+                osync_error_set(error, OSYNC_ERROR_MISCONFIGURATION, "Name for advanced option not set.");
+                goto error;
+        }
+
+        xmlNewChild(node, NULL, BAD_CAST "Name", BAD_CAST osync_plugin_advancedoption_param_get_name(param));
+
+        /* Type */
+        if (!osync_plugin_advancedoption_param_get_type(param)) {
+                osync_error_set(error, OSYNC_ERROR_MISCONFIGURATION, "Type for advanced option not set.");
+                goto error;
+        }
+
+        xmlNewChild(node, NULL, BAD_CAST "Type", BAD_CAST osync_plugin_advancedoption_param_get_type_string(param));
+
+        /* ValEnum */
+        OSyncList *v;
+        for (v = osync_plugin_advancedoption_param_get_valenums(param); v; v = v->next) {
+                char *valenum = v->data;
+                xmlNewChild(node, NULL, BAD_CAST "ValEnum", BAD_CAST valenum);
+        }
+
+
+        osync_trace(TRACE_EXIT, "%s", __func__);
+        return TRUE;
+error:
+        osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
+        return FALSE;
+
+}
+
+static osync_bool _osync_plugin_config_assemble_advancedoption(xmlNode *cur, OSyncPluginAdvancedOption *option, OSyncError **error)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, cur, option, error);
+
+        OSyncList *o;
+        const char *name, *mime, *objtype, *path, *url;
+
+        xmlNode *next, *node = xmlNewChild(cur, NULL, (xmlChar*)"AdvancedOption", NULL);
+        if (!node) {
+                osync_error_set(error, OSYNC_ERROR_GENERIC, "No memory left to assemble configuration.");
+                goto error;
+        }
+
+        /* DisplayName */
+        if (osync_plugin_advancedoption_get_displayname(option))
+                xmlNewChild(node, NULL, BAD_CAST "DisplayName", 
+                                BAD_CAST osync_plugin_advancedoption_get_displayname(option));
+
+        /* MaxOccurs */
+        if (osync_plugin_advancedoption_get_maxoccurs(option)) {
+                char *str = g_strdup_printf("%u", osync_plugin_advancedoption_get_maxoccurs(option));
+                xmlNewChild(node, NULL, BAD_CAST "MaxOccurs", BAD_CAST str);
+                g_free(str);
+        }
+
+        /* MaxSize */
+        if (osync_plugin_advancedoption_get_maxsize(option)) {
+                char *str = g_strdup_printf("%u", osync_plugin_advancedoption_get_maxsize(option));
+                xmlNewChild(node, NULL, BAD_CAST "MaxSize", BAD_CAST str);
+                g_free(str);
+        }
+
+        /* Name */
+        if (!osync_plugin_advancedoption_get_name(option)) {
+                osync_error_set(error, OSYNC_ERROR_MISCONFIGURATION, "Name for advanced option not set.");
+                goto error;
+        }
+
+        xmlNewChild(node, NULL, BAD_CAST "Name", BAD_CAST osync_plugin_advancedoption_get_name(option));
+
+        /* Parameters */
+        OSyncList *p;
+        for (p = osync_plugin_advancedoption_get_parameters(option); p; p = p->next) {
+                OSyncPluginAdvancedOptionParameter *param = p->data;
+                if (!_osync_plugin_config_assemble_advancedoption_param(node, param, error))
+                        goto error;
+        }
+
+        /* Type */
+        if (!osync_plugin_advancedoption_get_type(option)) {
+                osync_error_set(error, OSYNC_ERROR_MISCONFIGURATION, "Type for advanced option not set.");
+                goto error;
+        }
+
+        xmlNewChild(node, NULL, BAD_CAST "Type", BAD_CAST osync_plugin_advancedoption_get_type_string(option));
+
+        /* ValEnum */
+        OSyncList *v;
+        for (v = osync_plugin_advancedoption_get_valenums(option); v; v = v->next) {
+                char *valenum = v->data;
+                xmlNewChild(node, NULL, BAD_CAST "ValEnum", BAD_CAST valenum);
+        }
+
+        osync_trace(TRACE_EXIT, "%s", __func__);
+        return TRUE;
+error:
+        osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
+        return FALSE;
+}
+
+static osync_bool _osync_plugin_config_assemble_advancedoptions(xmlNode *cur, OSyncList *options, OSyncError **error)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, cur, options, error);
+
+        OSyncList *o;
+
+        xmlNode *node = xmlNewChild(cur, NULL, (xmlChar*)"AdvancedOptions", NULL);
+        if (!node) {
+                osync_error_set(error, OSYNC_ERROR_GENERIC, "No memory left to assemble configuration.");
+                goto error;
+        }
+
+        for (o = options; o; o = o->next)
+                if (!_osync_plugin_config_assemble_advancedoption(node, o->data, error))
+                        goto error;
+
+
+        osync_trace(TRACE_EXIT, "%s", __func__);
+        return TRUE;
+error:
+        osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
+        return FALSE;
+}
-
-OSyncPluginConfig *osync_plugin_config_new(OSyncError **error)
@@ -922 +1178 @@
-        OSyncPluginLocalization *local;
-        OSyncList *ressources;
+        OSyncList *options;
-        
-        doc = xmlNewDoc((xmlChar*)"1.0");
@@ -940 +1197 @@
-
-        /** Assemble... */
+        /* Advanced Options */
+        if ((options = osync_plugin_config_get_advancedoptions(config)))
+                if (!_osync_plugin_config_assemble_advancedoptions(doc->children, options, error))
+                        goto error_and_free;
+
-        /* Authentication */
-        if ((auth = osync_plugin_config_get_authentication(config)))
@@ -975 +1237 @@
-
-
+/* Advanced Options */
+OSyncList *osync_plugin_config_get_advancedoptions(OSyncPluginConfig *config)
+{
+        osync_assert(config);
+        return config->advancedoptions;
+
+}
+
+void osync_plugin_config_add_advancedoption(OSyncPluginConfig *config, OSyncPluginAdvancedOption *option)
+{
+        osync_assert(config);
+        osync_assert(option);
+
+        if (osync_list_find(config->advancedoptions, option))
+                        return;
+
+        osync_plugin_advancedoption_ref(option);
+        config->advancedoptions = osync_list_prepend(config->advancedoptions, option);
+}
+
+void osync_plugin_config_remove_advancedoption(OSyncPluginConfig *config, OSyncPluginAdvancedOption *option)
+{
+        osync_assert(config);
+        osync_assert(option);
+
+        config->advancedoptions = osync_list_remove(config->advancedoptions, option);
+        osync_plugin_advancedoption_unref(option);
+}
+
+/* Authentication */
-OSyncPluginAuthentication *osync_plugin_config_get_authentication(OSyncPluginConfig *config)
-{
@@ -990 +1282 @@
-}
-
+/* Localization */
-OSyncPluginLocalization *osync_plugin_config_get_localization(OSyncPluginConfig *config)
-{

trunk/opensync/plugin/opensync_plugin_config.h

@@ -29 +29 @@
-OSYNC_EXPORT osync_bool osync_plugin_config_file_save(OSyncPluginConfig *config, const char *path, OSyncError **error);
-
+/* Advanced Options */
+OSYNC_EXPORT OSyncList *osync_plugin_config_get_advancedoptions(OSyncPluginConfig *config);
+OSYNC_EXPORT void osync_plugin_config_add_advancedoption(OSyncPluginConfig *config, OSyncPluginAdvancedOption *option);
+OSYNC_EXPORT void osync_plugin_config_remove_advancedoption(OSyncPluginConfig *config, OSyncPluginAdvancedOption *option);
+
-/* Authentication */
-OSYNC_EXPORT OSyncPluginAuthentication *osync_plugin_config_get_authentication(OSyncPluginConfig *config);

trunk/opensync/plugin/opensync_plugin_config_internals.h

@@ -29 +29 @@
- **/
-struct OSyncPluginConfig {
+        /** Advanced Options */
+        OSyncList *advancedoptions;
-        /** Connection configuration */
-        OSyncPluginConnection *connection;

trunk/tests/plugin-tests/check_plugin_config.c

@@ -168 +168 @@
-}
-END_TEST
+
+START_TEST (plugin_config_advancedoption)
+{
+        char *testbed = setup_testbed(NULL);
+
+        OSyncError *error = NULL;
+        OSyncPluginConfig *config = osync_plugin_config_new(&error);
+        fail_unless(error == NULL, NULL);
+        fail_unless(config != NULL, NULL);
+
+        /* Advanced Option */
+        OSyncPluginAdvancedOption *option = osync_plugin_advancedoption_new(&error);
+        fail_unless(error == NULL, NULL);
+        fail_unless(option != NULL, NULL);
+
+        osync_plugin_advancedoption_set_maxsize(option, 2323);
+        fail_unless(osync_plugin_advancedoption_get_maxsize(option) == 2323, NULL);
+
+        osync_plugin_advancedoption_set_maxoccurs(option, 3232);
+        fail_unless(osync_plugin_advancedoption_get_maxoccurs(option) == 3232, NULL);
+
+        osync_plugin_advancedoption_set_type(option, OSYNC_PLUGIN_ADVANCEDOPTION_TYPE_BOOL);
+        fail_unless(osync_plugin_advancedoption_get_type(option) == OSYNC_PLUGIN_ADVANCEDOPTION_TYPE_BOOL, NULL);
+
+
+        /* Check for uniq number of VALENUMs */
+        osync_plugin_advancedoption_add_valenum(option, "bar");
+        osync_plugin_advancedoption_add_valenum(option, "foo");
+        osync_plugin_advancedoption_add_valenum(option, "foo");
+        osync_plugin_advancedoption_add_valenum(option, "foo");
+
+        /* Expected result: 2 - 1x foo, 1x bar */
+        fail_unless(osync_list_length(osync_plugin_advancedoption_get_valenums(option)) == 2, NULL);
+
+        /* Expected resut: 1 - 1x bar */
+        osync_plugin_advancedoption_remove_valenum(option, "bar");
+        fail_unless(osync_list_length(osync_plugin_advancedoption_get_valenums(option)) == 1, NULL);
+
+        /*****/
+
+        osync_plugin_advancedoption_set_displayname(option, "foo");
+        fail_unless(!strcmp(osync_plugin_advancedoption_get_displayname(option), "foo"), NULL);
+
+        /* Overwrite (leak check) */
+        osync_plugin_advancedoption_set_displayname(option, "bar");
+        fail_unless(!strcmp(osync_plugin_advancedoption_get_displayname(option), "bar"), NULL);
+
+        osync_plugin_advancedoption_set_name(option, "foo");
+        fail_unless(!strcmp(osync_plugin_advancedoption_get_name(option), "foo"), NULL);
+
+        /* Overwrite (leak check) */
+        osync_plugin_advancedoption_set_name(option, "bar");
+        fail_unless(!strcmp(osync_plugin_advancedoption_get_name(option), "bar"), NULL);
+
+        fail_unless(osync_plugin_advancedoption_ref(option) != NULL, NULL);
+        osync_plugin_advancedoption_unref(option);
+        osync_plugin_advancedoption_unref(option);
+
+        osync_plugin_config_unref(config);
+
+        destroy_testbed(testbed);
+}
+END_TEST
+
+START_TEST (plugin_config_advancedoption_param)
+{
+        char *testbed = setup_testbed(NULL);
+
+        OSyncError *error = NULL;
+        OSyncPluginConfig *config = osync_plugin_config_new(&error);
+        fail_unless(error == NULL, NULL);
+        fail_unless(config != NULL, NULL);
+
+        /* Advanced Option */
+        OSyncPluginAdvancedOptionParameter *param = osync_plugin_advancedoption_param_new(&error);
+        fail_unless(error == NULL, NULL);
+        fail_unless(param != NULL, NULL);
+
+        osync_plugin_advancedoption_param_set_type(param, OSYNC_PLUGIN_ADVANCEDOPTION_TYPE_BOOL);
+        fail_unless(osync_plugin_advancedoption_param_get_type(param) == OSYNC_PLUGIN_ADVANCEDOPTION_TYPE_BOOL, NULL);
+
+
+        /* Check for uniq number of VALENUMs */
+        osync_plugin_advancedoption_param_add_valenum(param, "bar");
+        osync_plugin_advancedoption_param_add_valenum(param, "foo");
+        osync_plugin_advancedoption_param_add_valenum(param, "foo");
+        osync_plugin_advancedoption_param_add_valenum(param, "foo");
+
+        /* Expected result: 2 - 1x foo, 1x bar */
+        fail_unless(osync_list_length(osync_plugin_advancedoption_param_get_valenums(param)) == 2, NULL);
+
+        /* Expected resut: 1 - 1x bar */
+        osync_plugin_advancedoption_param_remove_valenum(param, "bar");
+        fail_unless(osync_list_length(osync_plugin_advancedoption_param_get_valenums(param)) == 1, NULL);
+
+        /*****/
+
+        osync_plugin_advancedoption_param_set_displayname(param, "foo");
+        fail_unless(!strcmp(osync_plugin_advancedoption_param_get_displayname(param), "foo"), NULL);
+
+        /* Overwrite (leak check) */
+        osync_plugin_advancedoption_param_set_displayname(param, "bar");
+        fail_unless(!strcmp(osync_plugin_advancedoption_param_get_displayname(param), "bar"), NULL);
+
+        osync_plugin_advancedoption_param_set_name(param, "foo");
+        fail_unless(!strcmp(osync_plugin_advancedoption_param_get_name(param), "foo"), NULL);
+
+        /* Overwrite (leak check) */
+        osync_plugin_advancedoption_param_set_name(param, "bar");
+        fail_unless(!strcmp(osync_plugin_advancedoption_param_get_name(param), "bar"), NULL);
+
+        fail_unless(osync_plugin_advancedoption_param_ref(param) != NULL, NULL);
+        osync_plugin_advancedoption_param_unref(param);
+        osync_plugin_advancedoption_param_unref(param);
+
+        osync_plugin_config_unref(config);
+
+        destroy_testbed(testbed);
+}
+END_TEST
+
-
-START_TEST (plugin_config_authentication)
@@ -511 +632 @@
-        fail_unless(config != NULL, NULL);
-
+        /* Advanced Options */
+        OSyncPluginAdvancedOption *option = osync_plugin_advancedoption_new(&error);
+        fail_unless(error == NULL, NULL);
+        fail_unless(option != NULL, NULL);
+
+        osync_plugin_advancedoption_set_maxsize(option, 1);
+        osync_plugin_advancedoption_set_maxoccurs(option, 1);
+        osync_plugin_advancedoption_set_displayname(option, "foobar1");
+        osync_plugin_advancedoption_set_name(option, "foobar1");
+        osync_plugin_advancedoption_set_type(option, OSYNC_PLUGIN_ADVANCEDOPTION_TYPE_CHAR);
+
+        osync_plugin_advancedoption_add_valenum(option, "FOOBAR1");
+        osync_plugin_advancedoption_add_valenum(option, "FOOBAR2");
+        fail_unless(osync_list_length(osync_plugin_advancedoption_get_valenums(option)) == 2, NULL);
+
+        /* Advanced Parameter */
+        OSyncPluginAdvancedOptionParameter *param = osync_plugin_advancedoption_param_new(&error);
+        fail_unless(error == NULL, NULL);
+        fail_unless(param != NULL, NULL);
+
+        osync_plugin_advancedoption_param_set_displayname(param, "bar1");
+        osync_plugin_advancedoption_param_set_name(param, "bar1");
+        osync_plugin_advancedoption_param_set_type(param, OSYNC_PLUGIN_ADVANCEDOPTION_TYPE_INT);
+
+        osync_plugin_advancedoption_param_add_valenum(param, "BAR1");
+        osync_plugin_advancedoption_param_add_valenum(param, "BAR2");
+        fail_unless(osync_list_length(osync_plugin_advancedoption_param_get_valenums(param)) == 2, NULL);
+        osync_plugin_advancedoption_add_parameter(option, param);
+
-        /* Localization */
-        OSyncPluginLocalization *local = osync_plugin_localization_new(&error);
@@ -570 +720 @@
-
-        /* Set subcomponents */
+        osync_plugin_config_add_advancedoption(config, option);
+        osync_plugin_advancedoption_unref(option);
-        osync_plugin_config_set_authentication(config, auth);
-        osync_plugin_authentication_unref(auth);
@@ -589 +741 @@
-        OSyncPluginAuthentication *reloaded_auth = osync_plugin_config_get_authentication(reloaded_config);
-        OSyncList *reloaded_ressources = osync_plugin_config_get_ressources(reloaded_config);
+        OSyncList *reloaded_advancedoptions = osync_plugin_config_get_advancedoptions(reloaded_config);
+        OSyncList *reloaded_advancedoption_parameters = NULL;
+        OSyncList *reloaded_advancedoption_valenums = NULL;
+        OSyncList *reloaded_advancedoption_param_valenums = NULL;
-
-        fail_unless(reloaded_local != NULL, NULL);
-        fail_unless(reloaded_auth != NULL, NULL);
-        fail_unless(reloaded_ressources != NULL, NULL);
+        fail_unless(reloaded_advancedoptions != NULL, NULL);
-
-        fail_unless(!strcmp(osync_plugin_localization_get_language(reloaded_local), "de_DE"), NULL);
@@ -602 +759 @@
-        fail_unless(!strcmp(osync_plugin_authentication_get_reference(reloaded_auth), "ref"), NULL);
-
-
-
+, *p, *v
+, j, k
-        for (i = 1, r = reloaded_ressources; r; r = r->next, i++) {
-                char *value = g_strdup_printf("foobar%i", i);
@@ -615 +772 @@
-                g_free(value);
-        }
+
+        for (i = 1, r = reloaded_advancedoptions; r; r = r->next, i++) {
+                char *value = g_strdup_printf("foobar%i", i);
+                fail_unless(!strcmp(osync_plugin_advancedoption_get_name(r->data), value), NULL);
+                fail_unless(!strcmp(osync_plugin_advancedoption_get_displayname(r->data), value), NULL);
+                fail_unless(osync_plugin_advancedoption_get_maxsize(r->data) == i, NULL);
+                fail_unless(osync_plugin_advancedoption_get_maxoccurs(r->data) == i, NULL);
+                fail_unless(osync_plugin_advancedoption_get_type(r->data) == OSYNC_PLUGIN_ADVANCEDOPTION_TYPE_CHAR, NULL);
+                g_free(value);
+
+                reloaded_advancedoption_valenums = osync_plugin_advancedoption_get_valenums(r->data);
+                for (j = 1, v = reloaded_advancedoption_valenums; v; v = v->next, j++) {
+                        char *value = g_strdup_printf("FOOBAR%i", j);
+                        fail_unless(!strcmp(v->data, value), NULL);
+                        g_free(value);
+                }
+
+                reloaded_advancedoption_parameters = osync_plugin_advancedoption_get_parameters(r->data);
+                for (j = 1, p = reloaded_advancedoption_parameters; p; p = p->next, j++) {
+                        char *value = g_strdup_printf("bar%i", j);
+                        fail_unless(!strcmp(osync_plugin_advancedoption_param_get_name(p->data), value), NULL);
+                        fail_unless(!strcmp(osync_plugin_advancedoption_param_get_displayname(p->data), value), NULL);
+                        g_free(value);
+
+                        reloaded_advancedoption_param_valenums = osync_plugin_advancedoption_param_get_valenums(p->data);
+                        for (k = 1, v = reloaded_advancedoption_param_valenums; v; v = v->next, k++) {
+                                char *value = g_strdup_printf("BAR%i", k);
+                                fail_unless(!strcmp(v->data, value), NULL);
+                                g_free(value);
+
+                        }
+
+                }
+
+
+        }
+
-
-        osync_plugin_config_unref(config);
@@ -872 +1066 @@
-        create_case(s, "plugin_config_subcomponents", plugin_config_subcomponents);
-        create_case(s, "plugin_config_subcomponents_nomemory", plugin_config_subcomponents_nomemory);
+        create_case(s, "plugin_config_advancedoption", plugin_config_advancedoption);
+        create_case(s, "plugin_config_advancedoption_param", plugin_config_advancedoption_param);
-        create_case(s, "plugin_config_authentication", plugin_config_authentication);
-        create_case(s, "plugin_config_connection", plugin_config_connection);