From 8548ad2cb3f0eff766cc87d0db78a09972c72acc Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 15 Mar 2021 01:43:11 +0100 Subject: Add three new tests for image.el * test/lisp/image-tests.el (image-find-image) (image-type-from-file-name, image-type/from-filename): New tests. --- test/lisp/image-tests.el | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'test/lisp/image-tests.el') diff --git a/test/lisp/image-tests.el b/test/lisp/image-tests.el index ab7585ca050..bb42ffae18e 100644 --- a/test/lisp/image-tests.el +++ b/test/lisp/image-tests.el @@ -48,6 +48,17 @@ (setf (image-property image :width) nil) (should (equal image '(image))))) +(ert-deftest image-find-image () + (find-image '((:type xpm :file "undo.xpm"))) + (find-image '((:type png :file "newsticker/rss-feed.png" :ascent center)))) + +(ert-deftest image-type-from-file-name () + (should (eq (image-type-from-file-name "foo.jpg") 'jpeg)) + (should (eq (image-type-from-file-name "foo.png") 'png))) + +(ert-deftest image-type/from-filename () + (should (eq (image-type "foo.jpg") 'jpeg))) + (ert-deftest image-type-from-file-header-test () "Test image-type-from-file-header." (should (eq (if (image-type-available-p 'svg) 'svg) -- cgit v1.2.3 From c209a0f82825dacd7edeef34b31f458499307eef Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 16 Mar 2021 18:40:24 +0100 Subject: Fix problem of image-tests.el on emba * test/README: Mention $EMACS_TEST_DIRECTORY. * test/lisp/image-tests.el (image-tests--emacs-images-directory): Use `data-directory', for runs w/o of make. (image-type/from-filename): Check for `image-load-path'. --- test/README | 6 +++++- test/lisp/image-tests.el | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'test/lisp/image-tests.el') diff --git a/test/README b/test/README index 1e0e43a8aca..a348074aba7 100644 --- a/test/README +++ b/test/README @@ -22,7 +22,10 @@ following tags are recognized: * :unstable The test is under development. It shall run on demand only. -The Makefile in this directory supports the following targets: +The Makefile sets the environment variable $EMACS_TEST_DIRECTORY, +which points to this directory. This environment variable does not +exist when the tests are run outside make. The Makefile supports the +following targets: * make check Run all tests as defined in the directory. Expensive and unstable @@ -113,6 +116,7 @@ Some optional tests require packages from GNU ELPA. By default out somewhere else, use make GNU_ELPA_DIRECTORY=/path/to/elpa ... + There are also continuous integration tests on (see diff --git a/test/lisp/image-tests.el b/test/lisp/image-tests.el index bb42ffae18e..2f7afa2f38e 100644 --- a/test/lisp/image-tests.el +++ b/test/lisp/image-tests.el @@ -25,7 +25,7 @@ (require 'cl-lib)) (defconst image-tests--emacs-images-directory - (expand-file-name "../etc/images" (getenv "EMACS_TEST_DIRECTORY")) + (expand-file-name "images" data-directory) "Directory containing Emacs images.") (ert-deftest image--set-property () @@ -57,6 +57,8 @@ (should (eq (image-type-from-file-name "foo.png") 'png))) (ert-deftest image-type/from-filename () + ;; On emba, `image-load-path' does not exist. + (skip-unless (bound-and-true-p image-load-path)) (should (eq (image-type "foo.jpg") 'jpeg))) (ert-deftest image-type-from-file-header-test () -- cgit v1.2.3 From c3d029c923fa7492196d73669f860790184e48a0 Mon Sep 17 00:00:00 2001 From: Mattias Engdegård Date: Thu, 6 May 2021 15:15:55 +0200 Subject: Don't fail image-tests if JPEG format isn't compiled in * test/lisp/image-tests.el (image-type/from-filename): Make jpeg test conditional. Test pbm (always present). --- test/lisp/image-tests.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'test/lisp/image-tests.el') diff --git a/test/lisp/image-tests.el b/test/lisp/image-tests.el index 2f7afa2f38e..317e85fe50c 100644 --- a/test/lisp/image-tests.el +++ b/test/lisp/image-tests.el @@ -59,7 +59,9 @@ (ert-deftest image-type/from-filename () ;; On emba, `image-load-path' does not exist. (skip-unless (bound-and-true-p image-load-path)) - (should (eq (image-type "foo.jpg") 'jpeg))) + (should (eq (image-type "gif.pbm") 'pbm)) + (when (memq 'jpeg image-types) ; jpeg may not be compiled in + (should (eq (image-type "foo.jpg") 'jpeg)))) (ert-deftest image-type-from-file-header-test () "Test image-type-from-file-header." -- cgit v1.2.3 From 8b7495a722a57071cb2a978665f95f8227db2863 Mon Sep 17 00:00:00 2001 From: Mattias Engdegård Date: Thu, 6 May 2021 17:23:44 +0200 Subject: ; * test/lisp/image-tests.el: fix previous commit --- test/lisp/image-tests.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'test/lisp/image-tests.el') diff --git a/test/lisp/image-tests.el b/test/lisp/image-tests.el index 317e85fe50c..aa8600609c4 100644 --- a/test/lisp/image-tests.el +++ b/test/lisp/image-tests.el @@ -57,11 +57,10 @@ (should (eq (image-type-from-file-name "foo.png") 'png))) (ert-deftest image-type/from-filename () - ;; On emba, `image-load-path' does not exist. - (skip-unless (bound-and-true-p image-load-path)) - (should (eq (image-type "gif.pbm") 'pbm)) - (when (memq 'jpeg image-types) ; jpeg may not be compiled in - (should (eq (image-type "foo.jpg") 'jpeg)))) + ;; On emba, `image-types' and `image-load-path' do not exist. + (skip-unless (and (bound-and-true-p image-types) + (bound-and-true-p image-load-path))) + (should (eq (image-type "foo.jpg") 'jpeg))) (ert-deftest image-type-from-file-header-test () "Test image-type-from-file-header." -- cgit v1.2.3