[Opensync-commits] r959 - in trunk/tests: . mobiles

[<svn...@op...>]

Author: bellmich
Date: Thu Feb 26 13:51:11 2009
New Revision: 959
URL: http://libsyncml.opensync.org/changeset/959

Log:
libxml initialization and cleanup

- added cleanup_environment with xmlCleanupParser
- added xmlInitParser to configure_environment
- added cleanup_environment to all tests

Modified:
   trunk/tests/check_base64.c
   trunk/tests/check_data_sync_api.c
   trunk/tests/check_devinf.c
   trunk/tests/check_ds.c
   trunk/tests/check_elements.c
   trunk/tests/check_error.c
   trunk/tests/check_http.c
   trunk/tests/check_manager.c
   trunk/tests/check_md5.c
   trunk/tests/check_obex.c
   trunk/tests/check_san.c
   trunk/tests/check_session.c
   trunk/tests/check_sync.c
   trunk/tests/check_wbxml_assembler.c
   trunk/tests/check_wbxml_parser.c
   trunk/tests/check_xml_assembler.c
   trunk/tests/check_xml_fix_broken_item_data.c
   trunk/tests/check_xml_parser.c
   trunk/tests/mobiles/test_mobile.c
   trunk/tests/support.c
   trunk/tests/support.h

Modified: trunk/tests/check_base64.c
==============================================================================
--- trunk/tests/check_base64.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/check_base64.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -279,5 +279,8 @@
 	srunner_run_all(sr, CK_VERBOSE);
 	nf = srunner_ntests_failed(sr);
 	srunner_free(sr);
+
+	cleanup_environment();
+
 	return (nf == 0) ? 0 : 1;
 }

Modified: trunk/tests/check_data_sync_api.c
==============================================================================
--- trunk/tests/check_data_sync_api.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/check_data_sync_api.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -506,5 +506,8 @@
 	srunner_run_all(sr, CK_VERBOSE);
 	nf = srunner_ntests_failed(sr);
 	srunner_free(sr);
+
+	cleanup_environment();
+
 	return (nf == 0) ? 0 : 1;
 }

Modified: trunk/tests/check_devinf.c
==============================================================================
--- trunk/tests/check_devinf.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/check_devinf.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -414,8 +414,6 @@
 {
 	configure_environment();
 
-	smlLibxmlRef();
-
 	int nf;
 
 	Suite *s = devinf_suite();
@@ -426,7 +424,7 @@
 	nf = srunner_ntests_failed(sr);
 	srunner_free(sr);
 
-	smlLibxmlUnref();
+	cleanup_environment();
 
 	return (nf == 0) ? 0 : 1;
 }

Modified: trunk/tests/check_ds.c
==============================================================================
--- trunk/tests/check_ds.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/check_ds.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -2494,5 +2494,8 @@
 	srunner_run_all(sr, CK_VERBOSE);
 	nf = srunner_ntests_failed(sr);
 	srunner_free(sr);
+
+	cleanup_environment();
+
 	return (nf == 0) ? 0 : 1;
 }

Modified: trunk/tests/check_elements.c
==============================================================================
--- trunk/tests/check_elements.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/check_elements.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -353,5 +353,8 @@
 	srunner_run_all(sr, CK_VERBOSE);
 	nf = srunner_ntests_failed(sr);
 	srunner_free(sr);
+
+	cleanup_environment();
+
 	return (nf == 0) ? 0 : 1;
 }

Modified: trunk/tests/check_error.c
==============================================================================
--- trunk/tests/check_error.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/check_error.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -250,5 +250,8 @@
 	srunner_run_all(sr, CK_VERBOSE);
 	nf = srunner_ntests_failed(sr);
 	srunner_free(sr);
+
+	cleanup_environment();
+
 	return (nf == 0) ? 0 : 1;
 }

Modified: trunk/tests/check_http.c
==============================================================================
--- trunk/tests/check_http.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/check_http.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -973,5 +973,8 @@
 	srunner_run_all(sr, CK_VERBOSE);
 	nf = srunner_ntests_failed(sr);
 	srunner_free(sr);
+
+	cleanup_environment();
+
 	return (nf == 0) ? 0 : 1;
 }

Modified: trunk/tests/check_manager.c
==============================================================================
--- trunk/tests/check_manager.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/check_manager.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -686,8 +686,6 @@
 {
 	configure_environment();
 
-	smlLibxmlRef();
-
 	int nf;
 
 	Suite *s = manager_suite();
@@ -698,7 +696,7 @@
 	nf = srunner_ntests_failed(sr);
 	srunner_free(sr);
 
-	smlLibxmlUnref();
+	cleanup_environment();
 
 	return (nf == 0) ? 0 : 1;
 }

Modified: trunk/tests/check_md5.c
==============================================================================
--- trunk/tests/check_md5.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/check_md5.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -148,5 +148,8 @@
 	srunner_run_all(sr, CK_VERBOSE);
 	nf = srunner_ntests_failed(sr);
 	srunner_free(sr);
+
+	cleanup_environment();
+
 	return (nf == 0) ? 0 : 1;
 }

Modified: trunk/tests/check_obex.c
==============================================================================
--- trunk/tests/check_obex.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/check_obex.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -924,5 +924,8 @@
 	srunner_run_all(sr, CK_VERBOSE);
 	nf = srunner_ntests_failed(sr);
 	srunner_free(sr);
