branch: elpa/swift-mode
commit 66bfbc516c6fac317c25371ea55e8f275d05953e
Author: Chris Barrett <chris.d.barr...@me.com>
Commit: Chris Barrett <chris.d.barr...@me.com>
Add indentation tests, add makefile runner task
Run `make check` to run tests
---
Cask | 1 +
Makefile | 9 +-
test/indentation-tests.el | 234 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 243 insertions(+), 1 deletion(-)
diff --git a/Cask b/Cask
index 1bb5d9f..6b3af1d 100644
--- a/Cask
+++ b/Cask
@@ -4,5 +4,6 @@
(package-file "swift-mode.el")
(development
+ (depends-on "s")
(depends-on "flycheck")
(depends-on "flycheck-cask"))
diff --git a/Makefile b/Makefile
index 652c50f..7769b1b 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,13 @@ deps : $(PKG_DIR)
$(PKG_DIR) :
$(CASK) install
+.PHONY: check
+check : deps
+ $(CASK) exec $(EMACS) $(EMACSFLAGS) \
+ $(patsubst %,-l % , $(SRCS))\
+ $(patsubst %,-l % , $(TESTS))\
+ -f ert-run-tests-batch-and-exit
+
.PHONY: install
install : $(DIST) $(USER_ELPA_D)
$(EMACS) $(EMACSFLAGS) -l package \
@@ -38,7 +45,7 @@ clean-all : clean
.PHONY: clean
clean :
- cask clean-elc
+ $(CASK) clean-elc
rm -f *.elc
rm -rf $(DIST)
diff --git a/test/indentation-tests.el b/test/indentation-tests.el
new file mode 100644
index 0000000..f10c9eb
--- /dev/null
+++ b/test/indentation-tests.el
@@ -0,0 +1,234 @@
+;;; indentation-tests.el --- Test swift-mode indentation behaviour
+
+;; Copyright (C) 2014 Chris Barrett
+
+;; Author: Chris Barrett <chris.d.barr...@me.com>
+;; Version: 0.1
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Test swift-mode indentation behaviour
+
+;;; Code:
+
+(require 'ert)
+(require 'swift-mode)
+(require 's)
+
+(defmacro check-indentation (description before after)
+ "Declare an ert test for indentation behaviour.
+The test will check that the swift indentation command results changes the
+buffer from one state to another. It will also test that point is moved to
+an expected position.
+
+DESCRIPTION is a symbol describing the test.
+
+BEFORE is the buffer string before indenting, where a pipe (|) represents
+point.
+
+AFTER is the expected buffer string after indenting, where a pipe (|)
+represents the expected position of point."
+ (declare (indent 1))
+ (let ((fname (intern (format "indentation/%s" description))))
+ `(ert-deftest ,fname ()
+ (let* ((after ,after)
+ (expected-cursor-pos (1+ (s-index-of "|" after)))
+ (expected-state (delete ?| after))
+
+ ;; Set the offset to a consistent value for tests.
+ (swift-indent-offset 4))
+ (with-temp-buffer
+ (insert ,before)
+ (goto-char (point-min))
+ (search-forward "|")
+ (delete-char -1)
+ (swift-mode)
+ (indent-according-to-mode)
+
+ (should (equal expected-state (buffer-string)))
+ (should (equal expected-cursor-pos (point))))))))
+
+(check-indentation no-indentation-at-top-level
+ "|x"
+ "|x")
+
+(check-indentation toplevel-exprs-indented-to-same-level/1
+ "
+x
+|y
+" "
+x
+|y
+")
+
+(check-indentation toplevel-exprs-indented-to-same-level/2
+ "
+x
+ |y
+" "
+x
+|y
+")
+
+(check-indentation nested-exprs-indented-to-same-level/1
+ "
+{
+ x
+ |y
+}
+" "
+{
+ x
+ |y
+}
+")
+
+(check-indentation nested-exprs-indented-to-same-level/2
+ "
+{
+ x
+ |y
+}
+" "
+{
+ x
+ |y
+}
+")
+
+(check-indentation nested-exprs-indented-to-same-level/3
+ "
+{
+ x
+|y
+}
+" "
+{
+ x
+ |y
+}
+")
+
+(check-indentation indent-if-body
+ "
+if true {
+|x
+}
+" "
+if true {
+ |x
+}
+")
+
+(check-indentation indent-if-body--no-effect-if-already-indented
+ "
+if true {
+ |x
+}
+""
+if true {
+ |x
+}
+")
+
+(check-indentation indents-case-statements-to-same-level-as-enclosing-switch/1
+ "
+switch true {
+ |case
+}
+" "
+switch true {
+|case
+}
+")
+
+(check-indentation indents-case-statements-to-same-level-as-enclosing-switch/2
+ "
+switch true {
+ |case
+}
+" "
+switch true {
+|case
+}
+")
+
+(check-indentation indents-case-statements-to-same-level-as-enclosing-switch/3
+ "
+{
+ switch true {
+|case
+ }
+}
+" "
+{
+ switch true {
+ |case
+ }
+}
+")
+
+(check-indentation indents-case-statements-to-same-level-as-enclosing-switch/4
+ "
+{
+ switch true {
+ |case
+ }
+}
+" "
+{
+ switch true {
+ |case
+ }
+}
+")
+
+
+(check-indentation
indents-default-statements-to-same-level-as-enclosing-switch/1
+ "
+{
+ switch true {
+|default
+ }
+}
+" "
+{
+ switch true {
+ |default
+ }
+}
+")
+
+(check-indentation
indents-default-statements-to-same-level-as-enclosing-switch/2
+ "
+{
+ switch true {
+ |default
+ }
+}
+" "
+{
+ switch true {
+ |default
+ }
+}
+")
+
+(provide 'indentation-tests)
+
+;;; indentation-tests.el ends here
