branch: elpa/haskell-tng-mode
commit 5fe4cb1973acf68fc7e025d97429556bb37db361
Author: Tseen She <ts33n....@gmail.com>
Commit: Tseen She <ts33n....@gmail.com>
cleanup test includes
---
Cask | 3 ---
test/haskell-tng-compile-test.el | 6 ++----
test/haskell-tng-dynamic-test.el | 8 ++------
test/haskell-tng-font-lock-test.el | 6 ++----
test/haskell-tng-hsinspect-test.el | 6 ++----
test/haskell-tng-imenu-test.el | 6 ++----
test/haskell-tng-indent-test.el | 8 ++------
test/haskell-tng-layout-test.el | 7 ++-----
test/haskell-tng-lexer-test.el | 7 ++-----
test/haskell-tng-sexp-test.el | 7 ++-----
test/haskell-tng-syntax-test.el | 7 ++-----
test/haskell-tng-testutils.el | 6 ++++++
12 files changed, 26 insertions(+), 51 deletions(-)
diff --git a/Cask b/Cask
index 1e0db99..80cad22 100644
--- a/Cask
+++ b/Cask
@@ -26,13 +26,10 @@
(development
(depends-on "company" "0.9.12")
- (depends-on "popup") ;; version defined in -pkg.el
;;(depends-on "elsa") ;; cask exec elsa FILE
(depends-on "faceup") ;; no stable release
(depends-on "ert-runner" "0.7.0")
(depends-on "shut-up" "0.3.2")
- ;; FIXME set up coverage
- ;;(depends-on "undercover")
(depends-on "projectile" "2.1.0")
(depends-on "smartparens" "1.11.0")
(depends-on "yasnippet" "0.14.0"))
diff --git a/test/haskell-tng-compile-test.el b/test/haskell-tng-compile-test.el
index 8301d04..823a4bf 100644
--- a/test/haskell-tng-compile-test.el
+++ b/test/haskell-tng-compile-test.el
@@ -3,13 +3,11 @@
;; Copyright (C) 2019 Tseen She
;; License: GPL 3 or any later version
-(require 'ert)
-(require 'faceup)
-
-(require 'haskell-tng-mode)
(require 'haskell-tng-testutils
"test/haskell-tng-testutils.el")
+(require 'haskell-tng-mode)
+
(defun have-expected-errors (file)
(with-temp-buffer
(let ((output (current-buffer))
diff --git a/test/haskell-tng-dynamic-test.el b/test/haskell-tng-dynamic-test.el
index 80a141c..556781f 100644
--- a/test/haskell-tng-dynamic-test.el
+++ b/test/haskell-tng-dynamic-test.el
@@ -11,15 +11,11 @@
;;
;;; Code:
-(require 'ert)
-(require 's)
-(require 'shut-up)
-
-(require 'haskell-tng-mode)
-
(require 'haskell-tng-testutils
"test/haskell-tng-testutils.el")
+(require 'haskell-tng-mode)
+
(ert-deftest haskell-tng-dynamic-file-tests ()
(should (have-expected-dynamic-output (testdata "src/hsinspect.hs"))))
diff --git a/test/haskell-tng-font-lock-test.el
b/test/haskell-tng-font-lock-test.el
index 3926856..81693d9 100644
--- a/test/haskell-tng-font-lock-test.el
+++ b/test/haskell-tng-font-lock-test.el
@@ -3,13 +3,11 @@
;; Copyright (C) 2018-2019 Tseen She
;; License: GPL 3 or any later version
-(require 'ert)
-(require 'faceup)
-
-(require 'haskell-tng-mode)
(require 'haskell-tng-testutils
"test/haskell-tng-testutils.el")
+(require 'haskell-tng-mode)
+
(defun have-expected-faces (file)
(haskell-tng--testutils-assert-file-contents
file
diff --git a/test/haskell-tng-hsinspect-test.el
b/test/haskell-tng-hsinspect-test.el
index 9a17cda..fa11592 100644
--- a/test/haskell-tng-hsinspect-test.el
+++ b/test/haskell-tng-hsinspect-test.el
@@ -3,14 +3,12 @@
;; Copyright (C) 2019 Tseen She
;; License: GPL 3 or any later version
-(require 'ert)
+(require 'haskell-tng-testutils
+ "test/haskell-tng-testutils.el")
(require 'haskell-tng-mode)
(require 'haskell-tng-hsinspect)
-(require 'haskell-tng-testutils
- "test/haskell-tng-testutils.el")
-
(ert-deftest haskell-tng-hsinspect-test-qualify-latest ()
(let ((imports
(haskell-tng--util-read
diff --git a/test/haskell-tng-imenu-test.el b/test/haskell-tng-imenu-test.el
index 961ef69..29a71d5 100644
--- a/test/haskell-tng-imenu-test.el
+++ b/test/haskell-tng-imenu-test.el
@@ -3,13 +3,11 @@
;; Copyright (C) 2019 Tseen She
;; License: GPL 3 or any later version
-(require 'ert)
-
-(require 'haskell-tng-mode)
-
(require 'haskell-tng-testutils
"test/haskell-tng-testutils.el")
+(require 'haskell-tng-mode)
+
(ert-deftest haskell-tng-imenu-file-tests-layout ()
(should (have-expected-imenu (testdata "src/layout.hs"))))
diff --git a/test/haskell-tng-indent-test.el b/test/haskell-tng-indent-test.el
index 308dbbe..c4810c8 100644
--- a/test/haskell-tng-indent-test.el
+++ b/test/haskell-tng-indent-test.el
@@ -3,15 +3,11 @@
;; Copyright (C) 2019 Tseen She
;; License: GPL 3 or any later version
-(require 'ert)
-(require 'ert-x)
-(require 's)
-
-(require 'haskell-tng-mode)
-
(require 'haskell-tng-testutils
"test/haskell-tng-testutils.el")
+(require 'haskell-tng-mode)
+
;; TODO line after `instance ... where' has too much indent
;; TODO records assigning / copy by label
;; TODO records of functions
diff --git a/test/haskell-tng-layout-test.el b/test/haskell-tng-layout-test.el
index 10cdbe1..555a804 100644
--- a/test/haskell-tng-layout-test.el
+++ b/test/haskell-tng-layout-test.el
@@ -3,14 +3,11 @@
;; Copyright (C) 2018-2019 Tseen She
;; License: GPL 3 or any later version
-(require 'ert)
-(require 's)
-
-(require 'haskell-tng-mode)
-
(require 'haskell-tng-testutils
"test/haskell-tng-testutils.el")
+(require 'haskell-tng-mode)
+
(ert-deftest haskell-tng-layout-file-tests-layout ()
;; the Haskell2010 test case
(should (have-expected-layout (testdata "src/layout.hs")))
diff --git a/test/haskell-tng-lexer-test.el b/test/haskell-tng-lexer-test.el
index 29a34d2..68c2602 100644
--- a/test/haskell-tng-lexer-test.el
+++ b/test/haskell-tng-lexer-test.el
@@ -3,14 +3,11 @@
;; Copyright (C) 2018-2019 Tseen She
;; License: GPL 3 or any later version
-(require 'ert)
-(require 's)
-
-(require 'haskell-tng-mode)
-
(require 'haskell-tng-testutils
"test/haskell-tng-testutils.el")
+(require 'haskell-tng-mode)
+
(ert-deftest haskell-tng-lexer-file-tests-layout ()
(should (have-expected-forward-lex (testdata "src/layout.hs")))
(should (have-expected-backward-lex (testdata "src/layout.hs"))))
diff --git a/test/haskell-tng-sexp-test.el b/test/haskell-tng-sexp-test.el
index 1bf5b1f..7a73af7 100644
--- a/test/haskell-tng-sexp-test.el
+++ b/test/haskell-tng-sexp-test.el
@@ -3,14 +3,11 @@
;; Copyright (C) 2018-2019 Tseen She
;; License: GPL 3 or any later version
-(require 'ert)
-(require 's)
-
-(require 'haskell-tng-mode)
-
(require 'haskell-tng-testutils
"test/haskell-tng-testutils.el")
+(require 'haskell-tng-mode)
+
;; This test was originally going to use
;; `thing-at-point-bounds-of-list-at-point' to generate all the bounds for a
;; file. But `scan-lists' (and many other sexp / list commands) are not SMIE
diff --git a/test/haskell-tng-syntax-test.el b/test/haskell-tng-syntax-test.el
index 539b88d..8ff3481 100644
--- a/test/haskell-tng-syntax-test.el
+++ b/test/haskell-tng-syntax-test.el
@@ -3,14 +3,11 @@
;; Copyright (C) 2019 Tseen She
;; License: GPL 3 or any later version
-(require 'ert)
-(require 'faceup)
-(require 's)
-
-(require 'haskell-tng-mode)
(require 'haskell-tng-testutils
"test/haskell-tng-testutils.el")
+(require 'haskell-tng-mode)
+
(defun have-expected-syntax (file)
(haskell-tng--testutils-assert-file-contents
file
diff --git a/test/haskell-tng-testutils.el b/test/haskell-tng-testutils.el
index 7bb5994..80421f8 100644
--- a/test/haskell-tng-testutils.el
+++ b/test/haskell-tng-testutils.el
@@ -7,9 +7,15 @@
;;
;; Miscellaneous testing utilities that are not required by the application.
;;
+;; We do not use `test-helper.el' because flycheck doesn't know to include it.
+;;
;;; Code:
+(require 'ert)
+(require 'ert-x)
(require 'faceup)
+(require 's)
+(require 'shut-up)
(defun haskell-tng--testutils-assert-file-contents
(file mode to-string suffix)
