Pacify recent warnings in ansi-color-tests.el

* test/lisp/ansi-color-tests.el: Remove invalid package keyword
'ansi', and unused dependency on cl-lib.
(yellow, bright-yellow): Replace prefix-less dynvars with
corresponding local lexvars.
(test-strings): Rename prefix-less dynvar...
(ansi-color-tests--strings): ...to this.  All users updated.
(ansi-color-apply-on-region-test)
(ansi-color-apply-on-region-bold-is-bright-test): Simplify.
(ansi-color-apply-on-region-preserving-test): Reindent.

diff --git a/test/lisp/ansi-color-tests.el b/test/lisp/ansi-color-tests.el
index df674dfc7f02cd1d9d9773334a11a97dc5ca8983..953fdff8933989788bfb6d1bc12d15987c85bb82 100644 (file)
--- a/test/lisp/ansi-color-tests.el
+++ b/test/lisp/ansi-color-tests.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2020-2021 Free Software Foundation, Inc.
 
 ;; Author: Pablo Barbáchano <pablob@amazon.com>
-;; Keywords: ansi
 
 ;; This file is part of GNU Emacs.
 
@@ -25,49 +24,48 @@
 ;;; Code:
 
 (require 'ansi-color)
-(eval-when-compile (require 'cl-lib))
 
-(defvar yellow (face-foreground 'ansi-color-yellow nil 'default))
-(defvar bright-yellow (face-foreground 'ansi-color-bright-yellow nil 'default))
-
-(defvar test-strings
-  `(("Hello World" "Hello World")
-    ("\e[33mHello World\e[0m" "Hello World"
-     (:foreground ,yellow))
-    ("\e[43mHello World\e[0m" "Hello World"
-     (:background ,yellow))
-    ("\e[93mHello World\e[0m" "Hello World"
-     (:foreground ,bright-yellow))
-    ("\e[103mHello World\e[0m" "Hello World"
-     (:background ,bright-yellow))
-    ("\e[1;33mHello World\e[0m" "Hello World"
-     (ansi-color-bold (:foreground ,yellow))
-     (ansi-color-bold (:foreground ,bright-yellow)))
-    ("\e[33;1mHello World\e[0m" "Hello World"
-     (ansi-color-bold (:foreground ,yellow))
-     (ansi-color-bold (:foreground ,bright-yellow)))
-    ("\e[1m\e[33mHello World\e[0m" "Hello World"
-     (ansi-color-bold (:foreground ,yellow))
-     (ansi-color-bold (:foreground ,bright-yellow)))
-    ("\e[33m\e[1mHello World\e[0m" "Hello World"
-     (ansi-color-bold (:foreground ,yellow))
-     (ansi-color-bold (:foreground ,bright-yellow)))
-    ("\e[1m\e[3m\e[5mbold italics blink\e[0m" "bold italics blink"
-     (ansi-color-bold ansi-color-italic ansi-color-slow-blink))
-    ("\e[10munrecognized\e[0m" "unrecognized")))
+(defvar ansi-color-tests--strings
+  (let ((bright-yellow (face-foreground 'ansi-color-bright-yellow nil 'default))
+        (yellow (face-foreground 'ansi-color-yellow nil 'default)))
+    `(("Hello World" "Hello World")
+      ("\e[33mHello World\e[0m" "Hello World"
+       (:foreground ,yellow))
+      ("\e[43mHello World\e[0m" "Hello World"
+       (:background ,yellow))
+      ("\e[93mHello World\e[0m" "Hello World"
+       (:foreground ,bright-yellow))
+      ("\e[103mHello World\e[0m" "Hello World"
+       (:background ,bright-yellow))
+      ("\e[1;33mHello World\e[0m" "Hello World"
+       (ansi-color-bold (:foreground ,yellow))
+       (ansi-color-bold (:foreground ,bright-yellow)))
+      ("\e[33;1mHello World\e[0m" "Hello World"
+       (ansi-color-bold (:foreground ,yellow))
+       (ansi-color-bold (:foreground ,bright-yellow)))
+      ("\e[1m\e[33mHello World\e[0m" "Hello World"
+       (ansi-color-bold (:foreground ,yellow))
+       (ansi-color-bold (:foreground ,bright-yellow)))
+      ("\e[33m\e[1mHello World\e[0m" "Hello World"
+       (ansi-color-bold (:foreground ,yellow))
+       (ansi-color-bold (:foreground ,bright-yellow)))
+      ("\e[1m\e[3m\e[5mbold italics blink\e[0m" "bold italics blink"
+       (ansi-color-bold ansi-color-italic ansi-color-slow-blink))
+      ("\e[10munrecognized\e[0m" "unrecognized"))))
 
 (ert-deftest ansi-color-apply-on-region-test ()
-  (pcase-dolist (`(,input ,text ,face) test-strings)
+  (pcase-dolist (`(,input ,text ,face) ansi-color-tests--strings)
     (with-temp-buffer
       (insert input)
       (ansi-color-apply-on-region (point-min) (point-max))
       (should (equal (buffer-string) text))
       (should (equal (get-char-property (point-min) 'face) face))
       (when face
-        (should (not (equal (overlays-at (point-min)) nil)))))))
+        (should (overlays-at (point-min)))))))
 
 (ert-deftest ansi-color-apply-on-region-bold-is-bright-test ()
-  (pcase-dolist (`(,input ,text ,normal-face ,bright-face) test-strings)
+  (pcase-dolist (`(,input ,text ,normal-face ,bright-face)
+                 ansi-color-tests--strings)
     (with-temp-buffer
       (let ((ansi-color-bold-is-bright t)
             (face (or bright-face normal-face)))
@@ -76,14 +74,14 @@
         (should (equal (buffer-string) text))
         (should (equal (get-char-property (point-min) 'face) face))
         (when face
-          (should (not (equal (overlays-at (point-min)) nil))))))))
+          (should (overlays-at (point-min))))))))
 
 (ert-deftest ansi-color-apply-on-region-preserving-test ()
-    (dolist (pair test-strings)
-      (with-temp-buffer
-        (insert (car pair))
-        (ansi-color-apply-on-region (point-min) (point-max) t)
-        (should (equal (buffer-string) (car pair))))))
+  (dolist (pair ansi-color-tests--strings)
+    (with-temp-buffer
+      (insert (car pair))
+      (ansi-color-apply-on-region (point-min) (point-max) t)
+      (should (equal (buffer-string) (car pair))))))
 
 (provide 'ansi-color-tests)