Move buffer related functions from ert-x.el to ert.el

* lisp/emacs-lisp/ert-x.el (ert--text-button)
(ert--format-test-buffer-name, ert--test-buffers)
(ert--test-buffer-button, ert--test-buffer-button-action)
(ert--call-with-test-buffer, ert-with-test-buffer)
(ert-with-buffer-selected, ert-kill-all-test-buffers)
(ert-call-with-buffer-renamed, ert-buffer-string-reindented): Move
from here...
* lisp/emacs-lisp/ert.el (ert--text-button)
(ert--format-test-buffer-name, ert--test-buffers)
(ert--test-buffer-button, ert--test-buffer-button-action)
(ert--call-with-test-buffer, ert-with-test-buffer)
(ert-kill-all-test-buffers, ert-with-buffer-selected)
(ert-call-with-buffer-renamed, ert-with-buffer-renamed): ...to
here.
* doc/misc/ert.texi (Helpers for Buffers): Break out new section...
(Helper Functions): ...from here.
* lisp/emacs-lisp/ert-x.el (ert-with-test-buffer-selected): Move
obsolete definition to the end of the file.

* test/lisp/emacs-lisp/ert-x-tests.el
(ert--hash-table-to-alist, ert-test-test-buffers)
(ert-test-with-buffer-selected/current)
(ert-test-with-buffer-selected/selected)
(ert-test-with-buffer-selected/nil-buffer)
(ert-test-with-buffer-selected/modification-hooks)
(ert-test-with-buffer-selected/read-only)
(ert-test-with-buffer-selected/return-value)
(ert-test-with-test-buffer-selected/modification-hooks)
(ert-test-with-test-buffer-selected/read-only)
(ert-test-with-test-buffer-selected/return-value)
(ert-test-with-test-buffer-selected/buffer-name): Move tests from
here...
* test/lisp/emacs-lisp/ert-tests.el
(ert--hash-table-to-alist, ert-test-test-buffers)
(ert-test-with-buffer-selected/current)
(ert-test-with-buffer-selected/selected)
(ert-test-with-buffer-selected/nil-buffer)
(ert-test-with-buffer-selected/modification-hooks)
(ert-test-with-buffer-selected/read-only)
(ert-test-with-buffer-selected/return-value)
(ert-test-with-test-buffer-selected/selected)
(ert-test-with-test-buffer-selected/modification-hooks)
(ert-test-with-test-buffer-selected/read-only)
(ert-test-with-test-buffer-selected/return-value)
(ert-test-with-test-buffer-selected/buffer-name): ...to here.
* test/lisp/progmodes/hideshow-tests.el (ert-x):
* test/lisp/simple-tests.el (ert-x):
* test/lisp/whitespace-tests.el (ert-x): Don't require.

5 files changed, 91 insertions, 94 deletions

diff --git a/test/lisp/emacs-lisp/ert-tests.el b/test/lisp/emacs-lisp/ert-tests.el
index cd89536f6a0..d4370366b39 100644
--- a/test/lisp/emacs-lisp/ert-tests.el
+++ b/test/lisp/emacs-lisp/ert-tests.el
@@ -930,6 +930,97 @@ F failing-test
           (when noninteractive
             (kill-buffer buffer-name)))))))
 
