[Opensync-commits] r5107 - in trunk/tests: . engine-tests mapping-tests

[<dg...@su...>]

Author: dgollub
Date: Sun Jan 11 17:11:44 2009
New Revision: 5107
URL: http://www.opensync.org/changeset/5107

Log:
Ported mapping and mapping_engine unittest to OSYNC_TESTCASE macros.

Modified:
   trunk/tests/CMakeLists.txt
   trunk/tests/engine-tests/check_mapping_engine.c
   trunk/tests/mapping-tests/check_mapping.c

Modified: trunk/tests/CMakeLists.txt
==============================================================================
--- trunk/tests/CMakeLists.txt	Sun Jan 11 16:49:44 2009	(r5106)
+++ trunk/tests/CMakeLists.txt	Sun Jan 11 17:11:44 2009	(r5107)
@@ -115,8 +115,14 @@
 OSYNC_TESTCASE(ipc ipc_timeout)
 ENDIF (NOT WIN32)
 
-ADD_CHECK_TEST( mapping mapping-tests/check_mapping.c ${TEST_TARGET_LIBRARIES} )
-ADD_CHECK_TEST( mapping_engine engine-tests/check_mapping_engine.c ${TEST_TARGET_LIBRARIES} )
+BUILD_CHECK_TEST( mapping mapping-tests/check_mapping.c ${TEST_TARGET_LIBRARIES} )
+OSYNC_TESTCASE(mapping mapping_new)
+OSYNC_TESTCASE(mapping mapping_compare)
+
+BUILD_CHECK_TEST( mapping_engine engine-tests/check_mapping_engine.c ${TEST_TARGET_LIBRARIES} )
+OSYNC_TESTCASE(mapping_engine mapping_engine_same_similar_conflict)
+OSYNC_TESTCASE(mapping_engine mapping_engine_same_similar_conflict_multi)
+
 ADD_CHECK_TEST( member group-tests/check_member.c ${TEST_TARGET_LIBRARIES} )
 ADD_CHECK_TEST( module module-tests/check_module.c ${TEST_TARGET_LIBRARIES} )
 ADD_CHECK_TEST( multisync sync-tests/check_multisync.c ${TEST_TARGET_LIBRARIES} )

Modified: trunk/tests/engine-tests/check_mapping_engine.c
==============================================================================
--- trunk/tests/engine-tests/check_mapping_engine.c	Sun Jan 11 16:49:44 2009	(r5106)
+++ trunk/tests/engine-tests/check_mapping_engine.c	Sun Jan 11 17:11:44 2009	(r5107)
@@ -174,29 +174,8 @@
 END_TEST
 
 
+OSYNC_TESTCASE_START("mapping_engine")
+OSYNC_TESTCASE_ADD(mapping_engine_same_similar_conflict)
+OSYNC_TESTCASE_ADD(mapping_engine_same_similar_conflict_multi)
+OSYNC_TESTCASE_END
 
-Suite *mapping_engine_suite(void)
-{
-	Suite *s = suite_create("MappingEngine");
-	
-	create_case(s, "mapping_engine_same_similar_conflict", mapping_engine_same_similar_conflict);
-	create_case(s, "mapping_engine_same_similar_conflict_multi", mapping_engine_same_similar_conflict_multi);
-	
-	return s;
-}
-
-int main(void)
-{
-	int nf;
-
-	check_env();
-
-	Suite *s = mapping_engine_suite();
-	
-	SRunner *sr;
-	sr = srunner_create(s);
-	srunner_run_all(sr, CK_VERBOSE);
-	nf = srunner_ntests_failed(sr);
-	srunner_free(sr);
-	return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
-}

Modified: trunk/tests/mapping-tests/check_mapping.c
==============================================================================
--- trunk/tests/mapping-tests/check_mapping.c	Sun Jan 11 16:49:44 2009	(r5106)
+++ trunk/tests/mapping-tests/check_mapping.c	Sun Jan 11 17:11:44 2009	(r5107)
@@ -64,27 +64,8 @@
 }
 END_TEST
 
-Suite *client_suite(void)
-{
-	Suite *s = suite_create("Mapping");
-//	Suite *s2 = suite_create("Mapping");
-	
-	create_case(s, "mapping_new", mapping_new);
-	create_case(s, "mapping_compare", mapping_compare);
-	
-	return s;
-}
-
-int main(void)
-{
-	int nf;
+OSYNC_TESTCASE_START("mapping")
+OSYNC_TESTCASE_ADD(mapping_new)
+OSYNC_TESTCASE_ADD(mapping_compare)
+OSYNC_TESTCASE_END
 
-	Suite *s = client_suite();
-	
-	SRunner *sr;
-	sr = srunner_create(s);
-	srunner_run_all(sr, CK_VERBOSE);
-	nf = srunner_ntests_failed(sr);
-	srunner_free(sr);
-	return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
-}