nicely done.

ethan-leba · Nov 23, 2023 · f9b8209 · f9b8209
1 parent 8145064
commit f9b8209
Show file tree

Hide file tree

Showing 8 changed files with 584 additions and 588 deletions.
diff --git a/tests/setup.el b/tests/setup.el
@@ -109,7 +109,7 @@ executable programs, such as the C/C++ compiler and linker."
   (funcall mode)
 
   (treesit-parser-create
-   (or (alist-get mode tree-edit--test-major-mode-mapping)
+   (or (alist-get mode tree-edit-language-alist)
        (user-error "[test harness] no grammar specified for %s" major-mode))
    temp-buffer)
 

diff --git a/tests/test-c.el.x → tests/test-c.el b/tests/test-c.el.x → tests/test-c.el
diff --git a/tests/test-elisp.el.x → tests/test-elisp.el b/tests/test-elisp.el.x → tests/test-elisp.el
diff --git a/tests/test-java.el.x → tests/test-java.el b/tests/test-java.el.x → tests/test-java.el
@@ -26,8 +26,8 @@
     (with-base-test-buffer #'java-mode ""
       (let ((evil-tree-state-map (make-sparse-keymap))
             (tree-edit-nodes
-             '((:type if_statement
-                :key "i"))))
+             '((java (:type if_statement
+                      :key "i")))))
         (define-evil-tree-edit-verb evil-tree-state-map "t" #'dummy-verb)
         (evil-tree-state)
         (expect (key-binding "ti"))
@@ -44,7 +44,7 @@
   (it "loads grammar"
     (with-base-test-buffer #'java-mode "" (expect tree-edit-grammar)))
   (it "errors and disables tree-edit-mode on unknown mode"
-    (expect (with-base-test-buffer #'emacs-lisp-mode "") :to-throw 'error))
+    (expect (with-base-test-buffer #'fundamental-mode "") :to-throw 'error))
 
   ;; TODO
   (xit "uses node overrides"))
@@ -445,14 +445,14 @@ class Main {[void bar() {}]
   break;[break;]
 }")
     ;; (expect (with-tree-test-buffer #'java-mode "
-;; class Main {[public] void main() {}
-;; }"
-;;               ;; FIXME: Test selects anonymous keyword 'public', instead of 'modifiers
-;;               (evil-tree-edit-goto-parent)
-;;               (evil-tree-edit-delete))
-;;             :to-have-buffer-contents "
-;; class Main {[void] main() {}
-;; }")
+    ;; class Main {[public] void main() {}
+    ;; }"
+    ;;               ;; FIXME: Test selects anonymous keyword 'public', instead of 'modifiers
+    ;;               (evil-tree-edit-goto-parent)
+    ;;               (evil-tree-edit-delete))
+    ;;             :to-have-buffer-contents "
+    ;; class Main {[void] main() {}
+    ;; }")
     (expect (with-tree-test-buffer #'java-mode "{foo([x],y);}"
               (evil-tree-edit-delete))
             :to-have-buffer-contents "{foo([y]);}")