Rename all test files to reflect source layout.

 * CONTRIBUTE,Makefile.in,configure.ac: Update to reflect
   test directory moves.
 * test/file-organisation.org: New file.
 * test/automated/Makefile.in
   test/automated/data/decompress/foo.gz
   test/automated/data/epg/pubkey.asc
   test/automated/data/epg/seckey.asc
   test/automated/data/files-bug18141.el.gz
   test/automated/data/flymake/test.c
   test/automated/data/flymake/test.pl
   test/automated/data/package/archive-contents
   test/automated/data/package/key.pub
   test/automated/data/package/key.sec
   test/automated/data/package/multi-file-0.2.3.tar
   test/automated/data/package/multi-file-readme.txt
   test/automated/data/package/newer-versions/archive-contents
   test/automated/data/package/newer-versions/new-pkg-1.0.el
   test/automated/data/package/newer-versions/simple-single-1.4.el
   test/automated/data/package/package-test-server.py
   test/automated/data/package/signed/archive-contents
   test/automated/data/package/signed/archive-contents.sig
   test/automated/data/package/signed/signed-bad-1.0.el
   test/automated/data/package/signed/signed-bad-1.0.el.sig
   test/automated/data/package/signed/signed-good-1.0.el
   test/automated/data/package/signed/signed-good-1.0.el.sig
   test/automated/data/package/simple-depend-1.0.el
   test/automated/data/package/simple-single-1.3.el
   test/automated/data/package/simple-single-readme.txt
   test/automated/data/package/simple-two-depend-1.1.el
   test/automated/abbrev-tests.el
   test/automated/auto-revert-tests.el
   test/automated/calc-tests.el
   test/automated/icalendar-tests.el
   test/automated/character-fold-tests.el
   test/automated/comint-testsuite.el
   test/automated/descr-text-test.el
   test/automated/electric-tests.el
   test/automated/cl-generic-tests.el
   test/automated/cl-lib-tests.el
   test/automated/eieio-test-methodinvoke.el
   test/automated/eieio-test-persist.el
   test/automated/eieio-tests.el
   test/automated/ert-tests.el
   test/automated/ert-x-tests.el
   test/automated/generator-tests.el
   test/automated/let-alist.el
   test/automated/map-tests.el
   test/automated/advice-tests.el
   test/automated/package-test.el
   test/automated/pcase-tests.el
   test/automated/regexp-tests.el
   test/automated/seq-tests.el
   test/automated/subr-x-tests.el
   test/automated/tabulated-list-test.el
   test/automated/thunk-tests.el
   test/automated/timer-tests.el
   test/automated/epg-tests.el
   test/automated/eshell.el
   test/automated/faces-tests.el
   test/automated/file-notify-tests.el
   test/automated/auth-source-tests.el
   test/automated/gnus-tests.el
   test/automated/message-mode-tests.el
   test/automated/help-fns.el
   test/automated/imenu-test.el
   test/automated/info-xref.el
   test/automated/mule-util.el
   test/automated/isearch-tests.el
   test/automated/json-tests.el
   test/automated/bytecomp-tests.el
   test/automated/coding-tests.el
   test/automated/core-elisp-tests.el
   test/automated/decoder-tests.el
   test/automated/files.el
   test/automated/font-parse-tests.el
   test/automated/lexbind-tests.el
   test/automated/occur-tests.el
   test/automated/process-tests.el
   test/automated/syntax-tests.el
   test/automated/textprop-tests.el
   test/automated/undo-tests.el
   test/automated/man-tests.el
   test/automated/completion-tests.el
   test/automated/dbus-tests.el
   test/automated/newsticker-tests.el
   test/automated/sasl-scram-rfc-tests.el
   test/automated/tramp-tests.el
   test/automated/obarray-tests.el
   test/automated/compile-tests.el
   test/automated/elisp-mode-tests.el
   test/automated/f90.el
   test/automated/flymake-tests.el
   test/automated/python-tests.el
   test/automated/ruby-mode-tests.el
   test/automated/subword-tests.el
   test/automated/replace-tests.el
   test/automated/simple-test.el
   test/automated/sort-tests.el
   test/automated/subr-tests.el
   test/automated/reftex-tests.el
   test/automated/sgml-mode-tests.el
   test/automated/tildify-tests.el
   test/automated/thingatpt.el
   test/automated/url-future-tests.el
   test/automated/url-util-tests.el
   test/automated/add-log-tests.el
   test/automated/vc-bzr.el
   test/automated/vc-tests.el
   test/automated/xml-parse-tests.el
   test/BidiCharacterTest.txt
   test/biditest.el
   test/cedet/cedet-utests.el
   test/cedet/ede-tests.el
   test/cedet/semantic-ia-utest.el
   test/cedet/semantic-tests.el
   test/cedet/semantic-utest-c.el
   test/cedet/semantic-utest.el
   test/cedet/srecode-tests.el
   test/cedet/tests/test.c
   test/cedet/tests/test.el
   test/cedet/tests/test.make
   test/cedet/tests/testdoublens.cpp
   test/cedet/tests/testdoublens.hpp
   test/cedet/tests/testfriends.cpp
   test/cedet/tests/testjavacomp.java
   test/cedet/tests/testnsp.cpp
   test/cedet/tests/testpolymorph.cpp
   test/cedet/tests/testspp.c
   test/cedet/tests/testsppcomplete.c
   test/cedet/tests/testsppreplace.c
   test/cedet/tests/testsppreplaced.c
   test/cedet/tests/testsubclass.cpp
   test/cedet/tests/testsubclass.hh
   test/cedet/tests/testtypedefs.cpp
   test/cedet/tests/testvarnames.c
   test/etags/CTAGS.good
   test/etags/ETAGS.good_1
   test/etags/ETAGS.good_2
   test/etags/ETAGS.good_3
   test/etags/ETAGS.good_4
   test/etags/ETAGS.good_5
   test/etags/ETAGS.good_6
   test/etags/a-src/empty.zz
   test/etags/a-src/empty.zz.gz
   test/etags/ada-src/2ataspri.adb
   test/etags/ada-src/2ataspri.ads
   test/etags/ada-src/etags-test-for.ada
   test/etags/ada-src/waroquiers.ada
   test/etags/c-src/a/b/b.c
   test/etags/c-src/abbrev.c
   test/etags/c-src/c.c
   test/etags/c-src/dostorture.c
   test/etags/c-src/emacs/src/gmalloc.c
   test/etags/c-src/emacs/src/keyboard.c
   test/etags/c-src/emacs/src/lisp.h
   test/etags/c-src/emacs/src/regex.h
   test/etags/c-src/etags.c
   test/etags/c-src/exit.c
   test/etags/c-src/exit.strange_suffix
   test/etags/c-src/fail.c
   test/etags/c-src/getopt.h
   test/etags/c-src/h.h
   test/etags/c-src/machsyscalls.c
   test/etags/c-src/machsyscalls.h
   test/etags/c-src/sysdep.h
   test/etags/c-src/tab.c
   test/etags/c-src/torture.c
   test/etags/cp-src/MDiagArray2.h
   test/etags/cp-src/Range.h
   test/etags/cp-src/burton.cpp
   test/etags/cp-src/c.C
   test/etags/cp-src/clheir.cpp.gz
   test/etags/cp-src/clheir.hpp
   test/etags/cp-src/conway.cpp
   test/etags/cp-src/conway.hpp
   test/etags/cp-src/fail.C
   test/etags/cp-src/functions.cpp
   test/etags/cp-src/screen.cpp
   test/etags/cp-src/screen.hpp
   test/etags/cp-src/x.cc
   test/etags/el-src/TAGTEST.EL
   test/etags/el-src/emacs/lisp/progmodes/etags.el
   test/etags/erl-src/gs_dialog.erl
   test/etags/f-src/entry.for
   test/etags/f-src/entry.strange.gz
   test/etags/f-src/entry.strange_suffix
   test/etags/forth-src/test-forth.fth
   test/etags/html-src/algrthms.html
   test/etags/html-src/index.shtml
   test/etags/html-src/software.html
   test/etags/html-src/softwarelibero.html
   test/etags/lua-src/allegro.lua
   test/etags/objc-src/PackInsp.h
   test/etags/objc-src/PackInsp.m
   test/etags/objc-src/Subprocess.h
   test/etags/objc-src/Subprocess.m
   test/etags/objcpp-src/SimpleCalc.H
   test/etags/objcpp-src/SimpleCalc.M
   test/etags/pas-src/common.pas
   test/etags/perl-src/htlmify-cystic
   test/etags/perl-src/kai-test.pl
   test/etags/perl-src/yagrip.pl
   test/etags/php-src/lce_functions.php
   test/etags/php-src/ptest.php
   test/etags/php-src/sendmail.php
   test/etags/prol-src/natded.prolog
   test/etags/prol-src/ordsets.prolog
   test/etags/ps-src/rfc1245.ps
   test/etags/pyt-src/server.py
   test/etags/tex-src/gzip.texi
   test/etags/tex-src/nonewline.tex
   test/etags/tex-src/testenv.tex
   test/etags/tex-src/texinfo.tex
   test/etags/y-src/atest.y
   test/etags/y-src/cccp.c
   test/etags/y-src/cccp.y
   test/etags/y-src/parse.c
   test/etags/y-src/parse.y
   test/indent/css-mode.css
   test/indent/js-indent-init-dynamic.js
   test/indent/js-indent-init-t.js
   test/indent/js-jsx.js
   test/indent/js.js
   test/indent/latex-mode.tex
   test/indent/modula2.mod
   test/indent/nxml.xml
   test/indent/octave.m
   test/indent/pascal.pas
   test/indent/perl.perl
   test/indent/prolog.prolog
   test/indent/ps-mode.ps
   test/indent/ruby.rb
   test/indent/scheme.scm
   test/indent/scss-mode.scss
   test/indent/sgml-mode-attribute.html
   test/indent/shell.rc
   test/indent/shell.sh
   test/redisplay-testsuite.el
   test/rmailmm.el
   test/automated/buffer-tests.el
   test/automated/cmds-tests.el
   test/automated/data-tests.el
   test/automated/finalizer-tests.el
   test/automated/fns-tests.el
   test/automated/inotify-test.el
   test/automated/keymap-tests.el
   test/automated/print-tests.el
   test/automated/libxml-tests.el
   test/automated/zlib-tests.el: Files Moved.