+(defun ert--hash-table-to-alist (table)
+  (let ((accu nil))
+    (maphash (lambda (key value)
+               (push (cons key value) accu))
+             table)
+    (nreverse accu)))
+
+(ert-deftest ert-test-test-buffers ()
+  (let (buffer-1
+        buffer-2)
+    (let ((test-1
+           (make-ert-test
+            :name 'test-1
+            :body (lambda ()
+                    (ert-with-test-buffer (:name "foo")
+                      (should (string-match
+                               "[*]Test buffer (ert-test-test-buffers): foo[*]"
+                               (buffer-name)))
+                      (setq buffer-1 (current-buffer))))))
+          (test-2
+           (make-ert-test
+            :name 'test-2
+            :body (lambda ()
+                    (ert-with-test-buffer (:name "bar")
+                      (should (string-match
+                               "[*]Test buffer (ert-test-test-buffers): bar[*]"
+                               (buffer-name)))
+                      (setq buffer-2 (current-buffer))
+                      (ert-fail "fail for test"))))))
+      (let ((ert--test-buffers (make-hash-table :weakness t)))
+        (ert-run-tests `(member ,test-1 ,test-2) #'ignore)
+        (should (equal (ert--hash-table-to-alist ert--test-buffers)
+                       `((,buffer-2 . t))))
+        (should-not (buffer-live-p buffer-1))
+        (should (buffer-live-p buffer-2))))))
+
+(ert-deftest ert-test-with-buffer-selected/current ()
+  (let ((origbuf (current-buffer)))
+    (ert-with-test-buffer ()
+      (let ((buf (current-buffer)))
+        (should (not (eq buf origbuf)))
+        (with-current-buffer origbuf
+          (ert-with-buffer-selected buf
+            (should (eq (current-buffer) buf))))))))
+
+(ert-deftest ert-test-with-buffer-selected/selected ()
+  (ert-with-test-buffer ()
+    (ert-with-buffer-selected (current-buffer)
+      (should (eq (window-buffer) (current-buffer))))))
+
+(ert-deftest ert-test-with-buffer-selected/nil-buffer ()
+  (ert-with-test-buffer ()
+    (let ((buf (current-buffer)))
+      (ert-with-buffer-selected nil
+        (should (eq (window-buffer) buf))))))
+
+(ert-deftest ert-test-with-buffer-selected/modification-hooks ()
+  (ert-with-test-buffer ()
+    (ert-with-buffer-selected (current-buffer)
+      (should (null inhibit-modification-hooks)))))
+
+(ert-deftest ert-test-with-buffer-selected/read-only ()
+  (ert-with-test-buffer ()
+    (ert-with-buffer-selected (current-buffer)
+      (should (null inhibit-read-only))
+      (should (null buffer-read-only)))))
+
+(ert-deftest ert-test-with-buffer-selected/return-value ()
+  (should (equal (ert-with-buffer-selected nil "foo") "foo")))
+
+(ert-deftest ert-test-with-test-buffer-selected/selected ()
+  (ert-with-test-buffer (:selected t)
+    (should (eq (window-buffer) (current-buffer)))))
+
+(ert-deftest ert-test-with-test-buffer-selected/modification-hooks ()
+  (ert-with-test-buffer (:selected t)
+    (should (null inhibit-modification-hooks))))
+
+(ert-deftest ert-test-with-test-buffer-selected/read-only ()
+  (ert-with-test-buffer (:selected t)
+    (should (null inhibit-read-only))
+    (should (null buffer-read-only))))
+
+(ert-deftest ert-test-with-test-buffer-selected/return-value ()
+  (should (equal (ert-with-test-buffer (:selected t) "foo") "foo")))
+
+(ert-deftest ert-test-with-test-buffer-selected/buffer-name ()
+  (should (equal (ert-with-test-buffer (:name "foo") (buffer-name))
+                 (ert-with-test-buffer (:name "foo" :selected t)
+                   (buffer-name)))))
+
 (provide 'ert-tests)
 
 ;;; ert-tests.el ends here
diff --git a/test/lisp/emacs-lisp/ert-x-tests.el b/test/lisp/emacs-lisp/ert-x-tests.el
index aa0edf47059..7b7abf1ba7e 100644
--- a/test/lisp/emacs-lisp/ert-x-tests.el
+++ b/test/lisp/emacs-lisp/ert-x-tests.el
@@ -46,97 +46,6 @@
     (emacs-lisp-mode)
     (should-not (equal (ert-buffer-string-reindented) (buffer-string)))))
 
