Menu
▾
▴
[Opensync-commits] r5117 - in trunk/tests: . archive-tests capabilities-tests client-tests data-tests format-tests sync-tests
|
From: <dg...@su...> - 2009-01-11 21:02:12
|
Author: dgollub Date: Sun Jan 11 22:01:22 2009 New Revision: 5117 URL: http://www.opensync.org/changeset/5117 Log: Port more unittests to OSYNC_TESTCASE macro: archive, conv, converter, detect, capabilities, error, data, filter, client. Some still left ... Modified: trunk/tests/CMakeLists.txt trunk/tests/archive-tests/check_archive.c trunk/tests/capabilities-tests/check_capabilities.c trunk/tests/check_error.c trunk/tests/client-tests/check_client.c trunk/tests/data-tests/check_data.c trunk/tests/format-tests/check_conv.c trunk/tests/format-tests/check_converter.c trunk/tests/format-tests/check_detect.c trunk/tests/sync-tests/check_filter.c Modified: trunk/tests/CMakeLists.txt ============================================================================== --- trunk/tests/CMakeLists.txt Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/CMakeLists.txt Sun Jan 11 22:01:22 2009 (r5117) @@ -15,15 +15,122 @@ SET( TEST_TARGET_LIBRARIES support ) ADD_TEST( symbols ${CMAKE_CURRENT_SOURCE_DIR}/abiapi-tests/check-symbols ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ) -ADD_CHECK_TEST( error check_error.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( archive archive-tests/check_archive.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( capabilities capabilities-tests/check_capabilities.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( client client-tests/check_client.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( filter sync-tests/check_filter.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( conv format-tests/check_conv.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( converter format-tests/check_converter.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( datatest data-tests/check_data.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( detect format-tests/check_detect.c ${TEST_TARGET_LIBRARIES} ) +BUILD_CHECK_TEST( error check_error.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(error error_create) +OSYNC_TESTCASE(error error_create_null) +OSYNC_TESTCASE(error error_get_name_null) +OSYNC_TESTCASE(error error_get_name_null2) +OSYNC_TESTCASE(error error_get_name) +OSYNC_TESTCASE(error error_free_null) +OSYNC_TESTCASE(error error_free_null2) +OSYNC_TESTCASE(error error_free) +OSYNC_TESTCASE(error error_check_null) +OSYNC_TESTCASE(error error_check_null2) +OSYNC_TESTCASE(error error_check) +OSYNC_TESTCASE(error error_check2) +OSYNC_TESTCASE(error error_stack_null) +OSYNC_TESTCASE(error error_stack_null2) +OSYNC_TESTCASE(error error_stack) +OSYNC_TESTCASE(error error_stack2) +OSYNC_TESTCASE(error error_set_null) +OSYNC_TESTCASE(error error_duplicate_null) +OSYNC_TESTCASE(error error_duplicate) + +BUILD_CHECK_TEST( archive archive-tests/check_archive.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(archive archive_new) +OSYNC_TESTCASE(archive archive_load_changes) +OSYNC_TESTCASE(archive archive_save_change) +OSYNC_TESTCASE(archive archive_save_data) +OSYNC_TESTCASE(archive archive_load_data) +OSYNC_TESTCASE(archive archive_load_data_with_closing_db) + +BUILD_CHECK_TEST(capabilities capabilities-tests/check_capabilities.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(capabilities capabilities_new) +OSYNC_TESTCASE(capabilities capability_new) +OSYNC_TESTCASE(capabilities capabilities_parse) +OSYNC_TESTCASE(capabilities capabilities_sort) + +BUILD_CHECK_TEST(client client-tests/check_client.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(client client_new) +OSYNC_TESTCASE(client client_pipes) +OSYNC_TESTCASE(client client_run) + +BUILD_CHECK_TEST( filter sync-tests/check_filter.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(filter filter_setup) +OSYNC_TESTCASE(filter filter_sync_deny_all) +OSYNC_TESTCASE(filter filter_sync_custom) +OSYNC_TESTCASE(filter filter_save_and_load) +OSYNC_TESTCASE(filter filter_destobjtype_delete) + +BUILD_CHECK_TEST( conv format-tests/check_conv.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(conv conv_env_create) +OSYNC_TESTCASE(conv conv_env_register_objformat) +OSYNC_TESTCASE(conv conv_env_register_objformat_count) +OSYNC_TESTCASE(conv conv_env_objformat_find) +OSYNC_TESTCASE(conv conv_env_objformat_find_false) +OSYNC_TESTCASE(conv conv_env_register_converter) +OSYNC_TESTCASE(conv conv_env_register_converter_count) +OSYNC_TESTCASE(conv conv_env_converter_find) +OSYNC_TESTCASE(conv conv_env_converter_find_false) +OSYNC_TESTCASE(conv conv_env_register_filter) +OSYNC_TESTCASE(conv conv_env_register_filter_count) +OSYNC_TESTCASE(conv conv_find_path) +OSYNC_TESTCASE(conv conv_find_path2) +OSYNC_TESTCASE(conv conv_find_path_false) +OSYNC_TESTCASE(conv conv_find_multi_path) +OSYNC_TESTCASE(conv conv_find_multi_path_with_preferred) +OSYNC_TESTCASE(conv conv_find_circular_false) +OSYNC_TESTCASE(conv conv_find_complex) +OSYNC_TESTCASE(conv conv_find_multi_target) +OSYNC_TESTCASE(conv conv_find_multi_target2) +OSYNC_TESTCASE(conv conv_find_multi_path_multi_target) +OSYNC_TESTCASE(conv conv_find_multi_path_multi_target_with_preferred) +OSYNC_TESTCASE(conv conv_env_convert1) +OSYNC_TESTCASE(conv conv_env_convert_back) +OSYNC_TESTCASE(conv conv_env_convert_desenc) +OSYNC_TESTCASE(conv conv_env_convert_desenc_complex) +OSYNC_TESTCASE(conv conv_env_detect_and_convert) +OSYNC_TESTCASE(conv conv_prefer_not_desencap) +OSYNC_TESTCASE(conv conv_prefer_same_objtype) +OSYNC_TESTCASE(conv conv_prefer_not_lossy_objtype_change) +OSYNC_TESTCASE(conv conv_env_detect_false) +OSYNC_TESTCASE(conv conv_env_decap_and_detect) +OSYNC_TESTCASE(conv conv_env_decap_and_detect2) + +BUILD_CHECK_TEST( converter format-tests/check_converter.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(converter converter_create) +OSYNC_TESTCASE(converter converter_get) +OSYNC_TESTCASE(converter converter_create_decap) +OSYNC_TESTCASE(converter converter_create_detector) +OSYNC_TESTCASE(converter converter_matches) +OSYNC_TESTCASE(converter converter_detect) +OSYNC_TESTCASE(converter converter_detector_invoke) +OSYNC_TESTCASE(converter converter_detect_non_detector) + +OSYNC_TESTCASE(converter converter_conv_invoke) +OSYNC_TESTCASE(converter converter_decap_invoke) +OSYNC_TESTCASE(converter converter_encap_invoke) + +OSYNC_TESTCASE(converter converter_conv_invoke_const) +OSYNC_TESTCASE(converter converter_decap_invoke_const) +OSYNC_TESTCASE(converter converter_encap_invoke_const) + +OSYNC_TESTCASE(converter converter_path_create) +OSYNC_TESTCASE(converter converter_path_add) +OSYNC_TESTCASE(converter converter_config) + +BUILD_CHECK_TEST( datatest data-tests/check_data.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(datatest data_new) +OSYNC_TESTCASE(datatest data_new_with_data) +OSYNC_TESTCASE(datatest data_set_data) +OSYNC_TESTCASE(datatest data_set_data2) +OSYNC_TESTCASE(datatest data_objformat) +OSYNC_TESTCASE(datatest data_objtype) + +BUILD_CHECK_TEST( detect format-tests/check_detect.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(detect detect_smart) +OSYNC_TESTCASE(detect detect_different_objtype) +OSYNC_TESTCASE(detect detect_smart_no) BUILD_CHECK_TEST( engine engine-tests/check_engine.c ${TEST_TARGET_LIBRARIES} ) OSYNC_TESTCASE( engine engine_new ) Modified: trunk/tests/archive-tests/check_archive.c ============================================================================== --- trunk/tests/archive-tests/check_archive.c Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/archive-tests/check_archive.c Sun Jan 11 22:01:22 2009 (r5117) @@ -182,28 +182,12 @@ } END_TEST -Suite *archive_suite(void) -{ - Suite *s = suite_create("Archive"); - create_case(s, "archive_new", archive_new); - create_case(s, "archive_load_changes", archive_load_changes); - create_case(s, "archive_save_change", archive_save_change); - create_case(s, "archive_save_data", archive_save_data); - create_case(s, "archive_load_data", archive_load_data); - create_case(s, "archive_load_data_with_closing_db", archive_load_data_with_closing_db); - return s; -} - -int main(void) -{ - int nf; +OSYNC_TESTCASE_START("archive") +OSYNC_TESTCASE_ADD(archive_new) +OSYNC_TESTCASE_ADD(archive_load_changes) +OSYNC_TESTCASE_ADD(archive_save_change) +OSYNC_TESTCASE_ADD(archive_save_data) +OSYNC_TESTCASE_ADD(archive_load_data) +OSYNC_TESTCASE_ADD(archive_load_data_with_closing_db) +OSYNC_TESTCASE_END - Suite *s = archive_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/capabilities-tests/check_capabilities.c ============================================================================== --- trunk/tests/capabilities-tests/check_capabilities.c Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/capabilities-tests/check_capabilities.c Sun Jan 11 22:01:22 2009 (r5117) @@ -84,26 +84,10 @@ } END_TEST -Suite *capabilities_suite(void) -{ - Suite *s = suite_create("Capabilities"); - create_case(s, "capabilities_new", capabilities_new); - create_case(s, "capability_new", capability_new); - create_case(s, "capabilities_parse", capabilities_parse); - create_case(s, "capabilities_sort", capabilities_sort); - return s; -} - -int main(void) -{ - int nf; +OSYNC_TESTCASE_START("capabilities") +OSYNC_TESTCASE_ADD(capabilities_new) +OSYNC_TESTCASE_ADD(capability_new) +OSYNC_TESTCASE_ADD(capabilities_parse) +OSYNC_TESTCASE_ADD(capabilities_sort) +OSYNC_TESTCASE_END - Suite *s = capabilities_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/check_error.c ============================================================================== --- trunk/tests/check_error.c Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/check_error.c Sun Jan 11 22:01:22 2009 (r5117) @@ -201,45 +201,25 @@ } END_TEST -Suite *error_suite(void) -{ - Suite *s = suite_create("Error"); - //Suite *s2 = suite_create("Error"); +OSYNC_TESTCASE_START("error") +OSYNC_TESTCASE_ADD(error_create) +OSYNC_TESTCASE_ADD(error_create_null) +OSYNC_TESTCASE_ADD(error_get_name_null) +OSYNC_TESTCASE_ADD(error_get_name_null2) +OSYNC_TESTCASE_ADD(error_get_name) +OSYNC_TESTCASE_ADD(error_free_null) +OSYNC_TESTCASE_ADD(error_free_null2) +OSYNC_TESTCASE_ADD(error_free) +OSYNC_TESTCASE_ADD(error_check_null) +OSYNC_TESTCASE_ADD(error_check_null2) +OSYNC_TESTCASE_ADD(error_check) +OSYNC_TESTCASE_ADD(error_check2) +OSYNC_TESTCASE_ADD(error_stack_null) +OSYNC_TESTCASE_ADD(error_stack_null2) +OSYNC_TESTCASE_ADD(error_stack) +OSYNC_TESTCASE_ADD(error_stack2) +OSYNC_TESTCASE_ADD(error_set_null) +OSYNC_TESTCASE_ADD(error_duplicate_null) +OSYNC_TESTCASE_ADD(error_duplicate) +OSYNC_TESTCASE_END - create_case(s, "error_create", error_create); - create_case(s, "error_create_null", error_create_null); - create_case(s, "error_get_name_null", error_get_name_null); - create_case(s, "error_get_name_null2", error_get_name_null2); - create_case(s, "error_get_name", error_get_name); - create_case(s, "error_free_null", error_free_null); - create_case(s, "error_free_null2", error_free_null2); - create_case(s, "error_free", error_free); - create_case(s, "error_check_null", error_check_null); - create_case(s, "error_check_null2", error_check_null2); - create_case(s, "error_check", error_check); - create_case(s, "error_check2", error_check2); - create_case(s, "error_stack_null", error_stack_null); - create_case(s, "error_stack_null2", error_stack_null2); - create_case(s, "error_stack", error_stack); - create_case(s, "error_stack2", error_stack2); - create_case(s, "error_set_null", error_set_null); - create_case(s, "error_duplicate_null", error_duplicate_null); - create_case(s, "error_duplicate", error_duplicate); - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = error_suite(); - - SRunner *sr; - sr = srunner_create(s); - - srunner_run_all(sr, CK_NORMAL); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/client-tests/check_client.c ============================================================================== --- trunk/tests/client-tests/check_client.c Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/client-tests/check_client.c Sun Jan 11 22:01:22 2009 (r5117) @@ -187,28 +187,9 @@ } END_TEST -Suite *client_suite(void) -{ - Suite *s = suite_create("Client"); -// Suite *s2 = suite_create("Client"); - - create_case(s, "client_new", client_new); - create_case(s, "client_pipes", client_pipes); - create_case(s, "client_run", client_run); - - return s; -} - -int main(void) -{ - int nf; +OSYNC_TESTCASE_START("client") +OSYNC_TESTCASE_ADD(client_new) +OSYNC_TESTCASE_ADD(client_pipes) +OSYNC_TESTCASE_ADD(client_run) +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; -} Modified: trunk/tests/data-tests/check_data.c ============================================================================== --- trunk/tests/data-tests/check_data.c Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/data-tests/check_data.c Sun Jan 11 22:01:22 2009 (r5117) @@ -189,33 +189,12 @@ } END_TEST -Suite *data_suite(void) -{ - Suite *s = suite_create("Data"); -// Suite *s2 = suite_create("Data"); - - create_case(s, "data_new", data_new); - create_case(s, "data_new_with_data", data_new_with_data); - create_case(s, "data_set_data", data_set_data); - create_case(s, "data_set_data2", data_set_data2); - create_case(s, "data_objformat", data_objformat); - create_case(s, "data_objtype", data_objtype); - - /* OSyncData *osync_data_clone(OSyncData *data, OSyncError **error); */ - - return s; -} - -int main(void) -{ - int nf; +OSYNC_TESTCASE_START("data") +OSYNC_TESTCASE_ADD(data_new) +OSYNC_TESTCASE_ADD(data_new_with_data) +OSYNC_TESTCASE_ADD(data_set_data) +OSYNC_TESTCASE_ADD(data_set_data2) +OSYNC_TESTCASE_ADD(data_objformat) +OSYNC_TESTCASE_ADD(data_objtype) +OSYNC_TESTCASE_END - Suite *s = data_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/format-tests/check_conv.c ============================================================================== --- trunk/tests/format-tests/check_conv.c Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/format-tests/check_conv.c Sun Jan 11 22:01:22 2009 (r5117) @@ -2450,55 +2450,10 @@ 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_find_path", conv_find_path); - create_case(s, "conv_find_path2", conv_find_path2); - create_case(s, "conv_find_path_false", conv_find_path_false); - create_case(s, "conv_find_multi_path", conv_find_multi_path); - create_case(s, "conv_find_multi_path_with_preferred", conv_find_multi_path_with_preferred); - create_case(s, "conv_find_circular_false", conv_find_circular_false); - create_case(s, "conv_find_complex", conv_find_complex); - - create_case(s, "conv_find_multi_target", conv_find_multi_target); - create_case(s, "conv_find_multi_target2", conv_find_multi_target2); - create_case(s, "conv_find_multi_path_multi_target", conv_find_multi_path_multi_target); - create_case(s, "conv_find_multi_path_multi_target_with_preferred", conv_find_multi_path_multi_target_with_preferred); - // Gone? //create_case(s, "conv_env_osp_circular_false", conv_env_osp_circular_false); //create_case(s, "conv_env_osp_complex", conv_env_osp_complex); - create_case(s, "conv_env_convert1", conv_env_convert1); - create_case(s, "conv_env_convert_back", conv_env_convert_back); - create_case(s, "conv_env_convert_desenc", conv_env_convert_desenc); - - create_case(s, "conv_env_convert_desenc_complex", conv_env_convert_desenc_complex); - create_case(s, "conv_env_detect_and_convert", conv_env_detect_and_convert); - create_case(s, "conv_prefer_not_desencap", conv_prefer_not_desencap); - create_case(s, "conv_prefer_same_objtype", conv_prefer_same_objtype); - create_case(s, "conv_prefer_not_lossy_objtype_change", conv_prefer_not_lossy_objtype_change); - create_case(s, "conv_env_detect_false", conv_env_detect_false); - create_case(s, "conv_env_decap_and_detect", conv_env_decap_and_detect); - create_case(s, "conv_env_decap_and_detect2", conv_env_decap_and_detect2); /* * osync_bool osync_format_env_load_plugins(OSyncFormatEnv *env, const char *path, OSyncError **error); @@ -2512,21 +2467,48 @@ OSyncFormatConverterPath *osync_format_env_find_path_formats(OSyncFormatEnv *env, OSyncObjFormat *sourceformat, OSyncObjFormat **targets, OSyncError **error); * */ - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = format_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; -} + + +OSYNC_TESTCASE_START("format-env") +OSYNC_TESTCASE_ADD(conv_env_create) + +OSYNC_TESTCASE_ADD(conv_env_register_objformat) +OSYNC_TESTCASE_ADD(conv_env_register_objformat_count) +OSYNC_TESTCASE_ADD(conv_env_objformat_find) +OSYNC_TESTCASE_ADD(conv_env_objformat_find_false) + +OSYNC_TESTCASE_ADD(conv_env_register_converter) +OSYNC_TESTCASE_ADD(conv_env_register_converter_count) +OSYNC_TESTCASE_ADD(conv_env_converter_find) +OSYNC_TESTCASE_ADD(conv_env_converter_find_false) + +OSYNC_TESTCASE_ADD(conv_env_register_filter) +OSYNC_TESTCASE_ADD(conv_env_register_filter_count) + +OSYNC_TESTCASE_ADD(conv_find_path) +OSYNC_TESTCASE_ADD(conv_find_path2) +OSYNC_TESTCASE_ADD(conv_find_path_false) +OSYNC_TESTCASE_ADD(conv_find_multi_path) +OSYNC_TESTCASE_ADD(conv_find_multi_path_with_preferred) +OSYNC_TESTCASE_ADD(conv_find_circular_false) +OSYNC_TESTCASE_ADD(conv_find_complex) + +OSYNC_TESTCASE_ADD(conv_find_multi_target) +OSYNC_TESTCASE_ADD(conv_find_multi_target2) +OSYNC_TESTCASE_ADD(conv_find_multi_path_multi_target) +OSYNC_TESTCASE_ADD(conv_find_multi_path_multi_target_with_preferred) + +OSYNC_TESTCASE_ADD(conv_env_convert1) +OSYNC_TESTCASE_ADD(conv_env_convert_back) +OSYNC_TESTCASE_ADD(conv_env_convert_desenc) + +OSYNC_TESTCASE_ADD(conv_env_convert_desenc_complex) +OSYNC_TESTCASE_ADD(conv_env_detect_and_convert) +OSYNC_TESTCASE_ADD(conv_prefer_not_desencap) +OSYNC_TESTCASE_ADD(conv_prefer_same_objtype) +OSYNC_TESTCASE_ADD(conv_prefer_not_lossy_objtype_change) +OSYNC_TESTCASE_ADD(conv_env_detect_false) +OSYNC_TESTCASE_ADD(conv_env_decap_and_detect) +OSYNC_TESTCASE_ADD(conv_env_decap_and_detect2) +OSYNC_TESTCASE_END + Modified: trunk/tests/format-tests/check_converter.c ============================================================================== --- trunk/tests/format-tests/check_converter.c Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/format-tests/check_converter.c Sun Jan 11 22:01:22 2009 (r5117) @@ -707,46 +707,26 @@ } END_TEST -Suite *converter_suite(void) -{ - Suite *s = suite_create("Converter"); - //Suite *s2 = suite_create("Converter"); - - create_case(s, "converter_create", converter_create); - create_case(s, "converter_get", converter_get); - create_case(s, "converter_create_decap", converter_create_decap); - create_case(s, "converter_create_detector", converter_create_detector); - create_case(s, "converter_matches", converter_matches); - create_case(s, "converter_detect", converter_detect); - create_case(s, "converter_detector_invoke", converter_detector_invoke); - create_case(s, "converter_detect_non_detector", converter_detect_non_detector); - - create_case(s, "converter_conv_invoke", converter_conv_invoke); - create_case(s, "converter_decap_invoke", converter_decap_invoke); - create_case(s, "converter_encap_invoke", converter_encap_invoke); - - create_case(s, "converter_conv_invoke_const", converter_conv_invoke_const); - create_case(s, "converter_decap_invoke_const", converter_decap_invoke_const); - create_case(s, "converter_encap_invoke_const", converter_encap_invoke_const); - - create_case(s, "converter_path_create", converter_path_create); - create_case(s, "converter_path_add", converter_path_add); - create_case(s, "converter_config", converter_config); - - return s; -} +OSYNC_TESTCASE_START("converter") +OSYNC_TESTCASE_ADD(converter_create) +OSYNC_TESTCASE_ADD(converter_get) +OSYNC_TESTCASE_ADD(converter_create_decap) +OSYNC_TESTCASE_ADD(converter_create_detector) +OSYNC_TESTCASE_ADD(converter_matches) +OSYNC_TESTCASE_ADD(converter_detect) +OSYNC_TESTCASE_ADD(converter_detector_invoke) +OSYNC_TESTCASE_ADD(converter_detect_non_detector) -int main(void) -{ - int nf; - - Suite *s = converter_suite(); - - SRunner *sr; - sr = srunner_create(s); +OSYNC_TESTCASE_ADD(converter_conv_invoke) +OSYNC_TESTCASE_ADD(converter_decap_invoke) +OSYNC_TESTCASE_ADD(converter_encap_invoke) + +OSYNC_TESTCASE_ADD(converter_conv_invoke_const) +OSYNC_TESTCASE_ADD(converter_decap_invoke_const) +OSYNC_TESTCASE_ADD(converter_encap_invoke_const) + +OSYNC_TESTCASE_ADD(converter_path_create) +OSYNC_TESTCASE_ADD(converter_path_add) +OSYNC_TESTCASE_ADD(converter_config) +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/format-tests/check_detect.c ============================================================================== --- trunk/tests/format-tests/check_detect.c Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/format-tests/check_detect.c Sun Jan 11 22:01:22 2009 (r5117) @@ -10,7 +10,7 @@ return FALSE; } -START_TEST (conv_env_detect_smart) +START_TEST (detect_smart) { OSyncError *error = NULL; @@ -40,7 +40,7 @@ } END_TEST -START_TEST (conv_env_detect_different_objtype) +START_TEST (detect_different_objtype) { OSyncError *error = NULL; @@ -72,7 +72,7 @@ END_TEST -START_TEST (conv_env_detect_smart_no) +START_TEST (detect_smart_no) { OSyncError *error = NULL; @@ -102,28 +102,9 @@ } END_TEST -Suite *env_suite(void) -{ - Suite *s = suite_create("Detect"); - - create_case(s, "conv_env_detect_smart", conv_env_detect_smart); - create_case(s, "conv_env_detect_different_objtype", conv_env_detect_different_objtype); - create_case(s, "conv_env_detect_smart_no", conv_env_detect_smart_no); +OSYNC_TESTCASE_START("detect") +OSYNC_TESTCASE_ADD(detect_smart) +OSYNC_TESTCASE_ADD(detect_different_objtype) +OSYNC_TESTCASE_ADD(detect_smart_no) +OSYNC_TESTCASE_END - return s; -} - -int main(void) -{ - int nf; - - 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/sync-tests/check_filter.c ============================================================================== --- trunk/tests/sync-tests/check_filter.c Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/sync-tests/check_filter.c Sun Jan 11 22:01:22 2009 (r5117) @@ -446,31 +446,12 @@ } END_TEST*/ -Suite *filter_suite(void) -{ - Suite *s = suite_create("Filter"); - //Suite *s2 = suite_create("Filter"); - - create_case(s, "filter_setup", filter_setup); - create_case(s, "filter_sync_deny_all", filter_sync_deny_all); - create_case(s, "filter_sync_custom", filter_sync_custom); - create_case(s, "filter_save_and_load", filter_save_and_load); - //create_case(s, "filter_sync_vcard_only", filter_sync_vcard_only); // TODO, see testcase description - create_case(s, "filter_destobjtype_delete", filter_destobjtype_delete); - - return s; -} - -int main(void) -{ - int nf; +OSYNC_TESTCASE_START("filter") +OSYNC_TESTCASE_ADD(filter_setup) +OSYNC_TESTCASE_ADD(filter_sync_deny_all) +OSYNC_TESTCASE_ADD(filter_sync_custom) +OSYNC_TESTCASE_ADD(filter_save_and_load) +/* TODO: Port OSYNC_TESTCASE_ADD(filter_sync_vcard_only) */ +OSYNC_TESTCASE_ADD(filter_destobjtype_delete) +OSYNC_TESTCASE_END - Suite *s = filter_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; -} |
