From 92e5b41c7c5898820356fc66456804a45bbe7852 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 5 Aug 2016 13:31:10 -0700 Subject: Spelling and minor grammar fixes * test/file-organization.org: Rename from test/file-organisation.org. --- test/file-organisation.org | 54 -------------------------------------- test/file-organization.org | 54 ++++++++++++++++++++++++++++++++++++++ test/lisp/emulation/viper-tests.el | 6 ++--- test/src/regex-tests.el | 10 +++---- 4 files changed, 62 insertions(+), 62 deletions(-) delete mode 100644 test/file-organisation.org create mode 100644 test/file-organization.org (limited to 'test') diff --git a/test/file-organisation.org b/test/file-organisation.org deleted file mode 100644 index 226e12d533..0000000000 --- a/test/file-organisation.org +++ /dev/null @@ -1,54 +0,0 @@ -#+TITLE: The Location of Emacs-Lisp Tests - - - -* The Main Emacs Repository - -The Emacs repository contains a very large number of Emacs-Lisp files, many of -which pre-date both formal package support for Emacs and automated unit -testing. - -All paths are relative to the Emacs root directory. - -** Source - -Lisp files are stored in the ~lisp~ directory or its sub-directories. -Sub-directories are in many cases themed after packages (~gnus~, ~org~, -~calc~), related functionality (~net~, ~emacs-lisp~, ~progmodes~) or status -(~obsolete~). - -C source is stored in the ~src~ directory, which is flat. - -** Test Files - -Automated tests should be stored in the ~test/automated/lisp~ directory. Tests -should reflect the directory structure of the source tree; so tests for files -in the ~emacs-lisp~ source directory should reside in the -~test/lisp/emacs-lisp~ directory. - -Tests should normally reside in a file with ~-tests~ added to the name of -the tested source file; hence ~ert.el~ is tested in ~ert-tests.el~, or -~pcase.el~ is tested in ~pcase-tests.el~. Exceptionally, tests for a -single feature may be placed into multiple files of any name which are -themselves placed in a directory named after the feature with ~-tests~ -appended, such as ~/test/lisp/emacs-lisp/eieio-tests~ - -Where features of the C source are tested using Emacs-Lisp test files, these -should reside in ~/test/src~ and be named after the C file. - -A few test suites which predate this scheme and do not fit cleanly -into it are placed in ~/test/lisp/legacy~. - -There are also some test materials that cannot be run automatically -(i.e. via ert). These should be placed in ~/test/manual~ - -** Resource Files - -Resource files for tests (containing test data) should reside in a directory -named after the feature with a ~-resources~ suffix, and located in the same -directory as the feature. Hence, the lisp file ~flymake.el~ should have test -files in ~/test/automated/lisp/progmodes/flymake-tests.el~ should reside in a -directory called ~/test/automated/lisp/progmodes/flymake-resources~. - -No guidance is given for the organization of resource files inside the -~-resource~ directory; files can be organized at the author's discretion. diff --git a/test/file-organization.org b/test/file-organization.org new file mode 100644 index 0000000000..226e12d533 --- /dev/null +++ b/test/file-organization.org @@ -0,0 +1,54 @@ +#+TITLE: The Location of Emacs-Lisp Tests + + + +* The Main Emacs Repository + +The Emacs repository contains a very large number of Emacs-Lisp files, many of +which pre-date both formal package support for Emacs and automated unit +testing. + +All paths are relative to the Emacs root directory. + +** Source + +Lisp files are stored in the ~lisp~ directory or its sub-directories. +Sub-directories are in many cases themed after packages (~gnus~, ~org~, +~calc~), related functionality (~net~, ~emacs-lisp~, ~progmodes~) or status +(~obsolete~). + +C source is stored in the ~src~ directory, which is flat. + +** Test Files + +Automated tests should be stored in the ~test/automated/lisp~ directory. Tests +should reflect the directory structure of the source tree; so tests for files +in the ~emacs-lisp~ source directory should reside in the +~test/lisp/emacs-lisp~ directory. + +Tests should normally reside in a file with ~-tests~ added to the name of +the tested source file; hence ~ert.el~ is tested in ~ert-tests.el~, or +~pcase.el~ is tested in ~pcase-tests.el~. Exceptionally, tests for a +single feature may be placed into multiple files of any name which are +themselves placed in a directory named after the feature with ~-tests~ +appended, such as ~/test/lisp/emacs-lisp/eieio-tests~ + +Where features of the C source are tested using Emacs-Lisp test files, these +should reside in ~/test/src~ and be named after the C file. + +A few test suites which predate this scheme and do not fit cleanly +into it are placed in ~/test/lisp/legacy~. + +There are also some test materials that cannot be run automatically +(i.e. via ert). These should be placed in ~/test/manual~ + +** Resource Files + +Resource files for tests (containing test data) should reside in a directory +named after the feature with a ~-resources~ suffix, and located in the same +directory as the feature. Hence, the lisp file ~flymake.el~ should have test +files in ~/test/automated/lisp/progmodes/flymake-tests.el~ should reside in a +directory called ~/test/automated/lisp/progmodes/flymake-resources~. + +No guidance is given for the organization of resource files inside the +~-resource~ directory; files can be organized at the author's discretion. diff --git a/test/lisp/emulation/viper-tests.el b/test/lisp/emulation/viper-tests.el index 0d6095b2c9..2c63b24fae 100644 --- a/test/lisp/emulation/viper-tests.el +++ b/test/lisp/emulation/viper-tests.el @@ -78,7 +78,7 @@ after itself, although it will leave a buffer called (viper-test-undo-kmacro []))) (ert-deftest viper-test-undo-1 () - "Test for VI like undo behaviour. + "Test for VI like undo behavior. Insert 1, then 2 on consecutive lines, followed by undo. This should leave just 1 in the buffer. @@ -100,7 +100,7 @@ Test for Bug #22295" )))) (ert-deftest viper-test-undo-2 () - "Test for VI like undo behaviour. + "Test for VI like undo behavior. Insert \"1 2 3 4 5\" then delete the 2, then the 4, and undo. Should restore the 4, but leave the 2 deleted. @@ -120,7 +120,7 @@ Test for Bug #22295" ])))) (ert-deftest viper-test-undo-3 () - "Test for VI like undo behaviour. + "Test for VI like undo behavior. Insert \"1 2 3 4 5 6\", delete the 2, then the 3 4 and 5. Should restore the 3 4 and 5 but not the 2. diff --git a/test/src/regex-tests.el b/test/src/regex-tests.el index 85addcab53..6e21088114 100644 --- a/test/src/regex-tests.el +++ b/test/src/regex-tests.el @@ -285,10 +285,10 @@ on success" (defun regex-tests-unextend (pattern) - "Basic conversion from extended regexen to emacs ones. This is + "Basic conversion from extended regexes to emacs ones. This is mostly a hack that adds \\ to () and | and {}, and removes it if it already exists. We also change \\S (and \\s) to \\S- (and -\\s-) because extended regexen see the former as whitespace, but +\\s-) because extended regexes see the former as whitespace, but emacs requires an extra symbol character" (with-temp-buffer @@ -364,7 +364,7 @@ pattern)" (defconst regex-tests-BOOST-whitelist [ - ;; emacs is more stringent with regexen involving unbalanced ) + ;; emacs is more stringent with regexes involving unbalanced ) 63 65 69 ;; in emacs, regex . doesn't match \n @@ -374,7 +374,7 @@ pattern)" ;; characters 107 108 109 122 123 124 140 141 142 - ;; emacs accepts regexen with {} + ;; emacs accepts regexes with {} 161 ;; emacs doesn't fail on bogus ranges such as [3-1] or [1-3-5] @@ -616,7 +616,7 @@ differences in behavior.") ;; characters 57 58 59 60 - ;; emacs is more stringent with regexen involving unbalanced ) + ;; emacs is more stringent with regexes involving unbalanced ) 67 ] "Line numbers in the TESTS test that should be skipped. These -- cgit v1.2.3