X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fstyle-test.cpp;h=54be0040edfa2c1be17650d966e318410159bee6;hb=ac248d5f76a334cd01269ef995c00dba1ba28ed8;hp=86382b1743a9e53aabf4ae41360888c717f7d4cd;hpb=6b15695578f07a3f72c4c9475c1a261a3021472a;p=inkscape.git diff --git a/src/style-test.cpp b/src/style-test.cpp index 86382b174..54be0040e 100644 --- a/src/style-test.cpp +++ b/src/style-test.cpp @@ -249,7 +249,7 @@ static void color_val(char const prop[], char const *const dummy_vals[]) { assert(dummy_vals == NULL); - char const *const extra_vals[] = {"#0000ff", NULL}; + char const *const extra_vals[] = {"blue", "#234", "#0100ff", NULL}; enum_val(prop, extra_vals); #if 0 char const *color_vals[G_N_ELEMENTS(color_keywords) + G_N_ELEMENTS(extra_vals)]; @@ -540,10 +540,10 @@ test_style() char const *const *tst_fn_arg; bool can_explicitly_inherit; } const props[] = { - {"color", "#000000", "#000000", color_val, NULL, true}, + {"color", "black", "black", color_val, NULL, true}, // initial value "depends on user agent" {"display", "inline", "inline", enum_val, display_vals, true}, - {"fill", "#000000", "black", paint_val, NULL, true}, + {"fill", "black", "black", paint_val, NULL, true}, {"fill-opacity", "1", "1", opacity_val, NULL, true}, {"fill-rule", "nonzero", "nonzero", enum_val, fill_rule_vals, true}, {"font-family", "Bitstream Vera Sans", "Bitstream Vera Sans", font_family_val, NULL, true}, @@ -595,8 +595,8 @@ test_style() "writing-mode:lr-tb;" "text-anchor:start;" "opacity:1;" - "color:#000000;" - "fill:#000000;" + "color:black;" + "fill:black;" "fill-opacity:1;" "fill-rule:nonzero;" "stroke:none;" @@ -687,7 +687,7 @@ test_style() bad[i], bad[i]); UTEST_TEST(tst_name) { gchar *str0_set = merge_then_write_string(style_str, SP_STYLE_FLAG_IFSET); - UTEST_ASSERT(streq(str0_set, "color:#112233")); + UTEST_ASSERT(streq(str0_set, "color:#123")); g_free(str0_set); } g_free(style_str);