[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 128f803 2/7: Update CEDET manual tests so that they
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] master 128f803 2/7: Update CEDET manual tests so that they run. |
Date: |
Tue, 15 Oct 2019 11:08:24 -0400 (EDT) |
branch: master
commit 128f803197c319807de838550270725ecdedbc7c
Author: Eric Ludlam <address@hidden>
Commit: Stefan Monnier <address@hidden>
Update CEDET manual tests so that they run.
To run visit test/manual/cedet/cedet-utests.el
M-x eval-buffer
M-x cedet-utest
Author: Eric Ludlam <address@hidden>
---
lisp/emacs-lisp/chart.el | 2 ++
test/manual/cedet/cedet-utests.el | 56 ++++++++++++++++++++++++++-----------
test/manual/cedet/semantic-tests.el | 17 ++++++-----
test/manual/cedet/srecode-tests.el | 2 +-
4 files changed, 53 insertions(+), 24 deletions(-)
diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el
index 124ede1..e4b41f4 100644
--- a/lisp/emacs-lisp/chart.el
+++ b/lisp/emacs-lisp/chart.el
@@ -607,6 +607,8 @@ SORT-PRED if desired."
(chart-bar-quickie 'vertical "Test Bar Chart"
'( "U1" "ME2" "C3" "B4" "QT" "EZ") "Items"
'( 5 -10 23 20 30 -3) "Values")
+ (if (not (called-interactively-p 'any))
+ (kill-buffer "*Test Bar Chart*"))
)
;;; Sample utility function
diff --git a/test/manual/cedet/cedet-utests.el
b/test/manual/cedet/cedet-utests.el
index b8f0888..369dff9 100644
--- a/test/manual/cedet/cedet-utests.el
+++ b/test/manual/cedet/cedet-utests.el
@@ -26,6 +26,20 @@
;; into one command.
(require 'cedet)
+(require 'inversion)
+
+(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"
+ "srecode-tests"
+ )
+ "List of test srcs that need to be loaded.")
+
;;; Code:
(defvar cedet-utest-test-alist
'(
@@ -38,7 +52,9 @@
;; 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)))
@@ -49,14 +65,17 @@
;;
;; 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 ()
+ (require 'chart)
(if noninteractive
(message " ** Skipping test in noninteractive
mode.")
(chart-test-it-all))))
@@ -71,9 +90,9 @@
;; 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 ()
@@ -81,14 +100,17 @@
(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)
+
;;
;; SRECODE
;;
- ("srecode: fields" . srecode-field-utest)
- ("srecode: templates" . srecode-utest-template-output)
+
+ ;; TODO - fix the fields test
+ ;;("srecode: fields" . srecode-field-utest)
+ ;;("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 +122,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))
+ (if (or (not (featurep 'semantic/db-mode))
(not (semanticdb-minor-mode-p)))
- (error "CEDET Tests require: M-x semantic-load-enable-minimum-features"))
+ (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)
@@ -489,7 +513,7 @@ When optional NO-ERROR don't throw an error if we can't run
tests."
(when (interactive-p)
(message "<Press a key> Pulse line a specific color.")
(read-char))
- (pulse-momentary-highlight-one-line (point) 'modeline)
+ (pulse-momentary-highlight-one-line (point) 'mode-line)
(when (interactive-p)
(message "<Press a key> Pulse a pre-existing overlay.")
(read-char))
diff --git a/test/manual/cedet/semantic-tests.el
b/test/manual/cedet/semantic-tests.el
index 9109d66..ce6467d 100644
--- a/test/manual/cedet/semantic-tests.el
+++ b/test/manual/cedet/semantic-tests.el
@@ -228,13 +228,16 @@ Analyze the area between BEG and END."
(defun semantic-lex-spp-write-utest ()
"Unit test using the test spp file to test the slot write fcn."
(interactive)
- (let* ((sem (locate-library "semantic-lex-spp.el"))
- (dir (file-name-directory sem)))
- (save-excursion
- (set-buffer (find-file-noselect
- (expand-file-name "tests/testsppreplace.c"
- dir)))
- (semantic-lex-spp-write-test))))
+ (save-excursion
+ (let ((buff (find-file-noselect
+ (expand-file-name "tests/testsppreplace.c"
+ cedet-utest-directory))))
+ (set-buffer buff)
+ (semantic-lex-spp-write-test)
+ (kill-buffer buff)
+ (when (not (interactive-p))
+ (kill-buffer "*SPP Write Test*"))
+ )))
;;; From semantic-tag-write:
diff --git a/test/manual/cedet/srecode-tests.el
b/test/manual/cedet/srecode-tests.el
index 94c5dbb..355bc07 100644
--- a/test/manual/cedet/srecode-tests.el
+++ b/test/manual/cedet/srecode-tests.el
@@ -243,7 +243,7 @@ It is filled with some text."
;;; From srecode-document:
-(require 'srecode/doc)
+(require 'srecode/document)
(defun srecode-document-function-comment-extract-test ()
"Test old comment extraction.
- [Emacs-diffs] master updated (68df7d7 -> 6ac99eb), Stefan Monnier, 2019/10/15
- [Emacs-diffs] master 128f803 2/7: Update CEDET manual tests so that they run.,
Stefan Monnier <=
- [Emacs-diffs] master 26f5edf 5/7: Adapt the CEDET SRecoder getset tests to use ERT, Stefan Monnier, 2019/10/15
- [Emacs-diffs] master 6ac99eb 7/7: * lisp/rect.el (string-rectangle): Inherit input method in minibuffer, Stefan Monnier, 2019/10/15
- [Emacs-diffs] master 3f8915a 3/7: Copy CEDET/Semantic's tag formatter test suite to be an, Stefan Monnier, 2019/10/15
- [Emacs-diffs] master 57a786d 4/7: Adapt the CEDET SRecoder template test to use ERT, Stefan Monnier, 2019/10/15
- [Emacs-diffs] master 06114b7 6/7: Fix test data broken by removing trailing whitespace., Stefan Monnier, 2019/10/15
- [Emacs-diffs] master a99812e 1/7: Convert manual CEDET tests from test/manual/cedet to be, Stefan Monnier, 2019/10/15