branch: elpa/haskell-tng-mode
commit af443a1a1cdfe3657ddb7dde9e0f0c75214f6988
Author: Tseen She <ts33n....@gmail.com>
Commit: Tseen She <ts33n....@gmail.com>
fix a name clash in the tests
---
test/haskell-tng-font-lock-test.el | 10 +++++-----
test/haskell-tng-imenu-test.el | 6 +++---
test/haskell-tng-indent-test.el | 12 ++++++------
test/haskell-tng-layout-test.el | 6 +++---
test/haskell-tng-lexer-test.el | 6 +++---
test/haskell-tng-syntax-test.el | 6 +++---
test/src/indentation.hs.lexer | 17 ++++++++++++++++-
test/src/medley.hs.lexer | 5 +----
8 files changed, 40 insertions(+), 28 deletions(-)
diff --git a/test/haskell-tng-font-lock-test.el
b/test/haskell-tng-font-lock-test.el
index 291a68e..3926856 100644
--- a/test/haskell-tng-font-lock-test.el
+++ b/test/haskell-tng-font-lock-test.el
@@ -18,19 +18,19 @@
"faceup"))
;; to generate .faceup files, use faceup-view-buffer
-(ert-deftest haskell-tng-font-lock-file-tests:medley ()
+(ert-deftest haskell-tng-font-lock-file-tests-medley ()
(should (have-expected-faces (testdata "src/medley.hs"))))
-(ert-deftest haskell-tng-font-lock-file-tests:layout ()
+(ert-deftest haskell-tng-font-lock-file-tests-layout ()
(should (have-expected-faces (testdata "src/layout.hs"))))
-(ert-deftest haskell-tng-font-lock-file-tests:indentation ()
+(ert-deftest haskell-tng-font-lock-file-tests-indentation ()
(should (have-expected-faces (testdata "src/indentation.hs"))))
-(ert-deftest haskell-tng-font-lock-file-tests:indentation1 ()
+(ert-deftest haskell-tng-font-lock-file-tests-indentation1 ()
(should (have-expected-faces (testdata "src/indentation-options1.hs"))))
-(ert-deftest haskell-tng-font-lock-file-tests:indentation2 ()
+(ert-deftest haskell-tng-font-lock-file-tests-indentation2 ()
(should (have-expected-faces (testdata "src/indentation-options2.hs"))))
;;; haskell-tng-font-lock-test.el ends here
diff --git a/test/haskell-tng-imenu-test.el b/test/haskell-tng-imenu-test.el
index be8cd27..961ef69 100644
--- a/test/haskell-tng-imenu-test.el
+++ b/test/haskell-tng-imenu-test.el
@@ -10,13 +10,13 @@
(require 'haskell-tng-testutils
"test/haskell-tng-testutils.el")
-(ert-deftest haskell-tng-lexer-file-tests:layout ()
+(ert-deftest haskell-tng-imenu-file-tests-layout ()
(should (have-expected-imenu (testdata "src/layout.hs"))))
-(ert-deftest haskell-tng-lexer-file-tests:indentation ()
+(ert-deftest haskell-tng-imenu-file-tests-indentation ()
(should (have-expected-imenu (testdata "src/indentation.hs"))))
-(ert-deftest haskell-tng-lexer-file-tests:medley ()
+(ert-deftest haskell-tng-imenu-file-tests-medley ()
(should (have-expected-imenu (testdata "src/medley.hs"))))
(defun have-expected-imenu (file)
diff --git a/test/haskell-tng-indent-test.el b/test/haskell-tng-indent-test.el
index 6433333..308dbbe 100644
--- a/test/haskell-tng-indent-test.el
+++ b/test/haskell-tng-indent-test.el
@@ -42,22 +42,22 @@
;; (profiler-stop)
;; (profiler-find-profile "../indentation.profile"))
-(ert-deftest haskell-tng-append-indent-file-tests:indentation ()
+(ert-deftest haskell-tng-append-indent-file-tests-indentation ()
(should (have-expected-append-indent (testdata "src/indentation.hs"))))
-(ert-deftest haskell-tng-append-indent-file-tests:options1 ()
+(ert-deftest haskell-tng-append-indent-file-tests-options1 ()
(let ((haskell-tng-typelead 1))
(should (have-expected-append-indent (testdata
"src/indentation-options1.hs")))))
-(ert-deftest haskell-tng-append-indent-file-tests:options2 ()
+(ert-deftest haskell-tng-append-indent-file-tests-options2 ()
(let ((haskell-tng-typelead 1)
(haskell-tng-aligntypes t))
(should (have-expected-append-indent (testdata
"src/indentation-options2.hs")))))
-(ert-deftest haskell-tng-insert-indent-file-tests:indentation ()
+(ert-deftest haskell-tng-insert-indent-file-tests-indentation ()
(should (have-expected-insert-indent (testdata "src/indentation.hs"))))
-(ert-deftest haskell-tng-insert-indent-file-tests:options1 ()
+(ert-deftest haskell-tng-insert-indent-file-tests-options1 ()
(let ((haskell-tng-typelead 1))
(should (have-expected-insert-indent (testdata
"src/indentation-options1.hs")))))
-(ert-deftest haskell-tng-insert-indent-file-tests:options2 ()
+(ert-deftest haskell-tng-insert-indent-file-tests-options2 ()
(let ((haskell-tng-typelead 1)
(haskell-tng-aligntypes t))
(should (have-expected-insert-indent (testdata
"src/indentation-options2.hs")))))
diff --git a/test/haskell-tng-layout-test.el b/test/haskell-tng-layout-test.el
index c1a94a3..10cdbe1 100644
--- a/test/haskell-tng-layout-test.el
+++ b/test/haskell-tng-layout-test.el
@@ -11,16 +11,16 @@
(require 'haskell-tng-testutils
"test/haskell-tng-testutils.el")
-(ert-deftest haskell-tng-layout-file-tests:layout ()
+(ert-deftest haskell-tng-layout-file-tests-layout ()
;; the Haskell2010 test case
(should (have-expected-layout (testdata "src/layout.hs")))
(should (have-expected-layout-reverse (testdata "src/layout.hs"))))
-(ert-deftest haskell-tng-layout-file-tests:indentation ()
+(ert-deftest haskell-tng-layout-file-tests-indentation ()
(should (have-expected-layout (testdata "src/indentation.hs")))
(should (have-expected-layout-reverse (testdata "src/indentation.hs"))))
-(ert-deftest haskell-tng-layout-file-tests:medley ()
+(ert-deftest haskell-tng-layout-file-tests-medley ()
(should (have-expected-layout (testdata "src/medley.hs")))
(should (have-expected-layout-reverse (testdata "src/medley.hs"))))
diff --git a/test/haskell-tng-lexer-test.el b/test/haskell-tng-lexer-test.el
index 548feff..29a34d2 100644
--- a/test/haskell-tng-lexer-test.el
+++ b/test/haskell-tng-lexer-test.el
@@ -11,15 +11,15 @@
(require 'haskell-tng-testutils
"test/haskell-tng-testutils.el")
-(ert-deftest haskell-tng-lexer-file-tests:layout ()
+(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"))))
-(ert-deftest haskell-tng-lexer-file-tests:indentation ()
+(ert-deftest haskell-tng-lexer-file-tests-indentation ()
(should (have-expected-forward-lex (testdata "src/indentation.hs")))
(should (have-expected-backward-lex (testdata "src/indentation.hs"))))
-(ert-deftest haskell-tng-lexer-file-tests:medley ()
+(ert-deftest haskell-tng-lexer-file-tests-medley ()
(should (have-expected-forward-lex (testdata "src/medley.hs")))
(should (have-expected-backward-lex (testdata "src/medley.hs"))))
diff --git a/test/haskell-tng-syntax-test.el b/test/haskell-tng-syntax-test.el
index 6c09431..539b88d 100644
--- a/test/haskell-tng-syntax-test.el
+++ b/test/haskell-tng-syntax-test.el
@@ -49,13 +49,13 @@
(s-join "" codes)))
;; to generate .faceup files, use faceup-view-buffer
-(ert-deftest haskell-tng-syntax-file-tests:medley ()
+(ert-deftest haskell-tng-syntax-file-tests-medley ()
(should (have-expected-syntax (testdata "src/medley.hs"))))
-(ert-deftest haskell-tng-syntax-file-tests:layout ()
+(ert-deftest haskell-tng-syntax-file-tests-layout ()
(should (have-expected-syntax (testdata "src/layout.hs"))))
-(ert-deftest haskell-tng-syntax-file-tests:indentation ()
+(ert-deftest haskell-tng-syntax-file-tests-indentation ()
(should (have-expected-syntax (testdata "src/indentation.hs"))))
;;; haskell-tng-syntax-test.el ends here
diff --git a/test/src/indentation.hs.lexer b/test/src/indentation.hs.lexer
index ecf1659..a244df2 100644
--- a/test/src/indentation.hs.lexer
+++ b/test/src/indentation.hs.lexer
@@ -73,7 +73,20 @@ VARID
; VARID SYMID
VARID
-} ; data CONID = CONID CONID
+} ; VARID VARID =
+if VARID SYMID 0
+then VARID
+else SYMID VARID
+
+; VARID VARID =
+if
+VARID SYMID 0
+then
+VARID
+else
+SYMID VARID
+
+; data CONID = CONID CONID
| CONID CONID
| CONID CONID
@@ -144,4 +157,6 @@ CONID VARID
; VARID :: « CONID VARID , CONID CONID VARID » =>
« VARID :: CONID VARID » =>
VARID => VARID => VARID
+
+; VARID :: CONID => CONID
}
diff --git a/test/src/medley.hs.lexer b/test/src/medley.hs.lexer
index f99d8d4..d6108dd 100644
--- a/test/src/medley.hs.lexer
+++ b/test/src/medley.hs.lexer
@@ -46,7 +46,7 @@ VARID , VARID , VARID »
; VARID = VARID § 2
-; VARID = §
+; VARID = § SYMID §
; class CONID VARID VARID where
{ VARID :: CONID VARID => VARID
@@ -132,9 +132,6 @@ CONSYM CONID CONID CONID
CONSYM CONID
CONSYM CONID « CONID » « CONID CONID »
-; VARID :: CONID « CONID »
-; VARID :: CONID => CONID CONID
-; VARID :: CONID => CONID => CONID CONID
; VARID CONSYM VARID CONSYM VARID = VARID « CONID @ CONID »
; deriving instance CONID CONID
