Menu
▾
▴
[Opensync-commits] r5119 - in trunk/tests: . capabilities-tests client-tests format-tests group-tests ipc-tests plugin-tests sync-tests version-tests
|
From: <dg...@su...> - 2009-01-11 22:06:09
|
Author: dgollub Date: Sun Jan 11 22:42:15 2009 New Revision: 5119 URL: http://www.opensync.org/changeset/5119 Log: Port unittest for OSYNC_TESTCASE macros: version, objformat, time xmlformat, updater, plugin_config, serializer, proxy, sync_error Modified: trunk/tests/CMakeLists.txt trunk/tests/capabilities-tests/check_xmlformat.c trunk/tests/client-tests/check_proxy.c trunk/tests/format-tests/check_objformat.c trunk/tests/format-tests/check_time.c trunk/tests/group-tests/check_updater.c trunk/tests/ipc-tests/check_serializer.c trunk/tests/plugin-tests/check_plugin_config.c trunk/tests/sync-tests/check_sync_error.c trunk/tests/version-tests/check_version.c Modified: trunk/tests/CMakeLists.txt ============================================================================== --- trunk/tests/CMakeLists.txt Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/CMakeLists.txt Sun Jan 11 22:42:15 2009 (r5119) @@ -294,15 +294,83 @@ OSYNC_TESTCASE( sync sync_slowsync_mainsink_connect) OSYNC_TESTCASE( sync sync_initial_slow_sync) -ADD_CHECK_TEST( sync-error sync-tests/check_sync_error.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( objformat format-tests/check_objformat.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( pluginconfig plugin-tests/check_plugin_config.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( proxy client-tests/check_proxy.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( serializer ipc-tests/check_serializer.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( time format-tests/check_time.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( version version-tests/check_version.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( updater group-tests/check_updater.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( xmlformat capabilities-tests/check_xmlformat.c ${TEST_TARGET_LIBRARIES} ) +BUILD_CHECK_TEST( sync-error sync-tests/check_sync_error.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(sync-error sync_error_single_init_error_noerror) + +BUILD_CHECK_TEST( objformat format-tests/check_objformat.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(objformat objformat_new) +OSYNC_TESTCASE(objformat objformat_get) +OSYNC_TESTCASE(objformat objformat_equal) +OSYNC_TESTCASE(objformat objformat_compare) +OSYNC_TESTCASE(objformat objformat_destroy) +OSYNC_TESTCASE(objformat objformat_copy) +OSYNC_TESTCASE(objformat objformat_duplicate) +OSYNC_TESTCASE(objformat objformat_create) +OSYNC_TESTCASE(objformat objformat_print) +OSYNC_TESTCASE(objformat objformat_revision) +OSYNC_TESTCASE(objformat objformat_marshal) +OSYNC_TESTCASE(objformat objformat_demarshal) + +BUILD_CHECK_TEST( plugin_config plugin-tests/check_plugin_config.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(plugin_config plugin_config_new) +OSYNC_TESTCASE(plugin_config plugin_config_new_nomemory) +OSYNC_TESTCASE(plugin_config plugin_config_supported) +OSYNC_TESTCASE(plugin_config plugin_config_subcomponents) +OSYNC_TESTCASE(plugin_config plugin_config_subcomponents_nomemory) +OSYNC_TESTCASE(plugin_config plugin_config_advancedoption) +OSYNC_TESTCASE(plugin_config plugin_config_advancedoption_set_get) +OSYNC_TESTCASE(plugin_config plugin_config_advancedoption_param) +OSYNC_TESTCASE(plugin_config plugin_config_authentication) +OSYNC_TESTCASE(plugin_config plugin_config_connection) +OSYNC_TESTCASE(plugin_config plugin_config_localization) +OSYNC_TESTCASE(plugin_config plugin_config_resources) +OSYNC_TESTCASE(plugin_config plugin_config_save_and_load) +OSYNC_TESTCASE(plugin_config plugin_config_save_and_load_connection_bluetooth) +OSYNC_TESTCASE(plugin_config plugin_config_save_and_load_connection_usb) +OSYNC_TESTCASE(plugin_config plugin_config_save_and_load_connection_irda) +OSYNC_TESTCASE(plugin_config plugin_config_save_and_load_connection_network) +OSYNC_TESTCASE(plugin_config plugin_config_save_and_load_connection_serial) + +BUILD_CHECK_TEST( proxy client-tests/check_proxy.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(proxy proxy_new) +OSYNC_TESTCASE(proxy proxy_spawn) +OSYNC_TESTCASE(proxy proxy_init) +OSYNC_TESTCASE(proxy proxy_discover) +OSYNC_TESTCASE(proxy proxy_connect) + +BUILD_CHECK_TEST( serializer ipc-tests/check_serializer.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(serializer serializer_pluginconfig) +OSYNC_TESTCASE(serializer serializer_pluginconfig_full) + +BUILD_CHECK_TEST( time format-tests/check_time.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(time time_timezone_diff) +OSYNC_TESTCASE(time time_relative2tm) +OSYNC_TESTCASE(time time_unix_converters) + +BUILD_CHECK_TEST( version version-tests/check_version.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(version version_new) +OSYNC_TESTCASE(version version_matches) +OSYNC_TESTCASE(version version_load_from_descriptions) + +BUILD_CHECK_TEST( updater group-tests/check_updater.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(updater updater_init) +OSYNC_TESTCASE(updater updater_without_loaded_group) +OSYNC_TESTCASE(updater updater_action_required) +OSYNC_TESTCASE(updater updater_updates_directory) +OSYNC_TESTCASE(updater updater_invalid_stylesheet) +OSYNC_TESTCASE(updater updater_valid_stylesheet) +OSYNC_TESTCASE(updater updater_group_three_steps) + +BUILD_CHECK_TEST( xmlformat capabilities-tests/check_xmlformat.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(xmlformat xmlformat_new) +OSYNC_TESTCASE(xmlformat xmlformat_parse) +OSYNC_TESTCASE(xmlformat xmlformat_sort) +OSYNC_TESTCASE(xmlformat xmlformat_is_sorted) +OSYNC_TESTCASE(xmlformat xmlformat_search_field) +OSYNC_TESTCASE(xmlformat xmlformat_schema_validate) +OSYNC_TESTCASE(xmlformat xmlfield_new) +OSYNC_TESTCASE(xmlformat xmlfield_sort) + CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake" "${CMAKE_BINARY_DIR}/CTestCustom.ctest") Modified: trunk/tests/capabilities-tests/check_xmlformat.c ============================================================================== --- trunk/tests/capabilities-tests/check_xmlformat.c Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/capabilities-tests/check_xmlformat.c Sun Jan 11 22:42:15 2009 (r5119) @@ -222,38 +222,17 @@ } END_TEST -Suite *xmlformat_suite(void) -{ - Suite *s = suite_create("XMLFormat"); -// Suite *s2 = suite_create("XMLFormat"); +OSYNC_TESTCASE_START("xmlformat") +// xmlformat +OSYNC_TESTCASE_ADD(xmlformat_new) +OSYNC_TESTCASE_ADD(xmlformat_parse) +OSYNC_TESTCASE_ADD(xmlformat_sort) +OSYNC_TESTCASE_ADD(xmlformat_is_sorted) +OSYNC_TESTCASE_ADD(xmlformat_search_field) +// xmlformat schema +OSYNC_TESTCASE_ADD(xmlformat_schema_validate) +// xmlfield +OSYNC_TESTCASE_ADD(xmlfield_new) +OSYNC_TESTCASE_ADD(xmlfield_sort) +OSYNC_TESTCASE_END - // xmlformat - create_case(s, "xmlformat_new", xmlformat_new); - create_case(s, "xmlformat_parse", xmlformat_parse); - create_case(s, "xmlformat_sort", xmlformat_sort); - create_case(s, "xmlformat_is_sorted", xmlformat_is_sorted); - create_case(s, "xmlformat_search_field", xmlformat_search_field); - - // xmlformat schema - create_case(s, "xmlformat_schema_validate", xmlformat_schema_validate); - - // xmlfield - create_case(s, "xmlfield_new", xmlfield_new); - create_case(s, "xmlfield_sort", xmlfield_sort); - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = xmlformat_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/client-tests/check_proxy.c ============================================================================== --- trunk/tests/client-tests/check_proxy.c Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/client-tests/check_proxy.c Sun Jan 11 22:42:15 2009 (r5119) @@ -264,30 +264,11 @@ } END_TEST -Suite *proxy_suite(void) -{ - Suite *s = suite_create("Proxy"); -// Suite *s2 = suite_create("Proxy"); - - create_case(s, "proxy_new", proxy_new); - create_case(s, "proxy_spawn", proxy_spawn); - create_case(s, "proxy_init", proxy_init); - create_case(s, "proxy_discover", proxy_discover); - create_case(s, "proxy_connect", proxy_connect); - - return s; -} - -int main(void) -{ - int nf; +OSYNC_TESTCASE_START("proxy") +OSYNC_TESTCASE_ADD(proxy_new) +OSYNC_TESTCASE_ADD(proxy_spawn) +OSYNC_TESTCASE_ADD(proxy_init) +OSYNC_TESTCASE_ADD(proxy_discover) +OSYNC_TESTCASE_ADD(proxy_connect) +OSYNC_TESTCASE_END - Suite *s = proxy_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_objformat.c ============================================================================== --- trunk/tests/format-tests/check_objformat.c Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/format-tests/check_objformat.c Sun Jan 11 22:42:15 2009 (r5119) @@ -343,38 +343,18 @@ } END_TEST -Suite *objformat_suite(void) -{ - Suite *s = suite_create("Objformat"); -// Suite *s2 = suite_create("Objformat"); - - create_case(s, "objformat_new", objformat_new); - create_case(s, "objformat_get", objformat_get); - create_case(s, "objformat_equal", objformat_equal); - create_case(s, "objformat_compare", objformat_compare); - create_case(s, "objformat_destroy", objformat_destroy); - create_case(s, "objformat_copy", objformat_copy); - create_case(s, "objformat_duplicate", objformat_duplicate); - create_case(s, "objformat_create", objformat_create); - create_case(s, "objformat_print", objformat_print); - create_case(s, "objformat_revision", objformat_revision); - create_case(s, "objformat_marshal", objformat_marshal); - create_case(s, "objformat_demarshal", objformat_demarshal); - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = objformat_suite(); - - SRunner *sr; - sr = srunner_create(s); +OSYNC_TESTCASE_START("objformat") +OSYNC_TESTCASE_ADD(objformat_new) +OSYNC_TESTCASE_ADD(objformat_get) +OSYNC_TESTCASE_ADD(objformat_equal) +OSYNC_TESTCASE_ADD(objformat_compare) +OSYNC_TESTCASE_ADD(objformat_destroy) +OSYNC_TESTCASE_ADD(objformat_copy) +OSYNC_TESTCASE_ADD(objformat_duplicate) +OSYNC_TESTCASE_ADD(objformat_create) +OSYNC_TESTCASE_ADD(objformat_print) +OSYNC_TESTCASE_ADD(objformat_revision) +OSYNC_TESTCASE_ADD(objformat_marshal) +OSYNC_TESTCASE_ADD(objformat_demarshal) +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_time.c ============================================================================== --- trunk/tests/format-tests/check_time.c Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/format-tests/check_time.c Sun Jan 11 22:42:15 2009 (r5119) @@ -7,6 +7,8 @@ #include <string.h> #include <stdio.h> +#include "support.h" + // this test assumes Eastern time, sorry. START_TEST (time_timezone_diff) { @@ -194,38 +196,9 @@ } END_TEST -Suite *env_suite(void) -{ - Suite *s = suite_create("Time"); - - TCase *tc_timezones = tcase_create("timezones"); - TCase *tc_relative = tcase_create("relative"); - TCase *tc_unix = tcase_create("unix_converters"); - - suite_add_tcase (s, tc_timezones); - tcase_add_test(tc_timezones, time_timezone_diff); - - suite_add_tcase (s, tc_relative); - tcase_add_test(tc_relative, time_relative2tm); - - suite_add_tcase (s, tc_unix); - tcase_add_test(tc_unix, time_unix_converters); - - 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; -} +OSYNC_TESTCASE_START("time") +OSYNC_TESTCASE_ADD(time_timezone_diff) +OSYNC_TESTCASE_ADD(time_relative2tm) +OSYNC_TESTCASE_ADD(time_unix_converters) +OSYNC_TESTCASE_END Modified: trunk/tests/group-tests/check_updater.c ============================================================================== --- trunk/tests/group-tests/check_updater.c Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/group-tests/check_updater.c Sun Jan 11 22:42:15 2009 (r5119) @@ -247,34 +247,13 @@ } END_TEST -Suite *group_suite(void) -{ - Suite *s = suite_create("Updater"); - //Suite *s2 = suite_create("Updater"); +OSYNC_TESTCASE_START("updater") +OSYNC_TESTCASE_ADD(updater_init) +OSYNC_TESTCASE_ADD(updater_without_loaded_group) +OSYNC_TESTCASE_ADD(updater_action_required) +OSYNC_TESTCASE_ADD(updater_updates_directory) +OSYNC_TESTCASE_ADD(updater_invalid_stylesheet) +OSYNC_TESTCASE_ADD(updater_valid_stylesheet) +OSYNC_TESTCASE_ADD(updater_group_three_steps) +OSYNC_TESTCASE_END - create_case(s, "updater_init", updater_init); - create_case(s, "updater_without_loaded_group", updater_without_loaded_group); - create_case(s, "updater_action_required", updater_action_required); - create_case(s, "updater_updates_directory", updater_updates_directory); - create_case(s, "updater_invalid_stylesheet", updater_invalid_stylesheet); - - create_case(s, "updater_valid_stylesheet", updater_valid_stylesheet); - create_case(s, "updater_group_three_steps", updater_group_three_steps); - - 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/ipc-tests/check_serializer.c ============================================================================== --- trunk/tests/ipc-tests/check_serializer.c Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/ipc-tests/check_serializer.c Sun Jan 11 22:42:15 2009 (r5119) @@ -383,28 +383,8 @@ } END_TEST +OSYNC_TESTCASE_START("serializer") +OSYNC_TESTCASE_ADD(serializer_pluginconfig) +OSYNC_TESTCASE_ADD(serializer_pluginconfig_full) +OSYNC_TESTCASE_END -Suite *ipc_suite(void) -{ - Suite *s = suite_create("Serializer"); -// Suite *s2 = suite_create("Serializer"); - - create_case(s, "serializer_pluginconfig", serializer_pluginconfig); - create_case(s, "serializer_pluginconfig_full", serializer_pluginconfig_full); - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = ipc_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/plugin-tests/check_plugin_config.c ============================================================================== --- trunk/tests/plugin-tests/check_plugin_config.c Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/plugin-tests/check_plugin_config.c Sun Jan 11 22:42:15 2009 (r5119) @@ -1196,43 +1196,24 @@ } END_TEST -Suite *client_suite(void) -{ - Suite *s = suite_create("PluginConfig"); -// Suite *s2 = suite_create("PluginConfig"); - - create_case(s, "plugin_config_new", plugin_config_new); - create_case(s, "plugin_config_new_nomemory", plugin_config_new_nomemory); - create_case(s, "plugin_config_supported", plugin_config_supported); - create_case(s, "plugin_config_subcomponents", plugin_config_subcomponents); - create_case(s, "plugin_config_subcomponents_nomemory", plugin_config_subcomponents_nomemory); - create_case(s, "plugin_config_advancedoption", plugin_config_advancedoption); - create_case(s, "plugin_config_advancedoption_set_get", plugin_config_advancedoption_set_get); - create_case(s, "plugin_config_advancedoption_param", plugin_config_advancedoption_param); - create_case(s, "plugin_config_authentication", plugin_config_authentication); - create_case(s, "plugin_config_connection", plugin_config_connection); - create_case(s, "plugin_config_localization", plugin_config_localization); - create_case(s, "plugin_config_resources", plugin_config_resources); - create_case(s, "plugin_config_save_and_load", plugin_config_save_and_load); - create_case(s, "plugin_config_save_and_load_connection_bluetooth", plugin_config_save_and_load_connection_bluetooth); - create_case(s, "plugin_config_save_and_load_connection_usb", plugin_config_save_and_load_connection_usb); - create_case(s, "plugin_config_save_and_load_connection_irda", plugin_config_save_and_load_connection_irda); - create_case(s, "plugin_config_save_and_load_connection_network", plugin_config_save_and_load_connection_network); - create_case(s, "plugin_config_save_and_load_connection_serial", plugin_config_save_and_load_connection_serial); - - return s; -} - -int main(void) -{ - int nf; +OSYNC_TESTCASE_START("plugin_config") +OSYNC_TESTCASE_ADD(plugin_config_new) +OSYNC_TESTCASE_ADD(plugin_config_new_nomemory) +OSYNC_TESTCASE_ADD(plugin_config_supported) +OSYNC_TESTCASE_ADD(plugin_config_subcomponents) +OSYNC_TESTCASE_ADD(plugin_config_subcomponents_nomemory) +OSYNC_TESTCASE_ADD(plugin_config_advancedoption) +OSYNC_TESTCASE_ADD(plugin_config_advancedoption_set_get) +OSYNC_TESTCASE_ADD(plugin_config_advancedoption_param) +OSYNC_TESTCASE_ADD(plugin_config_authentication) +OSYNC_TESTCASE_ADD(plugin_config_connection) +OSYNC_TESTCASE_ADD(plugin_config_localization) +OSYNC_TESTCASE_ADD(plugin_config_resources) +OSYNC_TESTCASE_ADD(plugin_config_save_and_load) +OSYNC_TESTCASE_ADD(plugin_config_save_and_load_connection_bluetooth) +OSYNC_TESTCASE_ADD(plugin_config_save_and_load_connection_usb) +OSYNC_TESTCASE_ADD(plugin_config_save_and_load_connection_irda) +OSYNC_TESTCASE_ADD(plugin_config_save_and_load_connection_network) +OSYNC_TESTCASE_ADD(plugin_config_save_and_load_connection_serial) +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/sync-tests/check_sync_error.c ============================================================================== --- trunk/tests/sync-tests/check_sync_error.c Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/sync-tests/check_sync_error.c Sun Jan 11 22:42:15 2009 (r5119) @@ -4,7 +4,7 @@ #include "opensync/engine/opensync_engine_internals.h" /* Regression test for Ticket #988 */ -START_TEST (single_init_error_noerror) +START_TEST (sync_error_single_init_error_noerror) { char *testbed = setup_testbed("sync"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -43,7 +43,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (single_init_error) +OSYNC_UNUSED START_TEST (sync_error_single_init_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -79,7 +79,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (dual_connect_error) +OSYNC_UNUSED START_TEST (sync_error_dual_connect_error) { char *testbed = setup_testbed("sync_easy_new"); @@ -119,7 +119,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (one_of_two_connect_error) +OSYNC_UNUSED START_TEST (sync_error_one_of_two_connect_error) { char *testbed = setup_testbed("sync_easy_new"); @@ -160,7 +160,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (two_of_three_connect_error) +OSYNC_UNUSED START_TEST (sync_error_two_of_three_connect_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -201,7 +201,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (two_of_three_connect_error2) +OSYNC_UNUSED START_TEST (sync_error_two_of_three_connect_error2) { char *testbed = setup_testbed("multisync_easy_new"); @@ -242,7 +242,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (three_of_three_connect_error) +OSYNC_UNUSED START_TEST (sync_error_three_of_three_connect_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -283,7 +283,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (one_of_three_connect_error) +OSYNC_UNUSED START_TEST (sync_error_one_of_three_connect_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -324,7 +324,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (no_connect_error) +OSYNC_UNUSED START_TEST (sync_error_no_connect_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -366,7 +366,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (single_connect_timeout) +OSYNC_UNUSED START_TEST (sync_error_single_connect_timeout) { char *testbed = setup_testbed("sync_easy_new"); @@ -408,7 +408,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (dual_connect_timeout) +OSYNC_UNUSED START_TEST (sync_error_dual_connect_timeout) { char *testbed = setup_testbed("sync_easy_new"); @@ -450,7 +450,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (one_of_three_timeout) +OSYNC_UNUSED START_TEST (sync_error_one_of_three_timeout) { char *testbed = setup_testbed("multisync_easy_new"); @@ -492,7 +492,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (timeout_and_error) +OSYNC_UNUSED START_TEST (sync_error_timeout_and_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -535,7 +535,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (single_get_changes_error) +OSYNC_UNUSED START_TEST (sync_error_single_get_changes_error) { char *testbed = setup_testbed("sync_easy_conflict"); @@ -580,7 +580,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (dual_get_changes_error) +OSYNC_UNUSED START_TEST (sync_error_dual_get_changes_error) { char *testbed = setup_testbed("sync_easy_conflict"); @@ -625,7 +625,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (two_of_three_get_changes_error) +OSYNC_UNUSED START_TEST (sync_error_two_of_three_get_changes_error) { char *testbed = setup_testbed("multisync_conflict_data_choose2"); @@ -669,7 +669,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (one_of_three_get_changes_error) +OSYNC_UNUSED START_TEST (sync_error_one_of_three_get_changes_error) { char *testbed = setup_testbed("multisync_conflict_data_choose2"); @@ -714,7 +714,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (one_of_three_get_changes_timeout) +OSYNC_UNUSED START_TEST (sync_error_one_of_three_get_changes_timeout) { char *testbed = setup_testbed("multisync_conflict_data_choose2"); @@ -761,7 +761,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (get_changes_timeout_and_error) +OSYNC_UNUSED START_TEST (sync_error_get_changes_timeout_and_error) { char *testbed = setup_testbed("multisync_conflict_data_choose2"); @@ -807,7 +807,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (get_changes_timeout_sleep) +OSYNC_UNUSED START_TEST (sync_error_get_changes_timeout_sleep) { char *testbed = setup_testbed("multisync_conflict_data_choose2"); @@ -856,7 +856,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (single_commit_error) +OSYNC_UNUSED START_TEST (sync_error_single_commit_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -908,7 +908,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (dual_commit_error) +OSYNC_UNUSED START_TEST (sync_error_dual_commit_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -960,7 +960,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (single_commit_timeout) +OSYNC_UNUSED START_TEST (sync_error_single_commit_timeout) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1012,7 +1012,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (dual_commit_timeout) +OSYNC_UNUSED START_TEST (sync_error_dual_commit_timeout) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1064,7 +1064,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (commit_timeout_and_error) +OSYNC_UNUSED START_TEST (sync_error_commit_timeout_and_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1117,7 +1117,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (commit_timeout_and_error2) +OSYNC_UNUSED START_TEST (sync_error_commit_timeout_and_error2) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1170,7 +1170,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (commit_error_modify) +OSYNC_UNUSED START_TEST (sync_error_commit_error_modify) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1231,7 +1231,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (commit_error_delete) +OSYNC_UNUSED START_TEST (sync_error_commit_error_delete) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1292,7 +1292,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (committed_all_error) +OSYNC_UNUSED START_TEST (sync_error_committed_all_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1344,7 +1344,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (committed_all_batch_error) +OSYNC_UNUSED START_TEST (sync_error_committed_all_batch_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1397,7 +1397,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (single_sync_done_error) +OSYNC_UNUSED START_TEST (sync_error_single_sync_done_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1450,7 +1450,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (dual_sync_done_error) +OSYNC_UNUSED START_TEST (sync_error_dual_sync_done_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1503,7 +1503,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (triple_sync_done_error) +OSYNC_UNUSED START_TEST (sync_error_triple_sync_done_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1556,7 +1556,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (single_sync_done_timeout) +OSYNC_UNUSED START_TEST (sync_error_single_sync_done_timeout) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1609,7 +1609,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (dual_sync_done_timeout) +OSYNC_UNUSED START_TEST (sync_error_dual_sync_done_timeout) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1662,7 +1662,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (sync_done_timeout_and_error) +OSYNC_UNUSED START_TEST (sync_error_sync_done_timeout_and_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1716,7 +1716,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (single_disconnect_error) +OSYNC_UNUSED START_TEST (sync_error_single_disconnect_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1769,7 +1769,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (dual_disconnect_error) +OSYNC_UNUSED START_TEST (sync_error_dual_disconnect_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1822,7 +1822,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (triple_disconnect_error) +OSYNC_UNUSED START_TEST (sync_error_triple_disconnect_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1875,7 +1875,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (single_disconnect_timeout) +OSYNC_UNUSED START_TEST (sync_error_single_disconnect_timeout) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1928,7 +1928,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (dual_disconnect_timeout) +OSYNC_UNUSED START_TEST (sync_error_dual_disconnect_timeout) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1981,7 +1981,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (disconnect_timeout_and_error) +OSYNC_UNUSED START_TEST (sync_error_disconnect_timeout_and_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -2035,7 +2035,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (get_changes_disconnect_error) +OSYNC_UNUSED START_TEST (sync_error_get_changes_disconnect_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -2091,73 +2091,54 @@ } END_TEST +OSYNC_TESTCASE_START("sync_error") +OSYNC_TESTCASE_ADD(sync_error_single_init_error_noerror) + +#if 0 +/* Disabled as not ported see http://opensync.org/ticket/980 */ +OSYNC_TESTCASE_ADD(sync_error_single_init_error) +OSYNC_TESTCASE_ADD(sync_error_dual_connect_error) +OSYNC_TESTCASE_ADD(sync_error_one_of_two_connect_error) +OSYNC_TESTCASE_ADD(sync_error_two_of_three_connect_error) +OSYNC_TESTCASE_ADD(sync_error_two_of_three_connect_error2) +OSYNC_TESTCASE_ADD(sync_error_three_of_three_connect_error) +OSYNC_TESTCASE_ADD(sync_error_one_of_three_connect_error) +OSYNC_TESTCASE_ADD(sync_error_no_connect_error) +OSYNC_TESTCASE_ADD(sync_error_single_connect_timeout) +OSYNC_TESTCASE_ADD(sync_error_dual_connect_timeout) +OSYNC_TESTCASE_ADD(sync_error_one_of_three_timeout) +OSYNC_TESTCASE_ADD(sync_error_timeout_and_error) +OSYNC_TESTCASE_ADD(sync_error_single_get_changes_error) +OSYNC_TESTCASE_ADD(sync_error_dual_get_changes_error) +OSYNC_TESTCASE_ADD(sync_error_two_of_three_get_changes_error) +OSYNC_TESTCASE_ADD(sync_error_one_of_three_get_changes_error) +OSYNC_TESTCASE_ADD(sync_error_one_of_three_get_changes_timeout) +OSYNC_TESTCASE_ADD(sync_error_get_changes_timeout_and_error) +OSYNC_TESTCASE_ADD(sync_error_get_changes_timeout_sleep) +OSYNC_TESTCASE_ADD(sync_error_single_commit_error) +OSYNC_TESTCASE_ADD(sync_error_dual_commit_error) +OSYNC_TESTCASE_ADD(sync_error_single_commit_timeout) +OSYNC_TESTCASE_ADD(sync_error_dual_commit_timeout) +OSYNC_TESTCASE_ADD(sync_error_commit_timeout_and_error) +OSYNC_TESTCASE_ADD(sync_error_commit_timeout_and_error2) +OSYNC_TESTCASE_ADD(sync_error_commit_error_modify) +OSYNC_TESTCASE_ADD(sync_error_commit_error_delete) +OSYNC_TESTCASE_ADD(sync_error_committed_all_error) +OSYNC_TESTCASE_ADD(sync_error_committed_all_batch_error) +OSYNC_TESTCASE_ADD(sync_error_single_sync_done_error) +OSYNC_TESTCASE_ADD(sync_error_dual_sync_done_error) +OSYNC_TESTCASE_ADD(sync_error_triple_sync_done_error) +OSYNC_TESTCASE_ADD(sync_error_single_sync_done_timeout) +OSYNC_TESTCASE_ADD(sync_error_dual_sync_done_timeout) +OSYNC_TESTCASE_ADD(sync_error_sync_done_timeout_and_error) +OSYNC_TESTCASE_ADD(sync_error_single_disconnect_error) +OSYNC_TESTCASE_ADD(sync_error_dual_disconnect_error) +OSYNC_TESTCASE_ADD(sync_error_triple_disconnect_error) +OSYNC_TESTCASE_ADD(sync_error_single_disconnect_timeout) +OSYNC_TESTCASE_ADD(sync_error_dual_disconnect_timeout) +OSYNC_TESTCASE_ADD(sync_error_disconnect_timeout_and_error) +OSYNC_TESTCASE_ADD(sync_error_get_changes_disconnect_error) +#endif + +OSYNC_TESTCASE_END -Suite *multisync_suite(void) -{ - Suite *s = suite_create("Error Codes"); - //Suite *s2 = suite_create("Error Codes"); - create_case(s, "single_init_error_noerror", single_init_error_noerror); - - /* Disabled as not ported see http://opensync.org/ticket/980 - - create_case(s, "single_init_error", single_init_error); - create_case(s, "dual_connect_error", dual_connect_error); - create_case(s, "one_of_two_connect_error", one_of_two_connect_error); - create_case(s, "two_of_three_connect_error", two_of_three_connect_error); - create_case(s, "two_of_three_connect_error2", two_of_three_connect_error2); - create_case(s, "three_of_three_connect_error", three_of_three_connect_error); - create_case(s, "one_of_three_connect_error", one_of_three_connect_error); - create_case(s, "no_connect_error", no_connect_error); - create_case(s, "single_connect_timeout", single_connect_timeout); - create_case(s, "dual_connect_timeout", dual_connect_timeout); - create_case(s, "one_of_three_timeout", one_of_three_timeout); - create_case(s, "timeout_and_error", timeout_and_error); - create_case(s, "single_get_changes_error", single_get_changes_error); - create_case(s, "dual_get_changes_error", dual_get_changes_error); - create_case(s, "two_of_three_get_changes_error", two_of_three_get_changes_error); - create_case(s, "one_of_three_get_changes_error", one_of_three_get_changes_error); - create_case(s, "one_of_three_get_changes_timeout", one_of_three_get_changes_timeout); - create_case(s, "get_changes_timeout_and_error", get_changes_timeout_and_error); - create_case(s, "get_changes_timeout_sleep", get_changes_timeout_sleep); - create_case(s, "single_commit_error", single_commit_error); - create_case(s, "dual_commit_error", dual_commit_error); - create_case(s, "single_commit_timeout", single_commit_timeout); - create_case(s, "dual_commit_timeout", dual_commit_timeout); - create_case(s, "commit_timeout_and_error", commit_timeout_and_error); - create_case(s, "commit_timeout_and_error2", commit_timeout_and_error2); - create_case(s, "commit_error_modify", commit_error_modify); - create_case(s, "commit_error_delete", commit_error_delete); - create_case(s, "committed_all_error", committed_all_error); - create_case(s, "committed_all_batch_error", committed_all_batch_error); - create_case(s, "single_sync_done_error", single_sync_done_error); - create_case(s, "dual_sync_done_error", dual_sync_done_error); - create_case(s, "triple_sync_done_error", triple_sync_done_error); - create_case(s, "single_sync_done_timeout", single_sync_done_timeout); - create_case(s, "dual_sync_done_timeout", dual_sync_done_timeout); - create_case(s, "sync_done_timeout_and_error", sync_done_timeout_and_error); - create_case(s, "single_disconnect_error", single_disconnect_error); - create_case(s, "dual_disconnect_error", dual_disconnect_error); - create_case(s, "triple_disconnect_error", triple_disconnect_error); - create_case(s, "single_disconnect_timeout", single_disconnect_timeout); - create_case(s, "dual_disconnect_timeout", dual_disconnect_timeout); - create_case(s, "disconnect_timeout_and_error", disconnect_timeout_and_error); - create_case(s, "get_changes_disconnect_error", get_changes_disconnect_error); - */ - return s; -} - -int main(void) -{ - int nf; - - check_env(); - - 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; -} Modified: trunk/tests/version-tests/check_version.c ============================================================================== --- trunk/tests/version-tests/check_version.c Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/version-tests/check_version.c Sun Jan 11 22:42:15 2009 (r5119) @@ -79,25 +79,9 @@ } END_TEST -Suite *version_suite(void) -{ - Suite *s = suite_create("Version"); - create_case(s, "version_new", version_new); - create_case(s, "version_matches", version_matches); - create_case(s, "version_load_from_descriptions", version_load_from_descriptions); - return s; -} - -int main(void) -{ - int nf; +OSYNC_TESTCASE_START("version") +OSYNC_TESTCASE_ADD(version_new) +OSYNC_TESTCASE_ADD(version_matches) +OSYNC_TESTCASE_ADD(version_load_from_descriptions) +OSYNC_TESTCASE_END - Suite *s = version_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; -} |