-(defun ert--hash-table-to-alist (table)
-  (let ((accu nil))
-    (maphash (lambda (key value)
-               (push (cons key value) accu))
-             table)
-    (nreverse accu)))
-
-(ert-deftest ert-test-test-buffers ()
-  (let (buffer-1
-        buffer-2)
-    (let ((test-1
-           (make-ert-test
-            :name 'test-1
-            :body (lambda ()
-                    (ert-with-test-buffer (:name "foo")
-                      (should (string-match
-                               "[*]Test buffer (ert-test-test-buffers): foo[*]"
-                               (buffer-name)))
-                      (setq buffer-1 (current-buffer))))))
-          (test-2
-           (make-ert-test
-            :name 'test-2
-            :body (lambda ()
-                    (ert-with-test-buffer (:name "bar")
-                      (should (string-match
-                               "[*]Test buffer (ert-test-test-buffers): bar[*]"
-                               (buffer-name)))
-                      (setq buffer-2 (current-buffer))
-                      (ert-fail "fail for test"))))))
-      (let ((ert--test-buffers (make-hash-table :weakness t)))
-        (ert-run-tests `(member ,test-1 ,test-2) #'ignore)
-        (should (equal (ert--hash-table-to-alist ert--test-buffers)
-                       `((,buffer-2 . t))))
-        (should-not (buffer-live-p buffer-1))
-        (should (buffer-live-p buffer-2))))))
-
-(ert-deftest ert-test-with-buffer-selected/current ()
-  (let ((origbuf (current-buffer)))
-    (ert-with-test-buffer ()
-      (let ((buf (current-buffer)))
-        (should (not (eq buf origbuf)))
-        (with-current-buffer origbuf
-          (ert-with-buffer-selected buf
-            (should (eq (current-buffer) buf))))))))
-
-(ert-deftest ert-test-with-buffer-selected/selected ()
-  (ert-with-test-buffer ()
-    (ert-with-buffer-selected (current-buffer)
-      (should (eq (window-buffer) (current-buffer))))))
-
-(ert-deftest ert-test-with-buffer-selected/nil-buffer ()
-  (ert-with-test-buffer ()
-    (let ((buf (current-buffer)))
-      (ert-with-buffer-selected nil
-        (should (eq (window-buffer) buf))))))
-
-(ert-deftest ert-test-with-buffer-selected/modification-hooks ()
-  (ert-with-test-buffer ()
-    (ert-with-buffer-selected (current-buffer)
-      (should (null inhibit-modification-hooks)))))
-
-(ert-deftest ert-test-with-buffer-selected/read-only ()
-  (ert-with-test-buffer ()
-    (ert-with-buffer-selected (current-buffer)
-      (should (null inhibit-read-only))
-      (should (null buffer-read-only)))))
-
-(ert-deftest ert-test-with-buffer-selected/return-value ()
-  (should (equal (ert-with-buffer-selected nil "foo") "foo")))
-
-(ert-deftest ert-test-with-test-buffer-selected/selected ()
-  (ert-with-test-buffer (:selected t)
-    (should (eq (window-buffer) (current-buffer)))))
-
-(ert-deftest ert-test-with-test-buffer-selected/modification-hooks ()
-  (ert-with-test-buffer (:selected t)
-    (should (null inhibit-modification-hooks))))
-
-(ert-deftest ert-test-with-test-buffer-selected/read-only ()
-  (ert-with-test-buffer (:selected t)
-    (should (null inhibit-read-only))
-    (should (null buffer-read-only))))
-
-(ert-deftest ert-test-with-test-buffer-selected/return-value ()
-  (should (equal (ert-with-test-buffer (:selected t) "foo") "foo")))
-
-(ert-deftest ert-test-with-test-buffer-selected/buffer-name ()
-  (should (equal (ert-with-test-buffer (:name "foo") (buffer-name))
-                 (ert-with-test-buffer (:name "foo" :selected t)
-                   (buffer-name)))))
-
 (ert-deftest ert-filter-string ()
   (should (equal (ert-filter-string "foo bar baz" "quux")
                  "foo bar baz"))
diff --git a/test/lisp/progmodes/hideshow-tests.el b/test/lisp/progmodes/hideshow-tests.el
index 59b8522d614..a6b3ecfbd3d 100644
--- a/test/lisp/progmodes/hideshow-tests.el
+++ b/test/lisp/progmodes/hideshow-tests.el
@@ -22,7 +22,6 @@
 ;;; Code:
 
 (require 'ert)
-(require 'ert-x)
 (require 'hideshow)
 
 ;; Dependencies for testing:
diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el
index b07e693f927..e638f8cb3f5 100644
--- a/test/lisp/simple-tests.el
+++ b/test/lisp/simple-tests.el
@@ -22,7 +22,6 @@
 ;;; Code:
 
 (require 'ert)
-(require 'ert-x)
 (eval-when-compile (require 'cl-lib))
 
 (defun simple-test--buffer-substrings ()
diff --git a/test/lisp/whitespace-tests.el b/test/lisp/whitespace-tests.el
index a33338c660f..ed347d04be1 100644
--- a/test/lisp/whitespace-tests.el
+++ b/test/lisp/whitespace-tests.el
@@ -19,7 +19,6 @@
 ;;; Code:
 
 (require 'ert)
-(require 'ert-x)
 (require 'faceup)
 (require 'whitespace)