+
+	cleanup_environment();
+
 	return (nf == 0) ? 0 : 1;
 }

Modified: trunk/tests/check_san.c
==============================================================================
--- trunk/tests/check_san.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/check_san.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -598,5 +598,8 @@
 	srunner_run_all(sr, CK_VERBOSE);
 	nf = srunner_ntests_failed(sr);
 	srunner_free(sr);
+
+	cleanup_environment();
+
 	return (nf == 0) ? 0 : 1;
 }

Modified: trunk/tests/check_session.c
==============================================================================
--- trunk/tests/check_session.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/check_session.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -2658,5 +2658,8 @@
 	srunner_run_all(sr, CK_VERBOSE);
 	nf = srunner_ntests_failed(sr);
 	srunner_free(sr);
+
+	cleanup_environment();
+
 	return (nf == 0) ? 0 : 1;
 }

Modified: trunk/tests/check_sync.c
==============================================================================
--- trunk/tests/check_sync.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/check_sync.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -2109,5 +2109,8 @@
 	srunner_run_all(sr, CK_VERBOSE);
 	nf = srunner_ntests_failed(sr);
 	srunner_free(sr);
+
+	cleanup_environment();
+
 	return (nf == 0) ? 0 : 1;
 }

Modified: trunk/tests/check_wbxml_assembler.c
==============================================================================
--- trunk/tests/check_wbxml_assembler.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/check_wbxml_assembler.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -934,6 +934,9 @@
 	srunner_run_all(sr, CK_VERBOSE);
 	nf = srunner_ntests_failed(sr);
 	srunner_free(sr);
+
+	cleanup_environment();
+
 	return (nf == 0) ? 0 : 1;
 }
 #else

Modified: trunk/tests/check_wbxml_parser.c
==============================================================================
--- trunk/tests/check_wbxml_parser.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/check_wbxml_parser.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -797,5 +797,8 @@
 	srunner_run_all(sr, CK_VERBOSE);
 	nf = srunner_ntests_failed(sr);
 	srunner_free(sr);
+
+	cleanup_environment();
+
 	return (nf == 0) ? 0 : 1;
 }

Modified: trunk/tests/check_xml_assembler.c
==============================================================================
--- trunk/tests/check_xml_assembler.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/check_xml_assembler.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -1798,5 +1798,8 @@
 	srunner_run_all(sr, CK_VERBOSE);
 	nf = srunner_ntests_failed(sr);
 	srunner_free(sr);
+
+	cleanup_environment();
+
 	return (nf == 0) ? 0 : 1;
 }

Modified: trunk/tests/check_xml_fix_broken_item_data.c
==============================================================================
--- trunk/tests/check_xml_fix_broken_item_data.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/check_xml_fix_broken_item_data.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -242,5 +242,8 @@
 	srunner_run_all(sr, CK_VERBOSE);
 	nf = srunner_ntests_failed(sr);
 	srunner_free(sr);
+
+	cleanup_environment();
+
 	return (nf == 0) ? 0 : 1;
 }

Modified: trunk/tests/check_xml_parser.c
==============================================================================
--- trunk/tests/check_xml_parser.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/check_xml_parser.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -1733,5 +1733,8 @@
 	srunner_run_all(sr, CK_VERBOSE);
 	nf = srunner_ntests_failed(sr);
 	srunner_free(sr);
+
+	cleanup_environment();
+
 	return (nf == 0) ? 0 : 1;
 }

Modified: trunk/tests/mobiles/test_mobile.c
==============================================================================
--- trunk/tests/mobiles/test_mobile.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/mobiles/test_mobile.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -83,6 +83,9 @@
 	srunner_run_all(sr, CK_VERBOSE);
 	nf = srunner_ntests_failed(sr);
 	srunner_free(sr);
+
+	cleanup_environment();
+
 	return (nf == 0) ? 0 : 1;
 }
 

Modified: trunk/tests/support.c
==============================================================================
--- trunk/tests/support.c	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/support.c	Thu Feb 26 13:51:11 2009	(r959)
@@ -20,6 +20,7 @@
  
 #include "support.h"
 #include <libsyncml/sml_error_internals.h>
+#include <libxml/parser.h>
 
 /* FIXME: These settings should be controlled by the test environment.
  * FIXME: The hard coding of the environment creates an unreal test scenario.
@@ -55,6 +56,13 @@
 	 */
 	if (!g_setenv("CK_FORK", "no", FALSE))
 		g_warning("CK_FORK is already set.");
+
+	xmlInitParser();
+}
+
+void cleanup_environment()
+{
+	xmlCleanupParser();
 }
 
 char *olddir = NULL;

Modified: trunk/tests/support.h
==============================================================================
--- trunk/tests/support.h	Thu Feb 26 13:49:35 2009	(r958)
+++ trunk/tests/support.h	Thu Feb 26 13:51:11 2009	(r959)
@@ -23,6 +23,7 @@
 #include <libsyncml/syncml_internals.h>
 
 void configure_environment();
+void cleanup_environment();
 char *setup_testbed(char *fkt_name);
 void destroy_testbed(char *path);
 void create_case(Suite *s, const char *name, TFun function);