diff options
| author | Eli Zaretskii | 2024-11-02 18:15:25 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2024-11-02 18:15:25 +0200 |
| commit | 435d7d4292e6803405c1ea65c73693f20eea2a58 (patch) | |
| tree | 3d0dfe8d3e0158d472672e9a9a936e04689123a1 /test | |
| parent | 99650746d916335bbe480c462af83009037632df (diff) | |
| download | emacs-435d7d4292e6803405c1ea65c73693f20eea2a58.tar.gz emacs-435d7d4292e6803405c1ea65c73693f20eea2a58.zip | |
Fix color-lightening and darkening calculations
* lisp/color.el (color-lighten-hsl): Fix calculations (bug#74055).
* test/lisp/color-tests.el (color-tests-lighten-hsl)
(color-tests-lighten-name, color-tests-darken-hsl)
(color-tests-darken-name): Adjust test results.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/color-tests.el | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/test/lisp/color-tests.el b/test/lisp/color-tests.el index bc897edc702..63cb024bb8d 100644 --- a/test/lisp/color-tests.el +++ b/test/lisp/color-tests.el | |||
| @@ -220,32 +220,29 @@ | |||
| 220 | 220 | ||
| 221 | (ert-deftest color-tests-lighten-hsl () | 221 | (ert-deftest color-tests-lighten-hsl () |
| 222 | (should (equal (color-lighten-hsl 360 0.5 0.5 0) '(360 0.5 0.5))) | 222 | (should (equal (color-lighten-hsl 360 0.5 0.5 0) '(360 0.5 0.5))) |
| 223 | (should (equal (color-lighten-hsl 360 0.5 0.5 -10) '(360 0.5 0.4))) | 223 | (should (equal (color-lighten-hsl 360 0.5 0.5 -10) '(360 0.5 0.45))) |
| 224 | (should (equal (color-lighten-hsl 360 0.5 0.5 -500) '(360 0.5 0.0))) | 224 | (should (equal (color-lighten-hsl 360 0.5 0.5 -500) '(360 0.5 0.0))) |
| 225 | (should | 225 | (should (equal (color-lighten-hsl 120 0.5 0.8 5) '(120 0.5 0.81))) |
| 226 | (color-tests--approx-equal | 226 | (should (equal (color-lighten-hsl 120 0.5 0.8 500) '(120 0.5 1.0)))) |
| 227 | (color-lighten-hsl 120 0.5 0.8 5) '(120 0.5 0.85))) | ||
| 228 | (should | ||
| 229 | (equal (color-lighten-hsl 120 0.5 0.8 500) '(120 0.5 1.0)))) | ||
| 230 | 227 | ||
| 231 | (ert-deftest color-tests-lighten-name () | 228 | (ert-deftest color-tests-lighten-name () |
| 232 | (should (equal (color-lighten-name "black" 100) "#ffffffffffff")) | 229 | (should (equal (color-lighten-name "black" 100) "#ffffffffffff")) |
| 233 | (should (equal (color-lighten-name "white" 100) "#ffffffffffff")) | 230 | (should (equal (color-lighten-name "white" 100) "#ffffffffffff")) |
| 234 | (should (equal (color-lighten-name "red" 0) "#ffff00000000")) | 231 | (should (equal (color-lighten-name "red" 0) "#ffff00000000")) |
| 235 | (should (equal (color-lighten-name "red" 10) "#ffff33323332"))) | 232 | (should (equal (color-lighten-name "red" 10) "#ffff19991999"))) |
| 236 | 233 | ||
| 237 | (ert-deftest color-tests-darken-hsl () | 234 | (ert-deftest color-tests-darken-hsl () |
| 238 | (should (equal (color-darken-hsl 360 0.5 0.5 0) '(360 0.5 0.5))) | 235 | (should (equal (color-darken-hsl 360 0.5 0.5 0) '(360 0.5 0.5))) |
| 239 | (should (equal (color-darken-hsl 360 0.5 0.5 -10) '(360 0.5 0.6))) | 236 | (should (equal (color-darken-hsl 360 0.5 0.5 -10) '(360 0.5 0.55))) |
| 240 | (should (equal (color-darken-hsl 360 0.5 0.5 -500) '(360 0.5 1.0))) | 237 | (should (equal (color-darken-hsl 360 0.5 0.5 -500) '(360 0.5 1.0))) |
| 241 | (should (equal (color-darken-hsl 120 0.5 0.8 5) '(120 0.5 0.75))) | 238 | (should (equal (color-darken-hsl 120 0.5 0.8 5) '(120 0.5 0.76))) |
| 242 | (should (equal (color-darken-hsl 120 0.5 0.8 500) '(120 0.5 0.0)))) | 239 | (should (equal (color-darken-hsl 120 0.5 0.8 500) '(120 0.5 0.0)))) |
| 243 | 240 | ||
| 244 | (ert-deftest color-tests-darken-name () | 241 | (ert-deftest color-tests-darken-name () |
| 245 | (should (equal (color-darken-name "black" 100) "#000000000000")) | 242 | (should (equal (color-darken-name "black" 100) "#000000000000")) |
| 246 | (should (equal (color-darken-name "white" 100) "#000000000000")) | 243 | (should (equal (color-darken-name "white" 100) "#000000000000")) |
| 247 | (should (equal (color-darken-name "red" 0) "#ffff00000000")) | 244 | (should (equal (color-darken-name "red" 0) "#ffff00000000")) |
| 248 | (should (equal (color-darken-name "red" 10) "#cccc00000000"))) | 245 | (should (equal (color-darken-name "red" 10) "#e66500000000"))) |
| 249 | 246 | ||
| 250 | (ert-deftest color-tests-oklab-to-xyz () | 247 | (ert-deftest color-tests-oklab-to-xyz () |
| 251 | (should (color-tests--approx-equal (color-oklab-to-xyz 0 0 0) '(0.0 0.0 0.0))) | 248 | (should (color-tests--approx-equal (color-oklab-to-xyz 0 0 0) '(0.0 0.0 0.0))) |