mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-17 19:30:38 -08:00
495aa532f1
* test/src/image-tests.el (image-test-circular-specs): New file. * src/image.c (parse_image_spec): Return failure for circular lists. (valid_image_p): Don't look at odd-numbered list elements expecting to find a property name. (image_spec_value): Handle circular lists. (equal_lists): Introduce. (search_image_cache): Use `equal_lists' (bug#36403).
144 lines
5.3 KiB
EmacsLisp
144 lines
5.3 KiB
EmacsLisp
;;; image-tests.el --- Test suite for image-related functions.
|
|
|
|
;; Copyright (C) 2019 Free Software Foundation, Inc.
|
|
|
|
;; Author: Pip Cet <pipcet@gmail.com>
|
|
;; Keywords: internal
|
|
;; Human-Keywords: internal
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;;; Code:
|
|
|
|
(require 'ert)
|
|
|
|
(ert-deftest image-test-duplicate-keywords ()
|
|
"Test that duplicate keywords in an image spec lead to rejection."
|
|
(should-error (image-size `(image :type xbm :type xbm :width 1 :height 1
|
|
:data ,(bool-vector t))
|
|
t)))
|
|
|
|
(ert-deftest image-test-circular-plist ()
|
|
"Test that a circular image spec is rejected."
|
|
(should-error
|
|
(let ((l `(image :type xbm :width 1 :height 1 :data ,(bool-vector t))))
|
|
(setcdr (last l) '#1=(:invalid . #1#))
|
|
(image-size l t))))
|
|
|
|
(ert-deftest image-test-:type-property-value ()
|
|
"Test that :type is allowed as a property value in an image spec."
|
|
(should (equal (image-size `(image :dummy :type :type xbm :width 1 :height 1
|
|
:data ,(bool-vector t))
|
|
t)
|
|
(cons 1 1))))
|
|
|
|
(ert-deftest image-test-circular-specs ()
|
|
"Test that circular image spec property values do not cause infinite recursion."
|
|
(should
|
|
(let* ((circ1 (cons :dummy nil))
|
|
(circ2 (cons :dummy nil))
|
|
(spec1 `(image :type xbm :width 1 :height 1
|
|
:data ,(bool-vector 1) :ignored ,circ1))
|
|
(spec2 `(image :type xbm :width 1 :height 1
|
|
:data ,(bool-vector 1) :ignored ,circ2)))
|
|
(setcdr circ1 circ1)
|
|
(setcdr circ2 circ2)
|
|
(and (equal (image-size spec1 t) (cons 1 1))
|
|
(equal (image-size spec2 t) (cons 1 1))))))
|
|
|
|
(provide 'image-tests)
|
|
;;; image-tests.el ends here.
|
|
;;; image-tests.el --- tests for image.el -*- lexical-binding: t -*-
|
|
|
|
;; Copyright (C) 2019-2020 Free Software Foundation, Inc.
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Code:
|
|
|
|
(require 'ert)
|
|
(require 'image)
|
|
(eval-when-compile
|
|
(require 'cl-lib))
|
|
|
|
(defconst image-tests--emacs-images-directory
|
|
(expand-file-name "../etc/images" (getenv "EMACS_TEST_DIRECTORY"))
|
|
"Directory containing Emacs images.")
|
|
|
|
(ert-deftest image--set-property ()
|
|
"Test `image--set-property' behavior."
|
|
(let ((image (list 'image)))
|
|
;; Add properties.
|
|
(setf (image-property image :scale) 1)
|
|
(should (equal image '(image :scale 1)))
|
|
(setf (image-property image :width) 8)
|
|
(should (equal image '(image :scale 1 :width 8)))
|
|
(setf (image-property image :height) 16)
|
|
(should (equal image '(image :scale 1 :width 8 :height 16)))
|
|
;; Delete properties.
|
|
(setf (image-property image :type) nil)
|
|
(should (equal image '(image :scale 1 :width 8 :height 16)))
|
|
(setf (image-property image :scale) nil)
|
|
(should (equal image '(image :width 8 :height 16)))
|
|
(setf (image-property image :height) nil)
|
|
(should (equal image '(image :width 8)))
|
|
(setf (image-property image :width) nil)
|
|
(should (equal image '(image)))))
|
|
|
|
(ert-deftest image-type-from-file-header-test ()
|
|
"Test image-type-from-file-header."
|
|
(should (eq (if (image-type-available-p 'svg) 'svg)
|
|
(image-type-from-file-header
|
|
(expand-file-name "splash.svg"
|
|
image-tests--emacs-images-directory)))))
|
|
|
|
(ert-deftest image-rotate ()
|
|
"Test `image-rotate'."
|
|
(cl-letf* ((image (list 'image))
|
|
((symbol-function 'image--get-imagemagick-and-warn)
|
|
(lambda () image)))
|
|
(let ((current-prefix-arg '(4)))
|
|
(call-interactively #'image-rotate))
|
|
(should (equal image '(image :rotation 270.0)))
|
|
(call-interactively #'image-rotate)
|
|
(should (equal image '(image :rotation 0.0)))
|
|
(image-rotate)
|
|
(should (equal image '(image :rotation 90.0)))
|
|
(image-rotate 0)
|
|
(should (equal image '(image :rotation 90.0)))
|
|
(image-rotate 1)
|
|
(should (equal image '(image :rotation 91.0)))
|
|
(image-rotate 1234.5)
|
|
(should (equal image '(image :rotation 245.5)))
|
|
(image-rotate -154.5)
|
|
(should (equal image '(image :rotation 91.0)))))
|
|
|
|
;;; image-tests.el ends here
|