1 files changed, 47 insertions, 13 deletions
diff --git a/test/lisp/align-tests.el b/test/lisp/align-tests.el
index 2804b0f2a5d..cd309ea07bf 100644
--- a/test/lisp/align-tests.el
+++ b/test/lisp/align-tests.el
@@ -25,22 +25,56 @@
 (require 'ert-x)
 (require 'align)
 
-(defun test-align-compare (file function)
-  (should (equal
-           (with-temp-buffer
-             (insert-file-contents (ert-resource-file (format file "pre")))
-             (funcall function)
-             (align (point-min) (point-max))
-             (buffer-substring-no-properties (point-min) (point-max)))
-           (with-temp-buffer
-             (insert-file-contents (ert-resource-file (format file "post")))
-             (buffer-string)))))
+;;;; align
 
-(ert-deftest align-java ()
-  (test-align-compare "align-%s.java" #'java-mode))
+(defun test-align-transform-fun (function)
+  (lambda ()
+    (funcall function)
+    (align (point-min) (point-max))))
 
 (ert-deftest align-c ()
-  (test-align-compare "align-%s.c" #'c-mode))
+  (ert-test-erts-file (ert-resource-file "c-mode.erts")
+                      (test-align-transform-fun #'c-mode)))
+
+(ert-deftest align-css ()
+  (let ((indent-tabs-mode nil))
+    (ert-test-erts-file (ert-resource-file "css-mode.erts")
+                        (test-align-transform-fun #'css-mode))))
+
+(ert-deftest align-java ()
+  (ert-test-erts-file (ert-resource-file "java-mode.erts")
+                      (test-align-transform-fun #'java-mode)))
+
+(ert-deftest align-latex ()
+  (ert-test-erts-file (ert-resource-file "latex-mode.erts")
+                      (test-align-transform-fun #'latex-mode)))
+
+(autoload 'treesit-ready-p "treesit")
+
+(ert-deftest align-lua ()
+  (skip-unless (treesit-ready-p 'lua))
+  (let ((comment-column 20)
+        (indent-tabs-mode nil))
+    (ert-test-erts-file (ert-resource-file "lua-ts-mode.erts")
+                        (test-align-transform-fun #'lua-ts-mode))))
+
+(ert-deftest align-python ()
+  (ert-test-erts-file (ert-resource-file "python-mode.erts")
+                      (test-align-transform-fun #'python-mode)))
+
+(ert-deftest align-toml ()
+  (let ((indent-tabs-mode nil))
+    (ert-test-erts-file (ert-resource-file "conf-toml-mode.erts")
+                        (test-align-transform-fun #'conf-toml-mode))))
+
+;;;; align-regexp
+
+(ert-deftest align-regexp ()
+  (let ((indent-tabs-mode nil))
+    (ert-test-erts-file (ert-resource-file "align-regexp.erts")
+                        (lambda ()
+                          (align-regexp (point-min) (point-max)
+                                        "\\(\\s-*\\)(")))))
 
 (provide 'align-tests)