Refactor tests

Author: taku0

Makefile

@@ -49,5 +49,6 @@ test:
 ## Tests the package.
 	$(CASK) exec $(EMACS) --batch -q \
 	  --eval "(add-to-list 'load-path \""$(shell readlink -f .)"\")" \
-	  -l test/swift-mode-test-indent.el \
-	  -f swift-mode:run-test:indent
+	  --eval "(add-to-list 'load-path \""$(shell readlink -f .)"/test\")" \
+	  -l test/swift-mode-test.el \
+	  -f swift-mode:run-test

test/swift-files/comment.swift renamed to test/swift-files/indent/comment.swift

@@ -34,79 +34,52 @@
 (require 'swift-mode)
 (require 'swift-mode-indent)
 
-(defvar swift-mode:test:basedir
-  (file-name-directory (or load-file-name buffer-file-name)))
-
-(defun swift-mode:setup-error-buffer ()
-  "Initialize and switch to the error buffer.
-
-Return the error-buffer"
-  (pop-to-buffer (get-buffer-create "*swift-mode-test-indent*"))
-  (fundamental-mode)
-  (setq buffer-read-only nil)
-  (erase-buffer)
-  (current-buffer))
-
-(defun swift-mode:run-test:indent ()
-  "Run indentation test for `swift-mode'."
+(defun swift-mode:run-test:indent
+    (&optional error-buffer error-counts progress-reporter)
+  "Run indentation test for `swift-mode'.
+
+ERROR-BUFFER is the buffer to output errors.
+ERROR-COUNTS is a association list holding counts of errors. Updated
+destructively.
+PROGRESS-REPORTER is the progress-reporter."
   (interactive)
-  (let ((error-buffer
-         (if noninteractive nil (swift-mode:setup-error-buffer)))
-        (current-line 0)
-        (error-counts (list
-                       (cons 'error 0)
-                       (cons 'warning 0)
-                       (cons 'info 0)
-                       (cons 'ok 0)))
-        (progress-reporter (unless noninteractive
-                             (make-progress-reporter "Running tests..."))))
-    (setq default-directory
-          (concat (file-name-as-directory swift-mode:test:basedir)
-                  "swift-files"))
-
-    (dolist (swift-file (file-expand-wildcards "*.swift"))
-      (redisplay)
-      (with-temp-buffer
-        (switch-to-buffer (current-buffer))
-        (insert-file-contents-literally swift-file)
-        (swift-mode)
-        (setq current-line 0)
-        (while (not (eobp))
-          (when (not noninteractive)
-            (progress-reporter-update progress-reporter))
-          (setq current-line (1+ current-line))
-          (cond
-           ((looking-at ".*//.*swift-mode:test:keep-indent")
-            nil)
-
-           ((= (line-beginning-position) (line-end-position))
-            ;; Empty line
-            nil)
-
-           (t
-            (when (looking-at ".*//.*swift-mode:test:eval\\(.*\\)")
-              (eval-region (match-beginning 1) (match-end 1)))
-            (let*
-                ((status (swift-mode:test-current-line-indent
-                          swift-file current-line error-buffer))
-                 (count-assoc (assq status error-counts)))
-              (setcdr count-assoc (1+ (cdr count-assoc))))))
-          (forward-line))))
-
-    (when (not noninteractive)
-      (progress-reporter-done progress-reporter))
-
-    (swift-mode:print-message
-     error-buffer
-     (concat
-      "Errors: " (prin1-to-string (assoc-default 'error error-counts)) "\n"
-      "Warning: " (prin1-to-string (assoc-default 'warning error-counts)) "\n"
-      "Info: " (prin1-to-string (assoc-default 'info error-counts)) "\n"
-      "OK: " (prin1-to-string (assoc-default 'ok error-counts)) "\n"))
-
-    (if noninteractive
-        (kill-emacs (min 63 (assoc-default 'error error-counts)))
-      (compilation-mode))))
+
+  (if (not swift-mode:test:running)
+      (swift-mode:run-test '(swift-mode:run-test:indent))
+    (let ((current-line 0))
+      (setq default-directory
+            (concat (file-name-as-directory swift-mode:test:basedir)
+                    (file-name-as-directory "swift-files")
+                    "indent"))
+
+      (dolist (swift-file (file-expand-wildcards "*.swift"))
+        (redisplay)
+        (with-temp-buffer
+          (switch-to-buffer (current-buffer))
+          (insert-file-contents-literally swift-file)
+          (swift-mode)
+          (setq current-line 0)
+          (while (not (eobp))
+            (when (not noninteractive)
+              (progress-reporter-update progress-reporter))
+            (setq current-line (1+ current-line))
+            (cond
+             ((looking-at ".*//.*swift-mode:test:keep-indent")
+              nil)
+
+             ((= (line-beginning-position) (line-end-position))
+              ;; Empty line
+              nil)
+
+             (t
+              (when (looking-at ".*//.*swift-mode:test:eval\\(.*\\)")
+                (eval-region (match-beginning 1) (match-end 1)))
+              (let*
+                  ((status (swift-mode:test-current-line-indent
+                            swift-file current-line error-buffer))
+                   (count-assoc (assq status error-counts)))
+                (setcdr count-assoc (1+ (cdr count-assoc))))))
+            (forward-line)))))))
 
 (defun swift-mode:test-current-line-indent
     (swift-file current-line error-buffer)
@@ -151,40 +124,6 @@ ERROR-BUFFER is the buffer to output errors."
 
     status))
 
-(defun swift-mode:show-error (error-buffer file line level message)
-  "Show an error message to the ERROR-BUFFER or stdout.
-
-If the Emacs is in the batch mode, the message is printed to the stdout.
-Otherwise, the message is appended to the ERROR-BUFFER.
-
-FILE is the filename of the test case.
-LINE is the line number of the error.
-LEVEL is the error level (e.g. error, warning).
-MESSAGE is the error message."
-  (let ((formatted
-         (concat
-          "swift-mode-test:"
-          file
-          ":"
-          (prin1-to-string line)
-          ": "
-          level
-          ": "
-          message
-          "\n")))
-    (swift-mode:print-message error-buffer formatted)))
-
-(defun swift-mode:print-message (error-buffer message)
-  "Print a message to the ERROR-BUFFER or stdout.
-
-If the Emacs is in the batch mode, MESSAGE is printed to the stdout.
-Otherwise, MESSAGE is appended to the ERROR-BUFFER."
-  (if noninteractive
-      (princ message)
-    (with-current-buffer error-buffer
-      (goto-char (point-max))
-      (insert-and-inherit message))))
-
 (provide 'swift-mode-test-indent)
 
 ;;; swift-mode-test-indent.el ends here