Changeset 3407

Timestamp:

07/07/08 11:21:47 (3 months ago)

Author:

dgollub

Message:

Added osync_(group|member)_set_schemadir() when OPENSYNC_UNITTEST is
defined. To perform tests without having OpenSync? and the schema
installed. Loading member/plugin configuration required the scheam files
to validate the configurations.

Files:

• trunk/opensync/group/opensync_group.c (modified) (4 diffs)
• trunk/opensync/group/opensync_group_internals.h (modified) (1 diff)
• trunk/opensync/group/opensync_member.c (modified) (6 diffs)
• trunk/opensync/group/opensync_member_internals.h (modified) (1 diff)

trunk/opensync/group/opensync_group.c

@@ -27 +27 @@
-#include "opensync_group_internals.h"
-#include "opensync-db.h"
+
+#ifdef OPENSYNC_UNITTESTS
+#include "opensync_member_internals.h"
+#endif /* OPENSYNC_UNITTESTS */
-
-#ifndef _WIN32
@@ -136 +140 @@
-                if (!member)
-                        goto error_close;
+
+#ifdef OPENSYNC_UNITTESTS
+                if (group->schemadir)
+                        osync_member_set_schemadir(member, group->schemadir);
+#endif /* OPENSYNC_UNITTESTS */
-                
-                member_path = g_strdup_printf ("%s/%s", osync_group_get_configdir(group), de);
@@ -223 +232 @@
-}
-
+#ifdef OPENSYNC_UNITTESTS
+/** @brief Set the schemadir for configuration validation to a custom directory.
+ *  This is actually only inteded for UNITTESTS to run tests without 
+ *  having OpenSync installed.
+ * 
+ * @param group Pointer to group
+ * @param schemadir Custom schemadir path
+ * 
+ */
+void osync_group_set_schemadir(OSyncGroup *group, const char *schemadir)
+{
+        osync_assert(group);
+        osync_assert(schemadir);
+
+        if (group->schemadir)
+                g_free(group->schemadir);
+
+        group->schemadir = g_strdup(schemadir); 
+}
+#endif /* OPENSYNC_UNITTESTS */
+
-/*@}*/
-
@@ -301 +331 @@
-                        g_free(group->configdir);
-                        
+#ifdef OPENSYNC_UNITTESTS
+                if (group->schemadir)
+                        g_free(group->schemadir);
+#endif /* OPENSYNC_UNITTESTS */
+
-                g_free(group);
-        }

trunk/opensync/group/opensync_group_internals.h

@@ -47 +47 @@
-        osync_bool converter_enabled;
-        
+#ifdef OPENSYNC_UNITTESTS
+        char *schemadir;
+#endif /* OPENSYNC_UNITTESTS*/  
-        int ref_count;
-};
-
+
+#ifdef OPENSYNC_UNITTESTS
+void osync_group_set_schemadir(OSyncGroup *group, const char *schemadir);
+#endif /* OPENSYNC_UNITTESTS*/
+
-#endif /* _OPENSYNC_GROUP_INTERNALS_H_ */

trunk/opensync/group/opensync_member.c

@@ -147 +147 @@
-}
-
+#ifdef OPENSYNC_UNITTESTS
+/** @brief Set the schemadir for configuration validation to a custom directory.
+ *  This is actually only inteded for UNITTESTS to run tests without 
+ *  having OpenSync installed.
+ * 
+ * @param member Pointer to member 
+ * @param schemadir Custom schemadir path
+ * 
+ */
+void osync_member_set_schemadir(OSyncMember *member, const char *schemadir)
+{
+        osync_assert(member);
+        osync_assert(schemadir);
+
+        if (member->schemadir)
+                g_free(member->schemadir);
+
+        member->schemadir = g_strdup(schemadir); 
+}
+#endif /* OPENSYNC_UNITTESTS */
+
-/*@}*/
-
@@ -226 +247 @@
-                osync_member_flush_objtypes(member);
-
+#ifdef OPENSYNC_UNITTESTS
+                if (member->schemadir)
+                        g_free(member->schemadir);
+#endif /* OPENSYNC_UNITTESTS */
+
+
-                g_free(member);
-        }
@@ -327 +354 @@
-        char *filename = NULL;
-        OSyncPluginConfig *config = NULL;
+        const char *schemadir = NULL;
-        
-        osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, member, error);
@@ -349 +377 @@
-        }
-
-
+
+
+
+
+
+
-                goto error_free_config;
-                
@@ -397 +430 @@
-{
-        char *filename = NULL;
+        const char *schemadir = NULL;
-        
-        osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, member, error);
@@ -418 +452 @@
-                goto error;
-
-
+
+
+
+
+
+
-                goto error_free_config;
-

trunk/opensync/group/opensync_member_internals.h

@@ -43 +43 @@
-        OSyncCapabilities *capabilities;
-        OSyncMerger *merger;
+
+#ifdef OPENSYNC_UNITTESTS
+        char *schemadir;
+#endif /* OPENSYNC_UNITTESTS */
-};
-
+
+#ifdef OPENSYNC_UNITTESTS
+void osync_member_set_schemadir(OSyncMember *member, const char *schemadir);
+#endif /* OPENSYNC_UNITTESTS */
+
-#endif /* _OPENSYNC_MEMBER_INTERNALS_H_ */