1 files changed, 256 insertions, 0 deletions

diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el
new file mode 100644
index 00000000000..07b5eaa93e4
--- /dev/null
+++ b/test/lisp/simple-tests.el
@@ -0,0 +1,256 @@
+;;; simple-test.el --- Tests for simple.el           -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2015  Free Software Foundation, Inc.
+
+;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
+
+;; This program 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.
+
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'ert)
+
+(defmacro simple-test--dummy-buffer (&rest body)
+  (declare (indent 0)
+           (debug t))
+  `(with-temp-buffer
+     (emacs-lisp-mode)
+     (setq indent-tabs-mode nil)
+     (insert "(a b")
+     (save-excursion (insert " c d)"))
+     ,@body
+     (cons (buffer-substring (point-min) (point))
+           (buffer-substring (point) (point-max)))))
+
+
+(defmacro simple-test--transpositions (&rest body)
+  (declare (indent 0)
+           (debug t))
+  `(with-temp-buffer
+     (emacs-lisp-mode)
+     (insert "(s1) (s2) (s3) (s4) (s5)")
+     (backward-sexp 1)
+     ,@body
+     (cons (buffer-substring (point-min) (point))
+           (buffer-substring (point) (point-max)))))
+
+
+;;; `newline'
+(ert-deftest newline ()
+  (should-error (newline -1))
+  (should (equal (simple-test--dummy-buffer (newline 1))
+                 '("(a b\n" . " c d)")))
+  (should (equal (simple-test--dummy-buffer
+                   (electric-indent-mode -1)
+                   (call-interactively #'newline))
+                 '("(a b\n" . " c d)")))
+  (should (equal (simple-test--dummy-buffer
+                   (let ((current-prefix-arg 5))
+                     (call-interactively #'newline)))
+                 '("(a b\n\n\n\n\n" . " c d)")))
+  (should (equal (simple-test--dummy-buffer (newline 5))
+                 '("(a b\n\n\n\n\n" . " c d)")))
+  (should (equal (simple-test--dummy-buffer
+                   (forward-char 1)
+                   (newline 1))
+                 '("(a b \n" . "c d)"))))
+
+(ert-deftest newline-indent ()
+  (should (equal (simple-test--dummy-buffer
+                   (electric-indent-local-mode 1)
+                   (newline 1))
+                 '("(a b\n" . " c d)")))
+  (should (equal (simple-test--dummy-buffer
+                   (electric-indent-local-mode 1)
+                   (newline 1 'interactive))
+                 '("(a b\n   " . "c d)")))
+  (should (equal (simple-test--dummy-buffer
+                   (electric-indent-local-mode 1)
+                   (let ((current-prefix-arg nil))
+                     (call-interactively #'newline)
+                     (call-interactively #'newline)))
+                 '("(a b\n\n   " . "c d)")))
+  (should (equal (simple-test--dummy-buffer
+                   (electric-indent-local-mode 1)
+                   (newline 5 'interactive))
+                 '("(a b\n\n\n\n\n   " . "c d)")))
+  (should (equal (simple-test--dummy-buffer
+                   (electric-indent-local-mode 1)
+                   (let ((current-prefix-arg 5))
+                     (call-interactively #'newline)))
+                 '("(a b\n\n\n\n\n   " . "c d)")))
+  (should (equal (simple-test--dummy-buffer
+                   (forward-char 1)
+                   (electric-indent-local-mode 1)
+                   (newline 1 'interactive))
+                 '("(a b\n   " . "c d)"))))
+
+
+;;; `open-line'
+(ert-deftest open-line ()
+  (should-error (open-line -1))
+  (should-error (open-line))
+  (should (equal (simple-test--dummy-buffer (open-line 1))
+                 '("(a b" . "\n c d)")))
+  (should (equal (simple-test--dummy-buffer
+                   (electric-indent-mode -1)
+                   (call-interactively #'open-line))
+                 '("(a b" . "\n c d)")))
+  (should (equal (simple-test--dummy-buffer
+                   (let ((current-prefix-arg 5))
+                     (call-interactively #'open-line)))
+                 '("(a b" . "\n\n\n\n\n c d)")))
+  (should (equal (simple-test--dummy-buffer (open-line 5))
+                 '("(a b" . "\n\n\n\n\n c d)")))
+  (should (equal (simple-test--dummy-buffer
+                   (forward-char 1)
+                   (open-line 1))
+                 '("(a b " . "\nc d)"))))
+
+(ert-deftest open-line-margin-and-prefix ()
+  (should (equal (simple-test--dummy-buffer
+                   (let ((left-margin 10))
+                     (open-line 3)))
+                 '("(a b" . "\n\n\n          c d)")))
+  (should (equal (simple-test--dummy-buffer
+                   (forward-line 0)
+                   (let ((left-margin 2))
+                     (open-line 1)))
+                 '("  " . "\n  (a b c d)")))
+  (should (equal (simple-test--dummy-buffer
+                   (let ((fill-prefix "- - "))
+                     (open-line 1)))
+                 '("(a b" . "\n c d)")))
+  (should (equal (simple-test--dummy-buffer
+                   (forward-line 0)
+                   (let ((fill-prefix "- - "))
+                     (open-line 1)))
+                 '("- - " . "\n(a b c d)"))))
+
+(ert-deftest open-line-indent ()
+  (should (equal (simple-test--dummy-buffer
+                   (electric-indent-local-mode 1)
+                   (open-line 1))
+                 '("(a b" . "\n c d)")))
+  (should (equal (simple-test--dummy-buffer
+                   (electric-indent-local-mode 1)
+                   (open-line 1 'interactive))
+                 '("(a b" . "\n   c d)")))
+  (should (equal (simple-test--dummy-buffer
+                   (electric-indent-local-mode 1)
+                   (let ((current-prefix-arg nil))
+                     (call-interactively #'open-line)
+                     (call-interactively #'open-line)))
+                 '("(a b" . "\n\n   c d)")))
+  (should (equal (simple-test--dummy-buffer
+                   (electric-indent-local-mode 1)
+                   (open-line 5 'interactive))
+                 '("(a b" . "\n\n\n\n\n   c d)")))
+  (should (equal (simple-test--dummy-buffer
+                   (electric-indent-local-mode 1)
+                   (let ((current-prefix-arg 5))
+                     (call-interactively #'open-line)))
+                 '("(a b" . "\n\n\n\n\n   c d)")))
+  (should (equal (simple-test--dummy-buffer
+                   (forward-char 1)
+                   (electric-indent-local-mode 1)
+                   (open-line 1 'interactive))
+                 '("(a b" . "\n   c d)"))))
+
+(ert-deftest open-line-hook ()
+  (let* ((x 0)
+         (inc (lambda () (setq x (1+ x)))))
+    (simple-test--dummy-buffer
+      (add-hook 'post-self-insert-hook inc nil 'local)
+      (open-line 1))
+    (should (= x 0))
+    (simple-test--dummy-buffer
+      (add-hook 'post-self-insert-hook inc nil 'local)
+      (open-line 1 'interactive))
+    (should (= x 1))
+
+    (unwind-protect
+        (progn
+          (add-hook 'post-self-insert-hook inc)
+          (simple-test--dummy-buffer
+            (open-line 1))
+          (should (= x 1))
+          (simple-test--dummy-buffer
+            (open-line 10 'interactive))
+          (should (= x 2)))
+      (remove-hook 'post-self-insert-hook inc))))
+
+
+;;; `delete-trailing-whitespace'
+(ert-deftest simple-delete-trailing-whitespace ()
+  "Test bug#21766: delete-whitespace sometimes deletes non-whitespace."
+  (defvar python-indent-guess-indent-offset)  ; to avoid a warning
+  (let ((python (featurep 'python))
+        (python-indent-guess-indent-offset nil)
+        (delete-trailing-lines t))
+    (unwind-protect
+        (with-temp-buffer
+          (python-mode)
+          (insert (concat "query = \"\"\"WITH filtered AS \n"
+                          "WHERE      \n"
+                          "\"\"\".format(fv_)\n"
+                          "\n"
+                          "\n"))
+          (delete-trailing-whitespace)
+          (should (equal (count-lines (point-min) (point-max)) 3)))
+      ;; Let's clean up if running interactive
+      (unless (or noninteractive python)
+        (unload-feature 'python)))))
+
+
+;;; auto-boundary tests
+(ert-deftest undo-auto--boundary-timer ()
+  (should
+   undo-auto--current-boundary-timer))
+
+(ert-deftest undo-auto--boundaries-added ()
+  ;; The change in the buffer should have caused addition
+  ;; to undo-auto--undoably-changed-buffers.
+  (should
+   (with-temp-buffer
+     (setq buffer-undo-list nil)
+     (insert "hello")
+     (member (current-buffer) undo-auto--undoably-changed-buffers)))
+  ;; The head of buffer-undo-list should be the insertion event, and
+  ;; therefore not nil
+  (should
+   (with-temp-buffer
+     (setq buffer-undo-list nil)
+     (insert "hello")
+     (car buffer-undo-list)))
+  ;; Now the head of the buffer-undo-list should be a boundary and so
+  ;; nil. We have to call auto-boundary explicitly because we are out
+  ;; of the command loop
+  (should-not
+   (with-temp-buffer
+     (setq buffer-undo-list nil)
+     (insert "hello")
+     (car buffer-undo-list)
+     (undo-auto--boundaries 'test))))
+
+;;; Transposition with negative args (bug#20698, bug#21885)
+(ert-deftest simple-transpose-subr ()
+  (should (equal (simple-test--transpositions (transpose-sexps -1))
+                 '("(s1) (s2) (s4)" . " (s3) (s5)")))
+  (should (equal (simple-test--transpositions (transpose-sexps -2))
+                 '("(s1) (s4)" . " (s2) (s3) (s5)"))))
+
+
+(provide 'simple-test)
+;;; simple-test.el ends here