aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorEli Zaretskii2020-06-22 18:32:01 +0300
committerEli Zaretskii2020-06-22 18:32:01 +0300
commit30ff2433b16dba2c4e36c6eda6f808c6f2cb46d1 (patch)
treefae44fdb6ed9e62a20c0bdb047441bc55f23c771 /test
parentbea5eb77b3170203424179274bf26b9ce70de807 (diff)
downloademacs-30ff2433b16dba2c4e36c6eda6f808c6f2cb46d1.tar.gz
emacs-30ff2433b16dba2c4e36c6eda6f808c6f2cb46d1.zip
Minor improvements as followup to recent RGB string-parsing change
* src/xfaces.c (Finternal_color_values_from_color_spec): Rename to... (Fcolor_values_from_color_spec): ...this. Callers changed. Rename the argument to SPEC and improve the doc string. (parse_color_spec, parse_float_color_comp, parse_hex_color_comp): Improve commentary. (parse_color_spec): Rename the argument S to SPEC. * etc/NEWS: Mention 'color-values-from-color-spec'.
Diffstat (limited to 'test')
-rw-r--r--test/src/xfaces-tests.el26
1 files changed, 13 insertions, 13 deletions
diff --git a/test/src/xfaces-tests.el b/test/src/xfaces-tests.el
index 34cda07e5b4..bde3a354229 100644
--- a/test/src/xfaces-tests.el
+++ b/test/src/xfaces-tests.el
@@ -25,26 +25,26 @@
25 (color-distance "#ffffff" "#222222")))) 25 (color-distance "#ffffff" "#222222"))))
26 26
27(ert-deftest xfaces-internal-color-values-from-color-spec () 27(ert-deftest xfaces-internal-color-values-from-color-spec ()
28 (should (equal (internal-color-values-from-color-spec "#f05") 28 (should (equal (color-values-from-color-spec "#f05")
29 '(#xffff #x0000 #x5555))) 29 '(#xffff #x0000 #x5555)))
30 (should (equal (internal-color-values-from-color-spec "#1fb0C5") 30 (should (equal (color-values-from-color-spec "#1fb0C5")
31 '(#x1f1f #xb0b0 #xc5c5))) 31 '(#x1f1f #xb0b0 #xc5c5)))
32 (should (equal (internal-color-values-from-color-spec "#1f8b0AC5e") 32 (should (equal (color-values-from-color-spec "#1f8b0AC5e")
33 '(#x1f81 #xb0aa #xc5eb))) 33 '(#x1f81 #xb0aa #xc5eb)))
34 (should (equal (internal-color-values-from-color-spec "#1f83b0ADC5e2") 34 (should (equal (color-values-from-color-spec "#1f83b0ADC5e2")
35 '(#x1f83 #xb0ad #xc5e2))) 35 '(#x1f83 #xb0ad #xc5e2)))
36 (should (equal (internal-color-values-from-color-spec "#1f83b0ADC5e2g") nil)) 36 (should (equal (color-values-from-color-spec "#1f83b0ADC5e2g") nil))
37 (should (equal (internal-color-values-from-color-spec "#1f83b0ADC5e20") nil)) 37 (should (equal (color-values-from-color-spec "#1f83b0ADC5e20") nil))
38 (should (equal (internal-color-values-from-color-spec "#12345") nil)) 38 (should (equal (color-values-from-color-spec "#12345") nil))
39 (should (equal (internal-color-values-from-color-spec "rgb:f/23/28a") 39 (should (equal (color-values-from-color-spec "rgb:f/23/28a")
40 '(#xffff #x2323 #x28a2))) 40 '(#xffff #x2323 #x28a2)))
41 (should (equal (internal-color-values-from-color-spec "rgb:1234/5678/09ab") 41 (should (equal (color-values-from-color-spec "rgb:1234/5678/09ab")
42 '(#x1234 #x5678 #x09ab))) 42 '(#x1234 #x5678 #x09ab)))
43 (should (equal (internal-color-values-from-color-spec "rgb:0//0") nil)) 43 (should (equal (color-values-from-color-spec "rgb:0//0") nil))
44 (should (equal (internal-color-values-from-color-spec "rgbi:0/0.5/0.1") 44 (should (equal (color-values-from-color-spec "rgbi:0/0.5/0.1")
45 '(0 32768 6554))) 45 '(0 32768 6554)))
46 (should (equal (internal-color-values-from-color-spec "rgbi:1e-3/1.0e-2/1e0") 46 (should (equal (color-values-from-color-spec "rgbi:1e-3/1.0e-2/1e0")
47 '(66 655 65535))) 47 '(66 655 65535)))
48 (should (equal (internal-color-values-from-color-spec "rgbi:0/0.5/10") nil))) 48 (should (equal (color-values-from-color-spec "rgbi:0/0.5/10") nil)))
49 49
50(provide 'xfaces-tests) 50(provide 'xfaces-tests)