From dd7242dfc9eaa9888ac82ae51e2563e9eba17435 Mon Sep 17 00:00:00 2001 From: Nicola Fontana Date: Thu, 29 Dec 2016 18:15:55 +0100 Subject: [PATCH] adg: fix default AdgDimStyle values Added to tests checking for expected default values. --- src/adg/adg-dim-style.c | 4 ++-- src/adg/tests/test-dim-style.c | 22 +++++++++++++++++++--- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/adg/adg-dim-style.c b/src/adg/adg-dim-style.c index 4d07ca0d..e0dd22aa 100644 --- a/src/adg/adg-dim-style.c +++ b/src/adg/adg-dim-style.c @@ -229,7 +229,7 @@ adg_dim_style_class_init(AdgDimStyleClass *klass) param = g_param_spec_string("number-arguments", P_("Number Arguments"), P_("The arguments to pass to the format function: see adg_dim_style_set_number_arguments() for further details"), - "r", + "d", G_PARAM_READWRITE); g_object_class_install_property(gobject_class, PROP_NUMBER_ARGUMENTS, param); @@ -278,7 +278,7 @@ adg_dim_style_init(AdgDimStyle *dim_style) data->limits_shift.x = +2; data->limits_shift.y = +2; data->number_format = g_strdup("%-.7g"); - data->number_arguments = g_strdup("r"); + data->number_arguments = g_strdup("d"); data->number_tag = g_strdup("<>"); data->decimals = 2; diff --git a/src/adg/tests/test-dim-style.c b/src/adg/tests/test-dim-style.c index 038b95e3..1d36f9fb 100644 --- a/src/adg/tests/test-dim-style.c +++ b/src/adg/tests/test-dim-style.c @@ -496,6 +496,10 @@ _adg_property_number_format(void) valid_text_1 = "%lf"; valid_text_2 = "%abc%"; + /* Check default value */ + number_format = adg_dim_style_get_number_format(dim_style); + g_assert_cmpstr(number_format, ==, "%-.7g"); + /* Using the public APIs */ adg_dim_style_set_number_format(dim_style, valid_text_1); number_format = adg_dim_style_get_number_format(dim_style); @@ -539,6 +543,10 @@ _adg_property_number_arguments(void) valid_text_1 = "aieDdMmSs"; valid_text_2 = ""; + /* Check default value */ + number_arguments = adg_dim_style_get_number_arguments(dim_style); + g_assert_cmpstr(number_arguments, ==, "d"); + /* Using the public APIs */ adg_dim_style_set_number_arguments(dim_style, valid_text_1); number_arguments = adg_dim_style_get_number_arguments(dim_style); @@ -600,6 +608,10 @@ _adg_property_number_tag(void) valid_text_1 = ""; valid_text_2 = "<รจ>"; + /* Check default value */ + number_tag = adg_dim_style_get_number_tag(dim_style); + g_assert_cmpstr(number_tag, ==, "<>"); + /* Using the public APIs */ adg_dim_style_set_number_tag(dim_style, valid_text_1); number_tag = adg_dim_style_get_number_tag(dim_style); @@ -639,14 +651,18 @@ _adg_property_decimals(void) dim_style = adg_dim_style_new(); - /* Using the public APIs */ - adg_dim_style_set_decimals(dim_style, 2); + /* Check default value */ decimals = adg_dim_style_get_decimals(dim_style); g_assert_cmpint(decimals, ==, 2); + /* Using the public APIs */ + adg_dim_style_set_decimals(dim_style, 4); + decimals = adg_dim_style_get_decimals(dim_style); + g_assert_cmpint(decimals, ==, 4); + adg_dim_style_set_decimals(dim_style, -2); decimals = adg_dim_style_get_decimals(dim_style); - g_assert_cmpint(decimals, ==, 2); + g_assert_cmpint(decimals, ==, 4); decimals = adg_dim_style_get_decimals(NULL); g_assert_cmpint(decimals, ==, -2); -- 2.11.4.GIT