forked from emacs-mirror/emacs
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Convert many manual cedet tests to ert
* test/manual/cedet/cedet-utests.el (cedet-files-utest): Move test from here... * test/lisp/cedet/cedet-files-tests.el: ...to this new file. * test/manual/cedet/srecode-tests.el (srecode-document-function-comment-extract-test): Move test from here... * test/lisp/cedet/srecode/document-tests.el: ...to this new file. * test/manual/cedet/cedet-utests.el (inversion-unit-test): Move test from here... * test/lisp/cedet/inversion-tests.el: ...to this new file. * test/manual/cedet/semantic-tests.el (semantic-gcc-test-output-parser): Move test from here... * test/lisp/cedet/semantic/bovine/gcc-tests.el: ...to this new file. * test/manual/cedet/semantic-tests.el (semantic-test-data-cache): Move test from here... * test/lisp/cedet/semantic/fw-tests.el: ...to this new file.
- Loading branch information
Showing
8 changed files
with
393 additions
and
270 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
;;; cedet-files-tests.el --- Tests for cedet-files.el -*- lexical-binding:t -*- | ||
|
||
;; Copyright (C) 2008-2021 Free Software Foundation, Inc. | ||
|
||
;; Author: Eric M. Ludlam <zappo@gnu.org> | ||
|
||
;; 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: | ||
|
||
;; Moved here from test/manual/cedet/cedet-utests.el | ||
|
||
;;; Code: | ||
|
||
(require 'ert) | ||
(require 'cedet-files) | ||
|
||
(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.") | ||
|
||
(ert-deftest cedet-files-utest () | ||
"Test out some file name conversions." | ||
(interactive) | ||
(dolist (FT cedet-files-utest-list) | ||
(let ((dir->file (cedet-directory-name-to-file-name (car FT) t)) | ||
(file->dir (cedet-file-name-to-directory-name (cdr FT) t))) | ||
(should (string= (cdr FT) dir->file)) | ||
(should (string= file->dir (car FT)))))) | ||
|
||
(provide 'cedet-files-tests) | ||
|
||
;;; cedet-files-tests.el ends here |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
;;; inversion-tests.el --- Tests for inversion.el -*- lexical-binding:t -*- | ||
|
||
;; Copyright (C) 2008-2021 Free Software Foundation, Inc. | ||
|
||
;; Author: Eric M. Ludlam <zappo@gnu.org> | ||
|
||
;; 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: | ||
|
||
;; Moved here from test/manual/cedet/cedet-utests.el | ||
|
||
;;; Code: | ||
|
||
(require 'inversion) | ||
(require 'ert) | ||
|
||
(ert-deftest 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"))) | ||
(should (inversion-= c1 c1)) | ||
(should (inversion-< c1i c1)) | ||
(should (inversion-< c2 c3)) | ||
(should (inversion-< c3 c4)) | ||
(should (inversion-< c4 c5)) | ||
(should (inversion-< c5 c6)) | ||
(should (inversion-< c2 c4)) | ||
(should (inversion-< c2 c5)) | ||
(should (inversion-< c2 c6)) | ||
(should (inversion-< c3 c5)) | ||
(should (inversion-< c3 c6)) | ||
(should (inversion-< c7 c6)) | ||
(should (inversion-< c4 c7)) | ||
(should (inversion-< c2 c7)) | ||
(should (inversion-< c8 c6)) | ||
(should (inversion-< c8 c7)) | ||
(should (inversion-< c4 c8)) | ||
(should (inversion-< c2 c8)) | ||
(should (inversion-< c9 c10)) | ||
(should (inversion-< c10 c11)) | ||
(should (inversion-< c11 c12)) | ||
;; Negatives | ||
(should-not (inversion-< c3 c2)) | ||
(should-not (inversion-< c4 c3)) | ||
(should-not (inversion-< c5 c4)) | ||
(should-not (inversion-< c6 c5)) | ||
(should-not (inversion-< c7 c2)) | ||
(should-not (inversion-< c7 c8)) | ||
(should-not (inversion-< c12 c11)) | ||
;; Test the tester on inversion | ||
(should-not (inversion-test 'inversion inversion-version)) | ||
(should (stringp (inversion-test 'inversion "0.0.0"))) | ||
(should (stringp (inversion-test 'inversion "1000.0"))))) | ||
|
||
;;; inversion-tests.el ends here |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,129 @@ | ||
;;; gcc-tests.el --- Tests for semantic/bovine/gcc.el -*- lexical-binding:t -*- | ||
|
||
;;; Copyright (C) 2003-2004, 2007-2021 Free Software Foundation, Inc. | ||
|
||
;; Author: Eric M. Ludlam <zappo@gnu.org> | ||
|
||
;; 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: | ||
|
||
;; Moved here from test/manual/cedet/semantic-tests.el | ||
|
||
;;; Code: | ||
|
||
(require 'ert) | ||
(require 'semantic/bovine/gcc) | ||
|
||
;;; From bovine-gcc: | ||
|
||
;; Example output of "gcc -v" | ||
(defvar semantic-gcc-test-strings | ||
'(;; My old box: | ||
"Reading specs from /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/specs | ||
Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --disable-checking --with-system-zlib --enable-__cxa_atexit --host=i386-redhat-linux | ||
Thread model: posix | ||
gcc version 3.2.2 20030222 (Red Hat Linux 3.2.2-5)" | ||
;; Alex Ott: | ||
"Using built-in specs. | ||
Target: i486-linux-gnu | ||
Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.3.1-9ubuntu1' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 --program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --enable-targets=all --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu | ||
Thread model: posix | ||
gcc version 4.3.1 (Ubuntu 4.3.1-9ubuntu1)" | ||
;; My debian box: | ||
"Using built-in specs. | ||
Target: x86_64-unknown-linux-gnu | ||
Configured with: ../../../sources/gcc/configure --prefix=/usr/local/glibc-2.3.6/x86_64/apps/gcc-4.2.3 --with-gmp=/usr/local/gcc/gmp --with-mpfr=/usr/local/gcc/mpfr --enable-languages=c,c++,fortran --with-as=/usr/local/glibc-2.3.6/x86_64/apps/gcc-4.2.3/bin/as --with-ld=/usr/local/glibc-2.3.6/x86_64/apps/gcc-4.2.3/bin/ld --disable-multilib | ||
Thread model: posix | ||
gcc version 4.2.3" | ||
;; My mac: | ||
"Using built-in specs. | ||
Target: i686-apple-darwin8 | ||
Configured with: /private/var/tmp/gcc/gcc-5341.obj~1/src/configure --disable-checking -enable-werror --prefix=/usr --mandir=/share/man --enable-languages=c,objc,c++,obj-c++ --program-transform-name=/^[cg][^.-]*$/s/$/-4.0/ --with-gxx-include-dir=/include/c++/4.0.0 --with-slibdir=/usr/lib --build=powerpc-apple-darwin8 --with-arch=pentium-m --with-tune=prescott --program-prefix= --host=i686-apple-darwin8 --target=i686-apple-darwin8 | ||
Thread model: posix | ||
gcc version 4.0.1 (Apple Computer, Inc. build 5341)" | ||
;; Ubuntu Intrepid | ||
"Using built-in specs. | ||
Target: x86_64-linux-gnu | ||
Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.3.2-1ubuntu12' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 --program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu | ||
Thread model: posix | ||
gcc version 4.3.2 (Ubuntu 4.3.2-1ubuntu12)" | ||
;; Red Hat EL4 | ||
"Reading specs from /usr/lib/gcc/x86_64-redhat-linux/3.4.6/specs | ||
Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --disable-checking --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-java-awt=gtk --host=x86_64-redhat-linux | ||
Thread model: posix | ||
gcc version 3.4.6 20060404 (Red Hat 3.4.6-10)" | ||
;; Red Hat EL5 | ||
"Using built-in specs. | ||
Target: x86_64-redhat-linux | ||
Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-libgcj-multifile --enable-languages=c,c++,objc,obj-c++,java,fortran,ada --enable-java-awt=gtk --disable-dssi --enable-plugin --with-java-home=/usr/lib/jvm/java-1.4.2-gcj-1.4.2.0/jre --with-cpu=generic --host=x86_64-redhat-linux | ||
Thread model: posix | ||
gcc version 4.1.2 20080704 (Red Hat 4.1.2-44)" | ||
;; David Engster's german gcc on ubuntu 4.3 | ||
"Es werden eingebaute Spezifikationen verwendet. | ||
Ziel: i486-linux-gnu | ||
Konfiguriert mit: ../src/configure -v --with-pkgversion='Ubuntu 4.3.2-1ubuntu12' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 --program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --enable-targets=all --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu | ||
Thread-Modell: posix | ||
gcc-Version 4.3.2 (Ubuntu 4.3.2-1ubuntu12)" | ||
;; Damien Deville bsd | ||
"Using built-in specs. | ||
Target: i386-undermydesk-freebsd | ||
Configured with: FreeBSD/i386 system compiler | ||
Thread model: posix | ||
gcc version 4.2.1 20070719 [FreeBSD]" | ||
) | ||
"A bunch of sample gcc -v outputs from different machines.") | ||
|
||
(defvar semantic-gcc-test-strings-fail | ||
'(;; A really old solaris box I found | ||
"Reading specs from /usr/local/gcc-2.95.2/lib/gcc-lib/sparc-sun-solaris2.6/2.95.2/specs | ||
gcc version 2.95.2 19991024 (release)" | ||
) | ||
"A bunch of sample gcc -v outputs that fail to provide the info we want.") | ||
|
||
(defun semantic-gcc-test-output-parser () | ||
"Test the output parser against some collected strings." | ||
(dolist (S semantic-gcc-test-strings) | ||
(let* ((fields (semantic-gcc-fields S)) | ||
(v (cdr (assoc 'version fields))) | ||
(h (or (cdr (assoc 'target fields)) | ||
(cdr (assoc '--target fields)) | ||
(cdr (assoc '--host fields)))) | ||
(p (cdr (assoc '--prefix fields)))) | ||
;; No longer test for prefixes. | ||
(when (not (and v h)) | ||
(let ((strs (split-string S "\n"))) | ||
(error "Test failed on %S\nV H P:\n%S %S %S" (car strs) v h p))))) | ||
(dolist (S semantic-gcc-test-strings-fail) | ||
(let* ((fields (semantic-gcc-fields S)) | ||
(v (cdr (assoc 'version fields))) | ||
(h (or (cdr (assoc '--host fields)) | ||
(cdr (assoc 'target fields)))) | ||
(p (cdr (assoc '--prefix fields))) | ||
) | ||
(when (and v h p) | ||
(error "Negative test failed on %S" S))))) | ||
|
||
(ert-deftest semantic-gcc-test-output-parser () | ||
(semantic-gcc-test-output-parser)) | ||
|
||
(ert-deftest semantic-gcc-test-output-parser-this-machine () | ||
"Test the output parser against the machine currently running Emacs." | ||
(skip-unless (executable-find "gcc")) | ||
(let ((semantic-gcc-test-strings (list (semantic-gcc-query "gcc" "-v")))) | ||
(semantic-gcc-test-output-parser))) | ||
|
||
;;; gcc-tests.el ends here |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
;;; fw-tests.el --- Tests for semantic/fw.el -*- lexical-binding:t -*- | ||
|
||
;;; Copyright (C) 2003-2004, 2007-2021 Free Software Foundation, Inc. | ||
|
||
;; Author: Eric M. Ludlam <zappo@gnu.org> | ||
|
||
;; 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: | ||
|
||
;; Moved here from test/manual/cedet/semantic-tests.el | ||
|
||
;;; Code: | ||
|
||
(require 'ert) | ||
(require 'semantic/fw) | ||
|
||
;;; From semantic-fw: | ||
|
||
(ert-deftest semantic-test-data-cache () | ||
"Test the data cache." | ||
(let ((data '(a b c))) | ||
(with-current-buffer (get-buffer-create " *semantic-test-data-cache*") | ||
(erase-buffer) | ||
(insert "The Moose is Loose") | ||
(goto-char (point-min)) | ||
(semantic-cache-data-to-buffer (current-buffer) (point) (+ (point) 5) | ||
data 'moose 'exit-cache-zone) | ||
;; retrieve cached data | ||
(should (equal (semantic-get-cache-data 'moose) data))))) | ||
|
||
;;; gw-tests.el ends here |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
;;; document-tests.el --- Tests for srecode/document.el -*- lexical-binding:t -*- | ||
|
||
;; Copyright (C) 2008-2021 Free Software Foundation, Inc. | ||
|
||
;; Author: Eric M. Ludlam <zappo@gnu.org> | ||
|
||
;; 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: | ||
|
||
;; Extracted from srecode-document.el in the CEDET distribution. | ||
|
||
;; Converted to ert from test/manual/cedet/srecode-tests.el | ||
|
||
;;; Code: | ||
|
||
(require 'ert) | ||
(require 'srecode/document) | ||
|
||
;; FIXME: This test fails even before conversion to ert. | ||
(ert-deftest srecode-document-function-comment-extract-test () | ||
"Test old comment extraction. | ||
Dump out the extracted dictionary." | ||
:tags '(:unstable) | ||
(interactive) | ||
|
||
(srecode-load-tables-for-mode major-mode) | ||
(srecode-load-tables-for-mode major-mode 'document) | ||
|
||
(should (srecode-table)) | ||
;; (error "No template table found for mode %s" major-mode) | ||
|
||
(let* ((temp (srecode-template-get-table (srecode-table) | ||
"function-comment" | ||
"declaration" | ||
'document)) | ||
(fcn-in (semantic-current-tag))) | ||
|
||
(should temp) | ||
;; (error "No templates for function comments") | ||
|
||
;; Try to figure out the tag we want to use. | ||
(should fcn-in) | ||
(should (semantic-tag-of-class-p fcn-in 'function)) | ||
;; (error "No tag of class 'function to insert comment for") | ||
|
||
(let ((lextok (semantic-documentation-comment-preceding-tag fcn-in 'lex))) | ||
|
||
(should lextok) | ||
;; (error "No comment to attempt an extraction") | ||
|
||
(let ((s (semantic-lex-token-start lextok)) | ||
(e (semantic-lex-token-end lextok)) | ||
(extract nil)) | ||
|
||
(pulse-momentary-highlight-region s e) | ||
|
||
;; Extract text from the existing comment. | ||
(setq extract (srecode-extract temp s e)) | ||
|
||
(with-output-to-temp-buffer "*SRECODE DUMP*" | ||
(princ "EXTRACTED DICTIONARY FOR ") | ||
(princ (semantic-tag-name fcn-in)) | ||
(princ "\n--------------------------------------------\n") | ||
(srecode-dump extract)))))) | ||
|
||
;;; document-tests.el ends here |
Oops, something went wrong.