Merge 'master' into noverlay

1 files changed, 83 insertions, 156 deletions

diff --git a/test/manual/cedet/cedet-utests.el b/test/manual/cedet/cedet-utests.el
index 19a144f2abb..b365908c639 100644
--- a/test/manual/cedet/cedet-utests.el
+++ b/test/manual/cedet/cedet-utests.el
@@ -1,8 +1,8 @@
-;;; cedet-utests.el --- Run all unit tests in the CEDET suite.
+;;; cedet-utests.el --- Run all unit tests in the CEDET suite.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2022 Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
@@ -26,6 +26,18 @@
 ;; into one command.
 
 (require 'cedet)
+
+(defvar cedet-utest-directory
+  (let* ((C (file-name-directory (locate-library "cedet")))
+         (D (expand-file-name "../../test/manual/cedet/" C)))
+    D)
+  "Location of test files for this test suite.")
+
+(defvar cedet-utest-libs '("ede-tests"
+                           "semantic-tests"
+                           )
+  "List of test srcs that need to be loaded.")
+
 ;;; Code:
 (defvar cedet-utest-test-alist
   '(
@@ -34,30 +46,35 @@
     ;;
 
     ;; Test inversion
-    ("inversion" . inversion-unit-test)
+    ;; ("inversion" . inversion-unit-test) ; moved to automated suite
 
     ;; EZ Image dumping.
     ("ezimage associations" . ezimage-image-association-dump)
-    ("ezimage images" . ezimage-image-dump)
+    ("ezimage images" . (lambda ()
+                          (ezimage-image-dump)
+                          (kill-buffer "*Ezimage Images*")))
 
     ;; Pulse
     ("pulse interactive test" . (lambda () (pulse-test t)))
 
     ;; Files
-    ("cedet file conversion" . cedet-files-utest)
+    ;; ("cedet file conversion" . cedet-files-utest) ; moved to automated suite
 
     ;;
     ;; EIEIO
     ;;
-    ("eieio" . (lambda () (let ((lib (locate-library "eieio-tests.el"
-						     t)))
-			    (load-file lib))))
-    ("eieio: browser" . eieio-browse)
+
+    ("eieio: browser" . (lambda ()
+                          (eieio-browse)
+                          (kill-buffer "*EIEIO OBJECT BROWSE*")))
     ("eieio: custom" . (lambda ()
 			 (require 'eieio-custom)
-			 (customize-variable 'eieio-widget-test)))
+			 (customize-variable 'eieio-widget-test)
+                         (kill-buffer "*Customize Option: Eieio Widget Test*")
+                         ))
     ("eieio: chart" . (lambda ()
-			(if (cedet-utest-noninteractive)
+                        (require 'chart)
+			(if noninteractive
 			    (message " ** Skipping test in noninteractive mode.")
 			  (chart-test-it-all))))
     ;;
@@ -71,24 +88,27 @@
     ;; SEMANTIC
     ;;
     ("semantic: lex spp table write" . semantic-lex-spp-write-utest)
-    ("semantic: multi-lang parsing" . semantic-utest-main)
-    ("semantic: C preprocessor" . semantic-utest-c)
-    ("semantic: analyzer tests" . semantic-ia-utest)
+    ;;("semantic: multi-lang parsing" . semantic-utest-main)
+    ;;("semantic: C preprocessor" . semantic-utest-c) - Now in automated suite
+    ;;("semantic: analyzer tests" . semantic-ia-utest)
     ("semanticdb: data cache" . semantic-test-data-cache)
     ("semantic: throw-on-input" .
      (lambda ()
-       (if (cedet-utest-noninteractive)
+       (if noninteractive
 	   (message " ** Skipping test in noninteractive mode.")
 	 (semantic-test-throw-on-input))))
 
-    ("semantic: gcc: output parse test" . semantic-gcc-test-output-parser)
+    ;;("semantic: gcc: output parse test" . semantic-gcc-test-output-parser)  ; moved to automated suite
+
     ;;
     ;; SRECODE
     ;;
-    ("srecode: fields" . srecode-field-utest)
-    ("srecode: templates" . srecode-utest-template-output)
+
+    ;; TODO - fix the fields test
+    ;;("srecode: fields" . srecode-field-utest)  ; moved to automated suite
+    ;;("srecode: templates" . srecode-utest-template-output)
     ("srecode: show maps" . srecode-get-maps)
-    ("srecode: getset" . srecode-utest-getset-output)
+    ;;("srecode: getset" . srecode-utest-getset-output)
    )
   "Alist of all the tests in CEDET we should run.")
 
@@ -100,9 +120,11 @@
 EXIT-ON-ERROR causes the test suite to exit on an error, instead
 of just logging the error."
   (interactive)
-  (if (or (not (featurep 'semanticdb-mode))
-	  (not (semanticdb-minor-mode-p)))
-      (error "CEDET Tests require: M-x semantic-load-enable-minimum-features"))
+  (unless (and (fboundp 'semanticdb-minor-mode-p)
+               (semanticdb-minor-mode-p))
+    (error "CEDET Tests require semantic-mode to be enabled"))
+  (dolist (L cedet-utest-libs)
+    (load-file (expand-file-name (concat L ".el") cedet-utest-directory)))
   (cedet-utest-log-setup "ALL TESTS")
   (let ((tl cedet-utest-test-alist)
 	(notes nil)
@@ -126,7 +148,7 @@ of just logging the error."
       ;; Cleanup stray input and events that are in the way.
       ;; Not doing this causes sit-for to not refresh the screen.
       ;; Doing this causes the user to need to press keys more frequently.
-      (when (and (interactive-p) (input-pending-p))
+      (when (and (called-interactively-p 'interactive) (input-pending-p))
 	(if (fboundp 'read-event)
 	    (read-event)
 	  (read-char)))
@@ -145,18 +167,20 @@ of just logging the error."
 
 (defun cedet-utest-noninteractive ()
   "Return non-nil if running non-interactively."
-  (if (featurep 'xemacs)
-      (noninteractive)
-    noninteractive))
+  (declare (obsolete nil "27.1"))
+  noninteractive)
+
+(defvar srecode-map-save-file)
 
 ;;;###autoload
 (defun cedet-utest-batch ()
   "Run the CEDET unit test in BATCH mode."
-  (unless (cedet-utest-noninteractive)
+  (unless noninteractive
     (error "`cedet-utest-batch' is to be used only with -batch"))
   (condition-case err
       (when (catch 'cedet-utest-exit-on-error
 	      ;; Get basic semantic features up.
+	      ;; FIXME: I can't see any such function in our code!
 	      (semantic-load-enable-minimum-features)
 	      ;; Disables all caches related to semantic DB so all
 	      ;; tests run as if we have bootstrapped CEDET for the
@@ -200,7 +224,7 @@ of just logging the error."
   "Setup a frame and buffer for unit testing.
 Optional argument TITLE is the title of this testing session."
   (setq cedet-utest-log-timer (current-time))
-  (if (cedet-utest-noninteractive)
+  (if noninteractive
       (message "\n>> Setting up %s tests to run @ %s\n"
 	       (or title "")
 	       (current-time-string))
@@ -210,8 +234,7 @@ Optional argument TITLE is the title of this testing session."
       (setq cedet-utest-frame (make-frame cedet-utest-frame-parameters)))
     (when (or (not cedet-utest-buffer) (not (buffer-live-p cedet-utest-buffer)))
       (setq cedet-utest-buffer (get-buffer-create "*CEDET utest log*")))
-    (save-excursion
-      (set-buffer cedet-utest-buffer)
+    (with-current-buffer cedet-utest-buffer
       (setq cedet-utest-last-log-item nil)
       (when (not cedet-running-master-tests)
 	(erase-buffer))
@@ -229,11 +252,9 @@ Optional argument TITLE is the title of this testing session."
 (defun cedet-utest-elapsed-time (start end)
   "Copied from elp.el.  Was elp-elapsed-time.
 Argument START and END bound the time being calculated."
-  (+ (* (- (car end) (car start)) 65536.0)
-     (- (car (cdr end)) (car (cdr start)))
-     (/ (- (car (cdr (cdr end))) (car (cdr (cdr start)))) 1000000.0)))
+  (float-time (time-subtract start end)))
 
-(defun cedet-utest-log-shutdown (title &optional errorcondition)
+(defun cedet-utest-log-shutdown (title &optional _errorcondition)
   "Shut-down a larger test suite.
 TITLE is the section that is done.
 ERRORCONDITION is some error that may have occurred during testing."
@@ -245,7 +266,7 @@ ERRORCONDITION is some error that may have occurred during testing."
 
 (defun cedet-utest-log-shutdown-msg (title startime endtime)
   "Show a shutdown message with TITLE, STARTIME, and ENDTIME."
-  (if (cedet-utest-noninteractive)
+  (if noninteractive
       (progn
 	(message "\n>> Test Suite %s ended at @ %s"
 		 title
@@ -253,8 +274,7 @@ ERRORCONDITION is some error that may have occurred during testing."
 	(message "     Elapsed Time %.2f Seconds\n"
 		 (cedet-utest-elapsed-time startime endtime)))
 
-    (save-excursion
-      (set-buffer cedet-utest-buffer)
+    (with-current-buffer cedet-utest-buffer
       (goto-char (point-max))
       (insert "\n>> Test Suite " title " ended at @ "
 	      (format-time-string "%c" endtime) "\n"
@@ -266,7 +286,7 @@ ERRORCONDITION is some error that may have occurred during testing."
 
 (defun cedet-utest-show-log-end ()
   "Show the end of the current unit test log."
-  (unless (cedet-utest-noninteractive)
+  (unless noninteractive
     (let* ((cb (current-buffer))
 	   (cf (selected-frame))
 	   (bw (or (get-buffer-window cedet-utest-buffer t)
@@ -282,14 +302,13 @@ ERRORCONDITION is some error that may have occurred during testing."
 
 (defun cedet-utest-post-command-hook ()
   "Hook run after the current log command was run."
-    (if (cedet-utest-noninteractive)
+    (if noninteractive
 	(message "")
-      (save-excursion
-	(set-buffer cedet-utest-buffer)
+      (with-current-buffer cedet-utest-buffer
 	(goto-char (point-max))
 	(insert "\n\n")))
     (setq cedet-utest-last-log-item nil)
-    (remove-hook 'post-command-hook 'cedet-utest-post-command-hook)
+    (remove-hook 'post-command-hook #'cedet-utest-post-command-hook)
     )
 
 (defun cedet-utest-add-log-item-start (item)
@@ -297,12 +316,11 @@ ERRORCONDITION is some error that may have occurred during testing."
   (unless (equal item cedet-utest-last-log-item)
     (setq cedet-utest-last-log-item item)
     ;; This next line makes sure we clear out status during logging.
-    (add-hook 'post-command-hook 'cedet-utest-post-command-hook)
+    (add-hook 'post-command-hook #'cedet-utest-post-command-hook)
 
-    (if (cedet-utest-noninteractive)
+    (if noninteractive
 	(message " - Running %s ..." item)
-      (save-excursion
-	(set-buffer cedet-utest-buffer)
+      (with-current-buffer cedet-utest-buffer
 	(goto-char (point-max))
 	(when (not (bolp)) (insert "\n"))
 	(insert "Running " item " ... ")
@@ -316,14 +334,13 @@ ERRORCONDITION is some error that may have occurred during testing."
 Apply NOTES to the doneness of the log.
 Apply ERR if there was an error in previous item.
 Optional argument PRECR indicates to prefix the done msg w/ a newline."
-  (if (cedet-utest-noninteractive)
+  (if noninteractive
       ;; Non-interactive-mode - show a message.
       (if notes
 	  (message "   * %s {%s}" (or err "done") notes)
 	(message "   * %s" (or err "done")))
     ;; Interactive-mode - insert into the buffer.
-    (save-excursion
-      (set-buffer cedet-utest-buffer)
+    (with-current-buffer cedet-utest-buffer
       (goto-char (point-max))
       (when precr (insert "\n"))
       (if err
@@ -353,132 +370,42 @@ Optional argument PRECR indicates to prefix the done msg w/ a newline."
     (cedet-utest-add-log-item-start testname)
     ))
 
-(defun cedet-utest-log(format &rest args)
+(defun cedet-utest-log (format &rest args)
   "Log the text string FORMAT.
 The rest of the ARGS are used to fill in FORMAT with `format'."
-  (if (cedet-utest-noninteractive)
-      (apply 'message format args)
-    (save-excursion
-      (set-buffer cedet-utest-buffer)
+  (if noninteractive
+      (apply #'message format args)
+    (with-current-buffer cedet-utest-buffer
       (goto-char (point-max))
       (when (not (bolp)) (insert "\n"))
-      (insert (apply 'format format args))
+      (insert (apply #'format format args))
       (insert "\n")
       (sit-for 0)
       ))
   (cedet-utest-show-log-end)
   )
 
-;;; Inversion tests
-
-(defun inversion-unit-test ()
-  "Test inversion to make sure it can identify different version strings."
-  (interactive)
-  (let ((c1 (inversion-package-version 'inversion))
-	(c1i (inversion-package-incompatibility-version 'inversion))
-	(c2 (inversion-decode-version  "1.3alpha2"))
-	(c3 (inversion-decode-version  "1.3beta4"))
-	(c4 (inversion-decode-version  "1.3 beta5"))
-	(c5 (inversion-decode-version  "1.3.4"))
-	(c6 (inversion-decode-version  "2.3alpha"))
-	(c7 (inversion-decode-version  "1.3"))
-	(c8 (inversion-decode-version  "1.3pre1"))
-	(c9 (inversion-decode-version  "2.4 (patch 2)"))
-	(c10 (inversion-decode-version "2.4 (patch 3)"))
-	(c11 (inversion-decode-version "2.4.2.1"))
-	(c12 (inversion-decode-version "2.4.2.2"))
-	)
-    (if (not (and
-	      (inversion-= c1 c1)
-	      (inversion-< c1i c1)
-	      (inversion-< c2 c3)
-	      (inversion-< c3 c4)
-	      (inversion-< c4 c5)
-	      (inversion-< c5 c6)
-	      (inversion-< c2 c4)
-	      (inversion-< c2 c5)
-	      (inversion-< c2 c6)
-	      (inversion-< c3 c5)
-	      (inversion-< c3 c6)
-	      (inversion-< c7 c6)
-	      (inversion-< c4 c7)
-	      (inversion-< c2 c7)
-	      (inversion-< c8 c6)
-	      (inversion-< c8 c7)
-	      (inversion-< c4 c8)
-	      (inversion-< c2 c8)
-	      (inversion-< c9 c10)
-	      (inversion-< c10 c11)
-	      (inversion-< c11 c12)
-	      ;; Negatives
-	      (not (inversion-< c3 c2))
-	      (not (inversion-< c4 c3))
-	      (not (inversion-< c5 c4))
-	      (not (inversion-< c6 c5))
-	      (not (inversion-< c7 c2))
-	      (not (inversion-< c7 c8))
-	      (not (inversion-< c12 c11))
-	      ;; Test the tester on inversion
-	      (not (inversion-test 'inversion inversion-version))
-	      ;; Test that we throw an error
-	      (inversion-test 'inversion "0.0.0")
-	      (inversion-test 'inversion "1000.0")
-	      ))
-	(error "Inversion tests failed")
-      (message "Inversion tests passed."))))
-
-;;; cedet-files unit test
-
-(defvar cedet-files-utest-list
-  '(
-    ( "/home/me/src/myproj/src/foo.c" . "!home!me!src!myproj!src!foo.c" )
-    ( "c:/work/myproj/foo.el" . "!drive_c!work!myproj!foo.el" )
-    ( "//windows/proj/foo.java" . "!!windows!proj!foo.java" )
-    ( "/home/me/proj!bang/foo.c" . "!home!me!proj!!bang!foo.c" )
-    )
-  "List of different file names to test.
-Each entry is a cons cell of ( FNAME . CONVERTED )
-where FNAME is some file name, and CONVERTED is what it should be
-converted into.")
-
-(defun cedet-files-utest ()
-  "Test out some file name conversions."
-  (interactive)
-  (let ((idx 0))
-    (dolist (FT cedet-files-utest-list)
-
-      (setq idx (+ idx 1))
-
-      (let ((dir->file (cedet-directory-name-to-file-name (car FT) t))
-	    (file->dir (cedet-file-name-to-directory-name (cdr FT) t))
-	    )
-
-	(unless (string= (cdr FT) dir->file)
-	  (error "Failed: %d.  Found: %S Wanted: %S"
-		 idx dir->file (cdr FT))
-	  )
-
-	(unless (string= file->dir (car FT))
-	  (error "Failed: %d.  Found: %S Wanted: %S"
-		 idx file->dir (car FT)))))))
-
 ;;; pulse test
 
 (defun pulse-test (&optional no-error)
   "Test the lightening function for pulsing a line.
 When optional NO-ERROR don't throw an error if we can't run tests."
   (interactive)
-  (if (or (not pulse-flag) (not (pulse-available-p)))
+  (if (not (and (bound-and-true-p pulse-flag)
+                (fboundp 'pulse-available-p)
+                (pulse-available-p)))
       (if no-error
 	  nil
 	(error (concat "Pulse test only works on versions of Emacs"
 		       " that support pulsing")))
+    (declare-function pulse-momentary-highlight-overlay
+                      "pulse.el" (o &optional face))
     ;; Run the tests
-    (when (interactive-p)
+    (when (called-interactively-p 'interactive)
       (message "<Press a key> Pulse one line.")
       (read-char))
     (pulse-momentary-highlight-one-line (point))
-    (when (interactive-p)
+    (when (called-interactively-p 'interactive)
       (message "<Press a key> Pulse a region.")
       (read-char))
     (pulse-momentary-highlight-region (point)
@@ -487,11 +414,11 @@ When optional NO-ERROR don't throw an error if we can't run tests."
 					    (forward-char 30)
 					  (error nil))
 					(point)))
-    (when (interactive-p)
+    (when (called-interactively-p 'interactive)
       (message "<Press a key> Pulse line a specific color.")
       (read-char))
-    (pulse-momentary-highlight-one-line (point) 'modeline)
-    (when (interactive-p)
+    (pulse-momentary-highlight-one-line (point) 'mode-line)
+    (when (called-interactively-p 'interactive)
       (message "<Press a key> Pulse a pre-existing overlay.")
       (read-char))
     (let* ((start (point-at-bol))
@@ -507,7 +434,7 @@ When optional NO-ERROR don't throw an error if we can't run tests."
 	  (delete-overlay o)
 	(error "Non-temporary overlay was deleted!"))
       )
-    (when (interactive-p)
+    (when (called-interactively-p 'interactive)
       (message "Done!"))))
 
 (provide 'cedet-utests)