Unbreak ert tests

* test/lisp/emacs-lisp/tabulated-list-test.el (tabulated-list-print)
(tabulated-list-sort): Update tests for recent change.

diff --git a/test/lisp/emacs-lisp/tabulated-list-test.el b/test/lisp/emacs-lisp/tabulated-list-test.el
index 679afda394827aa3654b9a330db4c5887c0c2d76..7cac254ac408e462d737fccf4d0f83611de2d3a0 100644 (file)
--- a/test/lisp/emacs-lisp/tabulated-list-test.el
+++ b/test/lisp/emacs-lisp/tabulated-list-test.el
@@ -56,10 +56,10 @@
   (tabulated-list--test-with-buffer
    ;; Basic printing.
    (should (string= (buffer-substring-no-properties (point-min) (point-max))
-                    "       zzzz-game  zzzz-game  2113      installed   play zzzz in Emacs
-       4clojure   4clojure   1507      obsolete    Open and evaluate 4clojure.com questions
-       abc-mode   abc-mode   944       available   Major mode for editing abc music files
-       mode       mode       1128      installed   A simple mode for editing Actionscript 3 files\n"))
+                  "       zzzz-game          zzzz-game          2113         installed           play zzzz in Emacs
+       4clojure          4clojure          1507         obsolete           Open and evaluate 4clojure.com questions
+       abc-mode          abc-mode          944         available           Major mode for editing abc music files
+       mode          mode          1128         installed           A simple mode for editing Actionscript 3 files\n"))
    ;; Preserve position.
    (forward-line 3)
    (let ((pos (thing-at-point 'line)))
@@ -67,16 +67,16 @@
      (tabulated-list-print t)
      (should (equal (thing-at-point 'line) pos))
      (should (string= (buffer-substring-no-properties (point-min) (point-max))
-                      "       4clojure   4clojure   1507      obsolete    Open and evaluate 4clojure.com questions
-       abc-mode   abc-mode   944       available   Major mode for editing abc music files
-       mode       mode       1128      installed   A simple mode for editing Actionscript 3 files\n"))
+                      "       4clojure          4clojure          1507         obsolete           Open and evaluate 4clojure.com questions
+       abc-mode          abc-mode          944         available           Major mode for editing abc music files
+       mode          mode          1128         installed           A simple mode for editing Actionscript 3 files\n"))
      ;; Check the UPDATE argument
      (pop tabulated-list-entries)
      (setf (cdr (car tabulated-list-entries)) (list ["x" "x" "944" "available" " XX"]))
      (tabulated-list-print t t)
      (should (string= (buffer-substring-no-properties (point-min) (point-max))
-                      "       x          x          944       available   XX
-       mode       mode       1128      installed   A simple mode for editing Actionscript 3 files\n"))
+                      "       x          x          944         available           XX
+       mode          mode          1128         installed           A simple mode for editing Actionscript 3 files\n"))
      (should (equal (thing-at-point 'line) pos)))))
 
 (ert-deftest tabulated-list-sort ()
@@ -86,10 +86,11 @@
    (skip-chars-forward "[:blank:]")
    (tabulated-list-sort)
    (let ((text (buffer-substring-no-properties (point-min) (point-max))))
-     (should (string= text "       4clojure   4clojure   1507      obsolete    Open and evaluate 4clojure.com questions
-       abc-mode   abc-mode   944       available   Major mode for editing abc music files
-       mode       mode       1128      installed   A simple mode for editing Actionscript 3 files
-       zzzz-game  zzzz-game  2113      installed   play zzzz in Emacs\n"))
+     (should (string= text
+                      "       4clojure          4clojure          1507         obsolete           Open and evaluate 4clojure.com questions
+       abc-mode          abc-mode          944         available           Major mode for editing abc music files
+       mode          mode          1128         installed           A simple mode for editing Actionscript 3 files
+       zzzz-game          zzzz-game          2113         installed           play zzzz in Emacs\n"))
 
      (skip-chars-forward "^[:blank:]")
      (skip-chars-forward "[:blank:]")
@@ -101,10 +102,10 @@
      ;; Invert.
      (tabulated-list-sort 1)
      (should (string= (buffer-substring-no-properties (point-min) (point-max))
-                      "       zzzz-game  zzzz-game  2113      installed   play zzzz in Emacs
-       mode       mode       1128      installed   A simple mode for editing Actionscript 3 files
-       abc-mode   abc-mode   944       available   Major mode for editing abc music files
-       4clojure   4clojure   1507      obsolete    Open and evaluate 4clojure.com questions\n"))
+                      "       zzzz-game          zzzz-game          2113         installed           play zzzz in Emacs
+       mode          mode          1128         installed           A simple mode for editing Actionscript 3 files
+       abc-mode          abc-mode          944         available           Major mode for editing abc music files
+       4clojure          4clojure          1507         obsolete           Open and evaluate 4clojure.com questions\n"))
      ;; Again
      (tabulated-list-sort 1)
      (should (string= text (buffer-substring-no-properties (point-min) (point-max)))))