Menu
▾
▴
[Opensync-commits] r1108 - trunk/tests
|
From: <svn...@op...> - 2009-06-22 14:48:53
|
Author: bellmich Date: Mon Jun 22 14:41:54 2009 New Revision: 1108 URL: http://libsyncml.opensync.org/changeset/1108 Log: - properties can have empty names (e.g. content type text/plain and a maximum size is set) - fixed several error reportings (If an error is expected but does not happen then it is useless to print a not present error.) - added some test cases for properties Modified: trunk/tests/check_dev_inf_prop_param.c trunk/tests/check_dev_inf_property.c Modified: trunk/tests/check_dev_inf_prop_param.c ============================================================================== --- trunk/tests/check_dev_inf_prop_param.c Mon Jun 22 14:35:26 2009 (r1107) +++ trunk/tests/check_dev_inf_prop_param.c Mon Jun 22 14:41:54 2009 (r1108) @@ -36,9 +36,24 @@ SmlDevInfPropParam *propParam = sml_dev_inf_prop_param_new(); sml_fail_unless(propParam != NULL, NULL); - sml_fail_unless(sml_dev_inf_prop_param_set_param_name(propParam, NULL, &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_set_param_name(propParam, "", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_set_param_name(propParam, NULL, &error), "%s", error?error->message:"No GError set."); + /* enforce parameter name */ + + sml_fail_unless(sml_dev_inf_prop_param_set_param_name(propParam, NULL, &error) == FALSE, "A parameter must have a name."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; + + sml_fail_unless(sml_dev_inf_prop_param_set_param_name(propParam, "", &error) == FALSE, "A parameter must have a name."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; + + sml_fail_unless(sml_dev_inf_prop_param_set_param_name(propParam, NULL, &error) == FALSE, "A parameter must have a name."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; + + /* test the normal properties */ sml_fail_unless(sml_dev_inf_prop_param_set_data_type(propParam, NULL, &error), "%s", error?error->message:"No GError set."); sml_fail_unless(sml_dev_inf_prop_param_set_data_type(propParam, "", &error), "%s", error?error->message:"No GError set."); @@ -48,9 +63,22 @@ sml_fail_unless(sml_dev_inf_prop_param_set_display_name(propParam, "", &error), "%s", error?error->message:"No GError set."); sml_fail_unless(sml_dev_inf_prop_param_set_display_name(propParam, NULL, &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, NULL, &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, "", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, NULL, &error), "%s", error?error->message:"No GError set."); + /* ValEnums does not accept empty values */ + + sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, NULL, &error) == FALSE, "ValEnums must be not empty."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; + + sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, "", &error) == FALSE, "ValEnums must be not empty."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; + + sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, NULL, &error) == FALSE, "ValEnums must be not empty."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; g_object_unref(propParam); } @@ -62,25 +90,66 @@ SmlDevInfPropParam *propParam = sml_dev_inf_prop_param_new(); sml_fail_unless(propParam != NULL, NULL); + /* enforce parameter name */ + sml_fail_unless(sml_dev_inf_prop_param_get_param_name(propParam) == NULL, NULL); - sml_fail_unless(sml_dev_inf_prop_param_set_param_name(propParam, NULL, &error), "%s", error?error->message:"No GError set."); + + sml_fail_unless(sml_dev_inf_prop_param_set_param_name(propParam, NULL, &error) == FALSE, "The parameter name must be set."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; + sml_fail_unless(sml_dev_inf_prop_param_get_param_name(propParam) == NULL, NULL); + sml_fail_unless(sml_dev_inf_prop_param_set_param_name(propParam, "", &error) == FALSE, "The parameter name must be set."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; + + sml_fail_unless(sml_dev_inf_prop_param_get_param_name(propParam) == NULL, NULL); + + /* test the normal properties */ + sml_fail_unless(sml_dev_inf_prop_param_get_data_type(propParam) == NULL, NULL); sml_fail_unless(sml_dev_inf_prop_param_set_data_type(propParam, NULL, &error), "%s", error?error->message:"No GError set."); sml_fail_unless(sml_dev_inf_prop_param_get_data_type(propParam) == NULL, NULL); + sml_fail_unless(sml_dev_inf_prop_param_set_data_type(propParam, "", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_get_data_type(propParam) == NULL, NULL); sml_fail_unless(sml_dev_inf_prop_param_get_display_name(propParam) == NULL, NULL); sml_fail_unless(sml_dev_inf_prop_param_set_display_name(propParam, NULL, &error), "%s", error?error->message:"No GError set."); sml_fail_unless(sml_dev_inf_prop_param_get_display_name(propParam) == NULL, NULL); + sml_fail_unless(sml_dev_inf_prop_param_set_display_name(propParam, "", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_get_display_name(propParam) == NULL, NULL); + + /* ValEnums does not accept empty values */ sml_fail_unless(sml_dev_inf_prop_param_num_val_enums(propParam) == 0, NULL); - sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, NULL, &error), "%s", error?error->message:"No GError set."); + + sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, NULL, &error) == FALSE, "The parameter name must be set."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; + + sml_fail_unless(sml_dev_inf_prop_param_num_val_enums(propParam) == 0, NULL); + + sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, "", &error) == FALSE, "The parameter name must be set."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; + + sml_fail_unless(sml_dev_inf_prop_param_num_val_enums(propParam) == 0, NULL); + + sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, "value", &error), "%s", error?error->message:"No GError set."); + + sml_fail_unless(sml_dev_inf_prop_param_num_val_enums(propParam) == 1, NULL); + + sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, NULL, &error) == FALSE, "The parameter name must be set."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; + sml_fail_unless(sml_dev_inf_prop_param_num_val_enums(propParam) == 1, NULL); - sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, "", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_num_val_enums(propParam) == 2, NULL); - sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, NULL, &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_num_val_enums(propParam) == 3, NULL); g_object_unref(propParam); } Modified: trunk/tests/check_dev_inf_property.c ============================================================================== --- trunk/tests/check_dev_inf_property.c Mon Jun 22 14:35:26 2009 (r1107) +++ trunk/tests/check_dev_inf_property.c Mon Jun 22 14:41:54 2009 (r1108) @@ -36,9 +36,22 @@ SmlDevInfProperty *prop = sml_dev_inf_property_new(); sml_fail_unless(prop != NULL, NULL); - sml_fail_unless(sml_dev_inf_property_set_prop_name(prop, NULL, &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_property_set_prop_name(prop, "", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_property_set_prop_name(prop, NULL, &error), "%s", error?error->message:"No GError set."); + /* enforce parameter name */ + + sml_fail_unless(sml_dev_inf_property_set_prop_name(prop, NULL, &error) == FALSE, "A property must have a name."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; + + /* this is allowed */ + sml_fail_unless(sml_dev_inf_property_set_prop_name(prop, "", &error) == TRUE, "%s", error?error->message:"No GError set."); + + sml_fail_unless(sml_dev_inf_property_set_prop_name(prop, NULL, &error) == FALSE, "A property must have a name."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; + + /* test the normal properties */ sml_fail_unless(sml_dev_inf_property_set_data_type(prop, NULL, &error), "%s", error?error->message:"No GError set."); sml_fail_unless(sml_dev_inf_property_set_data_type(prop, "", &error), "%s", error?error->message:"No GError set."); @@ -48,9 +61,22 @@ sml_fail_unless(sml_dev_inf_property_set_display_name(prop, "", &error), "%s", error?error->message:"No GError set."); sml_fail_unless(sml_dev_inf_property_set_display_name(prop, NULL, &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_property_add_val_enum(prop, NULL, &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_property_add_val_enum(prop, "", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_property_add_val_enum(prop, NULL, &error), "%s", error?error->message:"No GError set."); + /* ValEnums does not accept empty values */ + + sml_fail_unless(sml_dev_inf_property_add_val_enum(prop, NULL, &error) == FALSE, "ValEnums must be not empty."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; + + sml_fail_unless(sml_dev_inf_property_add_val_enum(prop, "", &error) == FALSE, "ValEnums must be not empty."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; + + sml_fail_unless(sml_dev_inf_property_add_val_enum(prop, NULL, &error) == FALSE, "ValEnums must be not empty."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; /* parameter checks must be a little bit more careful */ @@ -78,25 +104,65 @@ SmlDevInfProperty *prop = sml_dev_inf_property_new(); sml_fail_unless(prop != NULL, NULL); + /* enforce parameter name */ + sml_fail_unless(sml_dev_inf_property_get_prop_name(prop) == NULL, NULL); - sml_fail_unless(sml_dev_inf_property_set_prop_name(prop, NULL, &error), "%s", error?error->message:"No GError set."); + + sml_fail_unless(sml_dev_inf_property_set_prop_name(prop, NULL, &error) == FALSE, "The parameter name must be set."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; + sml_fail_unless(sml_dev_inf_property_get_prop_name(prop) == NULL, NULL); + /* this is allowed */ + sml_fail_unless(sml_dev_inf_property_set_prop_name(prop, "", &error) == TRUE, "%s", error?error->message:"No GError set."); + + sml_fail_unless(sml_dev_inf_property_get_prop_name(prop) != NULL, NULL); + sml_fail_unless(strlen(sml_dev_inf_property_get_prop_name(prop)) == 0, NULL); + + /* test the normal properties */ + sml_fail_unless(sml_dev_inf_property_get_data_type(prop) == NULL, NULL); sml_fail_unless(sml_dev_inf_property_set_data_type(prop, NULL, &error), "%s", error?error->message:"No GError set."); sml_fail_unless(sml_dev_inf_property_get_data_type(prop) == NULL, NULL); + sml_fail_unless(sml_dev_inf_property_set_data_type(prop, "", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_property_get_data_type(prop) == NULL, NULL); sml_fail_unless(sml_dev_inf_property_get_display_name(prop) == NULL, NULL); sml_fail_unless(sml_dev_inf_property_set_display_name(prop, NULL, &error), "%s", error?error->message:"No GError set."); sml_fail_unless(sml_dev_inf_property_get_display_name(prop) == NULL, NULL); + sml_fail_unless(sml_dev_inf_property_set_display_name(prop, "", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_property_get_display_name(prop) == NULL, NULL); + + /* ValEnums does not accept empty values */ sml_fail_unless(sml_dev_inf_property_num_val_enums(prop) == 0, NULL); - sml_fail_unless(sml_dev_inf_property_add_val_enum(prop, NULL, &error), "%s", error?error->message:"No GError set."); + + sml_fail_unless(sml_dev_inf_property_add_val_enum(prop, NULL, &error) == FALSE, "ValEnums must be not empty."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; + + sml_fail_unless(sml_dev_inf_property_num_val_enums(prop) == 0, NULL); + + sml_fail_unless(sml_dev_inf_property_add_val_enum(prop, "", &error) == FALSE, "ValEnums must be not empty."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; + + sml_fail_unless(sml_dev_inf_property_num_val_enums(prop) == 0, NULL); + + sml_fail_unless(sml_dev_inf_property_add_val_enum(prop, "value", &error) == TRUE, "%s", error?error->message:"No GError set."); + + sml_fail_unless(sml_dev_inf_property_num_val_enums(prop) == 1, NULL); + + sml_fail_unless(sml_dev_inf_property_add_val_enum(prop, NULL, &error) == FALSE, "ValEnums must be not empty."); + sml_fail_unless(error != NULL, "The error must be set if an error appears."); + g_error_free(error); + error = NULL; + sml_fail_unless(sml_dev_inf_property_num_val_enums(prop) == 1, NULL); - sml_fail_unless(sml_dev_inf_property_add_val_enum(prop, "", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_property_num_val_enums(prop) == 2, NULL); - sml_fail_unless(sml_dev_inf_property_add_val_enum(prop, NULL, &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_property_num_val_enums(prop) == 3, NULL); /* parameter checks must be a little bit more careful */ |
