From: <dg...@su...> - 2009-01-11 21:19:48
|
Author: dgollub Date: Sun Jan 11 22:19:08 2009 New Revision: 5118 URL: http://www.opensync.org/changeset/5118 Log: Ported more unittests to OSYNC_TESTCASE macro: hashtable, module, format_env, member, lock, group, multisync Modified: trunk/tests/CMakeLists.txt trunk/tests/format-tests/check_format_env.c trunk/tests/group-tests/check_group.c trunk/tests/group-tests/check_lock.c trunk/tests/group-tests/check_member.c trunk/tests/helper-tests/check_hash.c trunk/tests/module-tests/check_module.c trunk/tests/sync-tests/check_multisync.c Modified: trunk/tests/CMakeLists.txt ============================================================================== --- trunk/tests/CMakeLists.txt Sun Jan 11 22:01:22 2009 (r5117) +++ trunk/tests/CMakeLists.txt Sun Jan 11 22:19:08 2009 (r5118) @@ -192,10 +192,36 @@ OSYNC_TESTCASE( engine-error engine_error_get_changes_disconnect_error) OSYNC_TESTCASE( engine-error engine_error_missing_format_plugin) -ADD_CHECK_TEST( formatenv format-tests/check_format_env.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( group group-tests/check_group.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( hash helper-tests/check_hash.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( lock group-tests/check_lock.c ${TEST_TARGET_LIBRARIES} ) +BUILD_CHECK_TEST( formatenv format-tests/check_format_env.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(formatenv format_env_create) +OSYNC_TESTCASE(formatenv format_env_register_objformat) +OSYNC_TESTCASE(formatenv format_env_register_objformat_count) +OSYNC_TESTCASE(formatenv format_env_objformat_find) +OSYNC_TESTCASE(formatenv format_env_objformat_find_false) +OSYNC_TESTCASE(formatenv format_env_register_converter) +OSYNC_TESTCASE(formatenv format_env_register_converter_count) +OSYNC_TESTCASE(formatenv format_env_converter_find) +OSYNC_TESTCASE(formatenv format_env_converter_find_false) +OSYNC_TESTCASE(formatenv format_env_register_filter) +OSYNC_TESTCASE(formatenv format_env_register_filter_count) +OSYNC_TESTCASE(formatenv format_env_load_plugins) +OSYNC_TESTCASE(formatenv format_env_plugin) + +BUILD_CHECK_TEST( group group-tests/check_group.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(group group_last_sync) + +BUILD_CHECK_TEST( hashtable helper-tests/check_hash.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(hashtable hashtable_new) +OSYNC_TESTCASE(hashtable hashtable_reload) +OSYNC_TESTCASE(hashtable hashtable_stress) + +BUILD_CHECK_TEST( lock group-tests/check_lock.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(lock lock_simple_lock) +OSYNC_TESTCASE(lock lock_simple_seq_lock) +OSYNC_TESTCASE(lock lock_dual_lock) +OSYNC_TESTCASE(lock lock_dual_lock2) +OSYNC_TESTCASE(lock lock_dual_sync_engine_lock) +OSYNC_TESTCASE(lock lock_dual_sync_engine_unclean) IF (NOT WIN32) BUILD_CHECK_TEST( ipc ipc-tests/check_ipc.c ${TEST_TARGET_LIBRARIES} ) @@ -230,9 +256,22 @@ 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} ) +BUILD_CHECK_TEST( member group-tests/check_member.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(member member_new) + +BUILD_CHECK_TEST( module module-tests/check_module.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(module module_create) +OSYNC_TESTCASE(module module_load) +OSYNC_TESTCASE(module module_load_false) +OSYNC_TESTCASE(module module_function) +OSYNC_TESTCASE(module module_function_false) +OSYNC_TESTCASE(module module_version) +OSYNC_TESTCASE(module module_check) + +BUILD_CHECK_TEST( multisync sync-tests/check_multisync.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(multisync multisync_easy_new) +OSYNC_TESTCASE(multisync multisync_dual_new) +OSYNC_TESTCASE(multisync multisync_triple_new) BUILD_CHECK_TEST( sync sync-tests/check_sync.c ${TEST_TARGET_LIBRARIES} ) OSYNC_TESTCASE( sync sync_setup_connect) Modified: trunk/tests/format-tests/check_format_env.c ============================================================================== --- trunk/tests/format-tests/check_format_env.c Sun Jan 11 22:01:22 2009 (r5117) +++ trunk/tests/format-tests/check_format_env.c Sun Jan 11 22:19:08 2009 (r5118) @@ -6,7 +6,7 @@ #include "opensync/format/opensync_format_env_internals.h" #include "opensync/module/opensync_module_internals.h" -START_TEST (conv_env_create) +START_TEST (format_env_create) { char *testbed = setup_testbed(NULL); @@ -21,7 +21,7 @@ } END_TEST -START_TEST (conv_env_register_objformat) +START_TEST (format_env_register_objformat) { char *testbed = setup_testbed(NULL); @@ -44,7 +44,7 @@ } END_TEST -START_TEST (conv_env_register_objformat_count) +START_TEST (format_env_register_objformat_count) { char *testbed = setup_testbed(NULL); @@ -71,7 +71,7 @@ } END_TEST -START_TEST (conv_env_objformat_find) +START_TEST (format_env_objformat_find) { char *testbed = setup_testbed(NULL); @@ -95,7 +95,7 @@ } END_TEST -START_TEST (conv_env_objformat_find_false) +START_TEST (format_env_objformat_find_false) { char *testbed = setup_testbed(NULL); @@ -124,7 +124,7 @@ return TRUE; } -START_TEST (conv_env_register_converter) +START_TEST (format_env_register_converter) { char *testbed = setup_testbed(NULL); @@ -160,7 +160,7 @@ } END_TEST -START_TEST (conv_env_register_converter_count) +START_TEST (format_env_register_converter_count) { char *testbed = setup_testbed(NULL); @@ -201,7 +201,7 @@ } END_TEST -START_TEST (conv_env_converter_find) +START_TEST (format_env_converter_find) { char *testbed = setup_testbed(NULL); @@ -238,7 +238,7 @@ } END_TEST -START_TEST (conv_env_converter_find_false) +START_TEST (format_env_converter_find_false) { char *testbed = setup_testbed(NULL); @@ -287,7 +287,7 @@ return TRUE; } -START_TEST (conv_env_register_filter) +START_TEST (format_env_register_filter) { char *testbed = setup_testbed(NULL); @@ -310,7 +310,7 @@ } END_TEST -START_TEST (conv_env_register_filter_count) +START_TEST (format_env_register_filter_count) { char *testbed = setup_testbed(NULL); @@ -338,7 +338,7 @@ } END_TEST -START_TEST (conv_env_load_plugins) +START_TEST (format_env_load_plugins) { char *testbed = setup_testbed(NULL); @@ -358,7 +358,7 @@ } END_TEST -START_TEST (conv_env_plugin) +START_TEST (format_env_plugin) { char *testbed = setup_testbed(NULL); @@ -395,43 +395,23 @@ } END_TEST -Suite *format_env_suite(void) -{ - Suite *s = suite_create("Format-Env"); -// Suite *s2 = suite_create("Format-Env"); - - create_case(s, "conv_env_create", conv_env_create); - - create_case(s, "conv_env_register_objformat", conv_env_register_objformat); - create_case(s, "conv_env_register_objformat_count", conv_env_register_objformat_count); - create_case(s, "conv_env_objformat_find", conv_env_objformat_find); - create_case(s, "conv_env_objformat_find_false", conv_env_objformat_find_false); - - create_case(s, "conv_env_register_converter", conv_env_register_converter); - create_case(s, "conv_env_register_converter_count", conv_env_register_converter_count); - create_case(s, "conv_env_converter_find", conv_env_converter_find); - create_case(s, "conv_env_converter_find_false", conv_env_converter_find_false); - - create_case(s, "conv_env_register_filter", conv_env_register_filter); - create_case(s, "conv_env_register_filter_count", conv_env_register_filter_count); - - create_case(s, "conv_env_load_plugins", conv_env_load_plugins); - create_case(s, "conv_env_plugin", conv_env_plugin); - - return s; -} +OSYNC_TESTCASE_START("format_env") +OSYNC_TESTCASE_ADD(format_env_create) -int main(void) -{ - int nf; - - Suite *s = format_env_suite(); - - SRunner *sr; - sr = srunner_create(s); +OSYNC_TESTCASE_ADD(format_env_register_objformat) +OSYNC_TESTCASE_ADD(format_env_register_objformat_count) +OSYNC_TESTCASE_ADD(format_env_objformat_find) +OSYNC_TESTCASE_ADD(format_env_objformat_find_false) + +OSYNC_TESTCASE_ADD(format_env_register_converter) +OSYNC_TESTCASE_ADD(format_env_register_converter_count) +OSYNC_TESTCASE_ADD(format_env_converter_find) +OSYNC_TESTCASE_ADD(format_env_converter_find_false) + +OSYNC_TESTCASE_ADD(format_env_register_filter) +OSYNC_TESTCASE_ADD(format_env_register_filter_count) + +OSYNC_TESTCASE_ADD(format_env_load_plugins) +OSYNC_TESTCASE_ADD(format_env_plugin) +OSYNC_TESTCASE_END - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/group-tests/check_group.c ============================================================================== --- trunk/tests/group-tests/check_group.c Sun Jan 11 22:01:22 2009 (r5117) +++ trunk/tests/group-tests/check_group.c Sun Jan 11 22:19:08 2009 (r5118) @@ -63,26 +63,7 @@ } END_TEST -Suite *group_suite(void) -{ - Suite *s = suite_create("Group"); +OSYNC_TESTCASE_START("group") +OSYNC_TESTCASE_ADD(group_last_sync) +OSYNC_TESTCASE_END - create_case(s, "group_last_sync", group_last_sync); - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = group_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/group-tests/check_lock.c ============================================================================== --- trunk/tests/group-tests/check_lock.c Sun Jan 11 22:01:22 2009 (r5117) +++ trunk/tests/group-tests/check_lock.c Sun Jan 11 22:19:08 2009 (r5118) @@ -9,7 +9,7 @@ #include "opensync/group/opensync_group_internals.h" -START_TEST (simple_lock) +START_TEST (lock_simple_lock) { char *testbed = setup_testbed("multisync_easy_new"); @@ -27,7 +27,7 @@ } END_TEST -START_TEST (simple_seq_lock) +START_TEST (lock_simple_seq_lock) { char *testbed = setup_testbed("multisync_easy_new"); @@ -48,7 +48,7 @@ } END_TEST -START_TEST (dual_lock) +START_TEST (lock_dual_lock) { char *testbed = setup_testbed("multisync_easy_new"); @@ -66,7 +66,7 @@ } END_TEST -START_TEST (dual_lock2) +START_TEST (lock_dual_lock2) { char *testbed = setup_testbed("multisync_easy_new"); @@ -88,7 +88,7 @@ } END_TEST -START_TEST (dual_sync_engine_lock) +START_TEST (lock_dual_sync_engine_lock) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -155,7 +155,7 @@ } END_TEST -START_TEST (dual_sync_engine_unclean) +START_TEST (lock_dual_sync_engine_unclean) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -275,30 +275,12 @@ } END_TEST -Suite *lock_suite(void) -{ - Suite *s = suite_create("Locks"); - //Suite *s2 = suite_create("Locks"); - create_case(s, "simple_lock", simple_lock); - create_case(s, "simple_seq_lock", simple_seq_lock); - create_case(s, "dual_lock", dual_lock); - create_case(s, "dual_lock2", dual_lock2); - create_case(s, "dual_sync_engine_lock", dual_sync_engine_lock); - create_case(s, "dual_sync_engine_unclean", dual_sync_engine_unclean); - - return s; -} +OSYNC_TESTCASE_START("lock") +OSYNC_TESTCASE_ADD(lock_simple_lock) +OSYNC_TESTCASE_ADD(lock_simple_seq_lock) +OSYNC_TESTCASE_ADD(lock_dual_lock) +OSYNC_TESTCASE_ADD(lock_dual_lock2) +OSYNC_TESTCASE_ADD(lock_dual_sync_engine_lock) +OSYNC_TESTCASE_ADD(lock_dual_sync_engine_unclean) +OSYNC_TESTCASE_END -int main(void) -{ - int nf; - - Suite *s = lock_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/group-tests/check_member.c ============================================================================== --- trunk/tests/group-tests/check_member.c Sun Jan 11 22:01:22 2009 (r5117) +++ trunk/tests/group-tests/check_member.c Sun Jan 11 22:19:08 2009 (r5118) @@ -7,7 +7,9 @@ #include <glib.h> #include <gmodule.h> -START_TEST (test_create) +#include "support.h" + +START_TEST (member_new) { OSyncMember *member = NULL; member = osync_member_new(NULL); @@ -16,28 +18,7 @@ } END_TEST -Suite *member_suite(void) -{ - Suite *s = suite_create("Member"); - TCase *tc_core = tcase_create("Core"); - - suite_add_tcase (s, tc_core); - tcase_add_test(tc_core, test_create); - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = member_suite(); - - SRunner *sr; - sr = srunner_create(s); +OSYNC_TESTCASE_START("member") +OSYNC_TESTCASE_ADD(member_new) +OSYNC_TESTCASE_END - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/helper-tests/check_hash.c ============================================================================== --- trunk/tests/helper-tests/check_hash.c Sun Jan 11 22:01:22 2009 (r5117) +++ trunk/tests/helper-tests/check_hash.c Sun Jan 11 22:19:08 2009 (r5118) @@ -190,30 +190,9 @@ } END_TEST -Suite *env_suite(void) -{ - Suite *s = suite_create("Hashtable"); +OSYNC_TESTCASE_START("hashtable") +OSYNC_TESTCASE_ADD(hashtable_new) +OSYNC_TESTCASE_ADD(hashtable_reload) +OSYNC_TESTCASE_ADD(hashtable_stress) +OSYNC_TESTCASE_END - create_case(s, "hashtable_new", hashtable_new); - create_case(s, "hashtable_reload", hashtable_reload); - create_case(s, "hashtable_stress", hashtable_stress); - - return s; -} - -int main(void) -{ - int nf; - - check_env(); - - Suite *s = env_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/module-tests/check_module.c ============================================================================== --- trunk/tests/module-tests/check_module.c Sun Jan 11 22:01:22 2009 (r5117) +++ trunk/tests/module-tests/check_module.c Sun Jan 11 22:19:08 2009 (r5118) @@ -178,33 +178,13 @@ } END_TEST -Suite *module_suite(void) -{ - Suite *s = suite_create("Module"); - //Suite *s2 = suite_create("Module"); - - create_case(s, "module_create", module_create); - create_case(s, "module_load", module_load); - create_case(s, "module_load_false", module_load_false); - create_case(s, "module_function", module_function); - create_case(s, "module_function_false", module_function_false); - create_case(s, "module_version", module_version); - create_case(s, "module_check", module_check); - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = module_suite(); - - SRunner *sr; - sr = srunner_create(s); +OSYNC_TESTCASE_START("module") +OSYNC_TESTCASE_ADD(module_create) +OSYNC_TESTCASE_ADD(module_load) +OSYNC_TESTCASE_ADD(module_load_false) +OSYNC_TESTCASE_ADD(module_function) +OSYNC_TESTCASE_ADD(module_function_false) +OSYNC_TESTCASE_ADD(module_version) +OSYNC_TESTCASE_ADD(module_check) +OSYNC_TESTCASE_END - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/sync-tests/check_multisync.c ============================================================================== --- trunk/tests/sync-tests/check_multisync.c Sun Jan 11 22:01:22 2009 (r5117) +++ trunk/tests/sync-tests/check_multisync.c Sun Jan 11 22:19:08 2009 (r5118) @@ -2476,72 +2476,55 @@ END_TEST #endif -Suite *multisync_suite(void) -{ - Suite *s = suite_create("Multisync"); - //Suite *s2 = suite_create("Multisync"); - create_case(s, "multisync_easy_new", multisync_easy_new); - create_case(s, "multisync_dual_new", multisync_dual_new); - create_case(s, "multisync_triple_new", multisync_triple_new); +OSYNC_TESTCASE_START("multisync") +OSYNC_TESTCASE_ADD(multisync_easy_new) +OSYNC_TESTCASE_ADD(multisync_dual_new) +OSYNC_TESTCASE_ADD(multisync_triple_new) /* FIXME: port testcases, see ticket #981 */ #if 0 - create_case(s, "multisync_easy_mod", multisync_easy_mod); - create_case(s, "multisync_dual_mod", multisync_dual_mod); - create_case(s, "multisync_triple_mod", multisync_triple_mod); - create_case(s, "multisync_easy_del", multisync_easy_del); - create_case(s, "multisync_dual_del", multisync_dual_del); - create_case(s, "multisync_triple_del", multisync_triple_del); - - create_case(s, "multisync_conflict_data_choose", multisync_conflict_data_choose); - create_case(s, "multisync_conflict_data_choose2", multisync_conflict_data_choose2); - create_case(s, "multisync_conflict_changetype_choose", multisync_conflict_changetype_choose); - create_case(s, "multisync_conflict_changetype_choose2", multisync_conflict_changetype_choose2); - create_case(s, "multisync_conflict_hybrid_choose", multisync_conflict_hybrid_choose); - create_case(s, "multisync_conflict_hybrid_choose2", multisync_conflict_hybrid_choose2); - create_case(s, "multisync_conflict_data_duplicate", multisync_conflict_data_duplicate); - create_case(s, "multisync_conflict_data_duplicate2", multisync_conflict_data_duplicate2); - create_case(s, "multisync_conflict_changetype_duplicate", multisync_conflict_changetype_duplicate); - create_case(s, "multisync_conflict_changetype_duplicate2", multisync_conflict_changetype_duplicate2); - create_case(s, "multisync_conflict_hybrid_duplicate", multisync_conflict_hybrid_duplicate); - create_case(s, "multisync_multi_conflict", multisync_multi_conflict); - - create_case(s, "multisync_delayed_conflict_handler", multisync_delayed_conflict_handler); - create_case(s, "multisync_delayed_slow", multisync_delayed_slow); - - create_case(s, "multisync_conflict_ignore", multisync_conflict_ignore); - create_case(s, "multisync_conflict_ignore2", multisync_conflict_ignore2); - - create_case(s, "multisync_easy_new_b", multisync_easy_new_b); - create_case(s, "multisync_triple_del_b", multisync_triple_del_b); - create_case(s, "multisync_conflict_hybrid_choose2_b", multisync_conflict_hybrid_choose2_b); - create_case(s, "multisync_delayed_conflict_handler_b", multisync_delayed_conflict_handler_b); - create_case(s, "multisync_delayed_slow_b", multisync_delayed_slow_b); - create_case(s, "multisync_conflict_ignore_b", multisync_conflict_ignore_b); - create_case(s, "multisync_conflict_ignore2_b", multisync_conflict_ignore2_b); - create_case(s, "multisync_conflict_hybrid_duplicate_b", multisync_conflict_hybrid_duplicate_b); - create_case(s, "multisync_multi_conflict_b", multisync_multi_conflict_b); - create_case(s, "multisync_zero_changes_b", multisync_zero_changes_b); - - create_case(s, "multisync_conflict_hybrid_choose2_b2", multisync_conflict_hybrid_choose2_b2); - create_case(s, "multisync_delayed_conflict_handler_b2", multisync_delayed_conflict_handler_b2); - create_case(s, "multisync_conflict_ignore_b2", multisync_conflict_ignore_b2); - create_case(s, "multisync_multi_conflict_b2", multisync_multi_conflict_b2); +OSYNC_TESTCASE_ADD(multisync_easy_mod) +OSYNC_TESTCASE_ADD(multisync_dual_mod) +OSYNC_TESTCASE_ADD(multisync_triple_mod) +OSYNC_TESTCASE_ADD(multisync_easy_del) +OSYNC_TESTCASE_ADD(multisync_dual_del) +OSYNC_TESTCASE_ADD(multisync_triple_del) + +OSYNC_TESTCASE_ADD(multisync_conflict_data_choose) +OSYNC_TESTCASE_ADD(multisync_conflict_data_choose2) +OSYNC_TESTCASE_ADD(multisync_conflict_changetype_choose) +OSYNC_TESTCASE_ADD(multisync_conflict_changetype_choose2) +OSYNC_TESTCASE_ADD(multisync_conflict_hybrid_choose) +OSYNC_TESTCASE_ADD(multisync_conflict_hybrid_choose2) +OSYNC_TESTCASE_ADD(multisync_conflict_data_duplicate) +OSYNC_TESTCASE_ADD(multisync_conflict_data_duplicate2) +OSYNC_TESTCASE_ADD(multisync_conflict_changetype_duplicate) +OSYNC_TESTCASE_ADD(multisync_conflict_changetype_duplicate2) +OSYNC_TESTCASE_ADD(multisync_conflict_hybrid_duplicate) +OSYNC_TESTCASE_ADD(multisync_multi_conflict) + +OSYNC_TESTCASE_ADD(multisync_delayed_conflict_handler) +OSYNC_TESTCASE_ADD(multisync_delayed_slow) + +OSYNC_TESTCASE_ADD(multisync_conflict_ignore) +OSYNC_TESTCASE_ADD(multisync_conflict_ignore2) + +OSYNC_TESTCASE_ADD(multisync_easy_new_b) +OSYNC_TESTCASE_ADD(multisync_triple_del_b) +OSYNC_TESTCASE_ADD(multisync_conflict_hybrid_choose2_b) +OSYNC_TESTCASE_ADD(multisync_delayed_conflict_handler_b) +OSYNC_TESTCASE_ADD(multisync_delayed_slow_b) +OSYNC_TESTCASE_ADD(multisync_conflict_ignore_b) +OSYNC_TESTCASE_ADD(multisync_conflict_ignore2_b) +OSYNC_TESTCASE_ADD(multisync_conflict_hybrid_duplicate_b) +OSYNC_TESTCASE_ADD(multisync_multi_conflict_b) +OSYNC_TESTCASE_ADD(multisync_zero_changes_b) + +OSYNC_TESTCASE_ADD(multisync_conflict_hybrid_choose2_b2) +OSYNC_TESTCASE_ADD(multisync_delayed_conflict_handler_b2) +OSYNC_TESTCASE_ADD(multisync_conflict_ignore_b2) +OSYNC_TESTCASE_ADD(multisync_multi_conflict_b2) #endif - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = multisync_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; -} + +OSYNC_TESTCASE_END + |