Menu
▾
▴
[Opensync-commits] r1170 - in trunk: libsyncml tests
|
From: <svn...@op...> - 2009-07-13 11:44:04
|
Author: bellmich Date: Mon Jul 13 13:43:57 2009 New Revision: 1170 URL: http://libsyncml.opensync.org/changeset/1170 Log: migrated check_error from SmlError to GError Modified: trunk/libsyncml/sml_error.c trunk/libsyncml/sml_error_internals.h trunk/tests/CMakeLists.txt trunk/tests/check_error.c Modified: trunk/libsyncml/sml_error.c ============================================================================== --- trunk/libsyncml/sml_error.c Mon Jul 13 13:18:52 2009 (r1169) +++ trunk/libsyncml/sml_error.c Mon Jul 13 13:43:57 2009 (r1170) @@ -398,7 +398,7 @@ */ SmlErrorClass smlErrorGetClass(GError **error) { - if (!smlErrorIsSet(error)) + if (!error || *error == NULL) return SML_ERRORCLASS_SUCCESS; if ((*error)->code == SML_NO_ERROR) Modified: trunk/libsyncml/sml_error_internals.h ============================================================================== --- trunk/libsyncml/sml_error_internals.h Mon Jul 13 13:18:52 2009 (r1169) +++ trunk/libsyncml/sml_error_internals.h Mon Jul 13 13:43:57 2009 (r1170) @@ -29,6 +29,17 @@ smlAssertMsg(*error == NULL, "The error parameter is already filled (ignored error)."); #define SML_ERROR g_quark_from_static_string("Sml") +#define SML_SET_ERROR(error,type,...) \ + {\ + gchar *__sml_error_string = g_strdup_printf(__VA_ARGS__); \ + if (__sml_error_string && strlen(__sml_error_string)) \ + g_set_error(error, SML_ERROR, type, "%s %s", smlErrorTypeGetMessage(type), __sml_error_string); \ + else \ + g_set_error(error, SML_ERROR, type, "Error %d: %s", type, smlErrorTypeGetMessage(type)); \ + g_free(__sml_error_string);\ + } + +#define SML_ERROR_FREE(error) g_error_free(error); error = NULL; #define sml_return_val_error_if_fail(d_expr,d_value,d_error,d_error_code, d_error_msg) \ g_set_error(d_error, SML_ERROR, d_error_code, d_error_msg); \ Modified: trunk/tests/CMakeLists.txt ============================================================================== --- trunk/tests/CMakeLists.txt Mon Jul 13 13:18:52 2009 (r1169) +++ trunk/tests/CMakeLists.txt Mon Jul 13 13:43:57 2009 (r1170) @@ -62,16 +62,7 @@ SML_ADD_TESTCASE( error_free_null ) SML_ADD_TESTCASE( error_free_null2 ) SML_ADD_TESTCASE( error_free ) - SML_ADD_TESTCASE( error_check_null ) - SML_ADD_TESTCASE( error_check_null2 ) - SML_ADD_TESTCASE( error_check ) - SML_ADD_TESTCASE( error_check2 ) - SML_ADD_TESTCASE( error_update_null ) - SML_ADD_TESTCASE( error_update_null2 ) - SML_ADD_TESTCASE( error_update ) - SML_ADD_TESTCASE( error_update2 ) SML_ADD_TESTCASE( error_set_null ) - SML_ADD_TESTCASE( error_set_null2 ) SML_ADD_TESTCASE( error_duplicate_null ) SML_ADD_TESTCASE( error_class ) SML_END_TEST() Modified: trunk/tests/check_error.c ============================================================================== --- trunk/tests/check_error.c Mon Jul 13 13:18:52 2009 (r1169) +++ trunk/tests/check_error.c Mon Jul 13 13:43:57 2009 (r1170) @@ -27,14 +27,13 @@ { setup_testbed(NULL); - SmlError *error = NULL; - smlErrorSet(&error, SML_ERROR_GENERIC, "test%i", 1); + GError *error = NULL; + SML_SET_ERROR(&error, SML_ERROR_GENERIC, "test%i", 1); sml_fail_unless(error != NULL, NULL); - sml_fail_unless(error->type == SML_ERROR_GENERIC, NULL); + sml_fail_unless(error->code == SML_ERROR_GENERIC, NULL); sml_fail_unless(!strcmp(error->message, "test1"), NULL); - sml_fail_unless(smlErrorIsSet(&error), NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(error == NULL, NULL); } END_TEST @@ -43,15 +42,16 @@ { setup_testbed(NULL); - smlErrorSet(NULL, SML_ERROR_GENERIC, "test%i", 1); + SML_SET_ERROR(NULL, SML_ERROR_GENERIC, "test%i", 1); } END_TEST START_TEST (error_free_null) { setup_testbed(NULL); - - smlErrorDeref(NULL); + + GError *error = NULL; + SML_ERROR_FREE(error); } END_TEST @@ -59,8 +59,8 @@ { setup_testbed(NULL); - SmlError *error = NULL; - smlErrorDeref(&error); + GError *error = NULL; + SML_ERROR_FREE(error); } END_TEST @@ -68,120 +68,29 @@ { setup_testbed(NULL); - SmlError *error = NULL; - smlErrorSet(&error, SML_ERROR_GENERIC, "test"); + GError *error = NULL; + SML_SET_ERROR(&error, SML_ERROR_GENERIC, "test"); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(error == NULL, NULL); } END_TEST -START_TEST (error_check_null) -{ - setup_testbed(NULL); - - sml_fail_unless(smlErrorIsSet(NULL) == FALSE, NULL); -} -END_TEST - -START_TEST (error_check_null2) -{ - setup_testbed(NULL); - - SmlError *error = NULL; - sml_fail_unless(smlErrorIsSet(&error) == FALSE, NULL); -} -END_TEST - -START_TEST (error_check) -{ - setup_testbed(NULL); - - SmlError *error = NULL; - smlErrorSet(&error, SML_ERROR_GENERIC, "test"); - sml_fail_unless(smlErrorIsSet(&error) == TRUE, NULL); - smlErrorDeref(&error); -} -END_TEST - -START_TEST (error_check2) -{ - setup_testbed(NULL); - - SmlError *error = NULL; - smlErrorSet(&error, SML_NO_ERROR, NULL); - sml_fail_unless(smlErrorIsSet(&error) == FALSE, NULL); -} -END_TEST - -START_TEST (error_update_null) -{ - setup_testbed(NULL); - - smlErrorUpdate(NULL, NULL); -} -END_TEST - -START_TEST (error_update_null2) -{ - setup_testbed(NULL); - - SmlError *error = NULL; - smlErrorUpdate(&error, NULL); -} -END_TEST - -START_TEST (error_update) -{ - setup_testbed(NULL); - - SmlError *error = NULL; - smlErrorSet(&error, SML_ERROR_GENERIC, "test"); - smlErrorUpdate(&error, "test2%i", 1); - sml_fail_unless(!strcmp(error->message, "test21"), NULL); - smlErrorDeref(&error); -} -END_TEST - -START_TEST (error_update2) -{ - setup_testbed(NULL); - - SmlError *error = NULL; - smlErrorSet(&error, SML_ERROR_GENERIC, "test"); - smlErrorUpdate(&error, "test2%s", error->message); - sml_fail_unless(!strcmp(error->message, "test2test"), "%s != test2test", error->message); - smlErrorDeref(&error); -} -END_TEST - START_TEST (error_set_null) { setup_testbed(NULL); - smlErrorSet(NULL, SML_NO_ERROR, NULL); + SML_SET_ERROR(NULL, SML_NO_ERROR, NULL); } END_TEST -START_TEST (error_set_null2) -{ - - setup_testbed(NULL); - - SmlError *error = NULL; - smlErrorUpdate(&error, NULL); -} -END_TEST - START_TEST (error_duplicate_null) { setup_testbed(NULL); - SmlError *error = NULL; - smlErrorSet(&error, SML_ERROR_GENERIC, "asd"); - smlErrorDuplicate(NULL, &error); - smlErrorDeref(&error); + GError *duplicate = g_error_copy(NULL); + sml_fail_unless(duplicate == NULL, NULL); } END_TEST @@ -191,20 +100,20 @@ sml_fail_unless(smlErrorGetClass(NULL) == SML_ERRORCLASS_SUCCESS, NULL); - SmlError *error = NULL; + GError *error = NULL; sml_fail_unless(smlErrorGetClass(&error) == SML_ERRORCLASS_SUCCESS, NULL); - smlErrorSet(&error, SML_NO_ERROR, "test%i", 1); + SML_SET_ERROR(&error, SML_NO_ERROR, "test%i", 1); sml_fail_unless(smlErrorGetClass(&error) == SML_ERRORCLASS_SUCCESS, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); - smlErrorSet(&error, SML_ERROR_SEE_OTHER_RETRY, "test%i", 1); + SML_SET_ERROR(&error, SML_ERROR_SEE_OTHER_RETRY, "test%i", 1); sml_fail_unless(smlErrorGetClass(&error) == SML_ERRORCLASS_RETRY, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); - smlErrorSet(&error, SML_ERROR_GENERIC, "test%i", 1); + SML_SET_ERROR(&error, SML_ERROR_GENERIC, "test%i", 1); sml_fail_unless(smlErrorGetClass(&error) == SML_ERRORCLASS_FATAL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(error == NULL, NULL); } |
