branch: scratch/editorconfig-cc commit 8a2e9be119b0ff4d063b4034347e8081f48b943f Author: 10sr <8slashes+...@gmail.com> Commit: Stefan Monnier <monn...@iro.umontreal.ca>
Fix indentations of ert-tests/ See #111 --- ert-tests/editorconfig-core-handle.el | 60 +++++----- ert-tests/editorconfig-core.el | 20 ++-- ert-tests/editorconfig-fnmatch.el | 202 +++++++++++++++++----------------- ert-tests/metadata.el | 4 +- 4 files changed, 143 insertions(+), 143 deletions(-) diff --git a/ert-tests/editorconfig-core-handle.el b/ert-tests/editorconfig-core-handle.el index 2133fafd2b..de319fe1ae 100644 --- a/ert-tests/editorconfig-core-handle.el +++ b/ert-tests/editorconfig-core-handle.el @@ -3,48 +3,48 @@ (ert-deftest test-editorconfig-core-handle () ;; handle.ini (let* ((fixtures (concat default-directory - "ert-tests/fixtures/")) - (conf (concat fixtures - "handle.ini")) - (handle (editorconfig-core-handle conf))) + "ert-tests/fixtures/")) + (conf (concat fixtures + "handle.ini")) + (handle (editorconfig-core-handle conf))) (should (editorconfig-core-handle-root-p handle)) (should (equal (editorconfig-core-handle-get-properties handle - (concat fixtures - "b.js")) - '((("key2" . "value2"))))) + (concat fixtures + "b.js")) + '((("key2" . "value2"))))) (should (equal (editorconfig-core-handle-get-properties handle - (concat fixtures - "a.js")) - '((("key1" . "value1")) (("key2" . "value2")))))) + (concat fixtures + "a.js")) + '((("key1" . "value1")) (("key2" . "value2")))))) ;; Test twice for checking cache (let* ((fixtures (concat default-directory - "ert-tests/fixtures/")) - (conf (concat fixtures - "handle.ini")) - (handle (editorconfig-core-handle conf))) + "ert-tests/fixtures/")) + (conf (concat fixtures + "handle.ini")) + (handle (editorconfig-core-handle conf))) (should (editorconfig-core-handle-root-p handle)) (should (equal (editorconfig-core-handle-get-properties handle - (concat fixtures - "b.js")) - '((("key2" . "value2"))))) + (concat fixtures + "b.js")) + '((("key2" . "value2"))))) (should (equal (editorconfig-core-handle-get-properties handle - (concat fixtures - "a.js")) - '((("key1" . "value1")) (("key2" . "value2")))))) + (concat fixtures + "a.js")) + '((("key1" . "value1")) (("key2" . "value2")))))) ;; handle2.ini (let* ((fixtures (concat default-directory - "ert-tests/fixtures/")) - (conf (concat fixtures - "handle2.ini")) - (handle (editorconfig-core-handle conf))) + "ert-tests/fixtures/")) + (conf (concat fixtures + "handle2.ini")) + (handle (editorconfig-core-handle conf))) (should-not (editorconfig-core-handle-root-p handle)) (should (equal (editorconfig-core-handle-get-properties handle - (concat fixtures - "b.js")) - nil)) + (concat fixtures + "b.js")) + nil)) (should (equal (editorconfig-core-handle-get-properties handle - (concat fixtures - "a.js")) - '((("key" . "value")))))) + (concat fixtures + "a.js")) + '((("key" . "value")))))) ) diff --git a/ert-tests/editorconfig-core.el b/ert-tests/editorconfig-core.el index aec80beba2..f85e2ba48e 100644 --- a/ert-tests/editorconfig-core.el +++ b/ert-tests/editorconfig-core.el @@ -2,23 +2,23 @@ (ert-deftest test-editorconfig-core--remove-duplicate () (should (equal (editorconfig-core--remove-duplicate '(("a" . 1) ("b" . 2) ("c" . 3) ("b" . 4))) - '(("a" . 1) ("b" . 4) ("c" . 3)))) + '(("a" . 1) ("b" . 4) ("c" . 3)))) (should (equal (editorconfig-core--remove-duplicate '(("a" . 1) ("b" . 2) ("c" . 3))) - '(("a" . 1) ("b" . 2) ("c" . 3)))) + '(("a" . 1) ("b" . 2) ("c" . 3)))) (should (equal (editorconfig-core--remove-duplicate nil) - nil)) + nil)) ) (ert-deftest test-editorconfig-core--get-handles () (let* ((fixtures (concat default-directory - "/ert-tests/fixtures/")) - (dir (concat fixtures - "dir1")) - (confname "parent.ini") - (handles (editorconfig-core--get-handles dir - confname))) + "/ert-tests/fixtures/")) + (dir (concat fixtures + "dir1")) + (confname "parent.ini") + (handles (editorconfig-core--get-handles dir + confname))) (should (= 2 - (length handles))) + (length handles))) (should (editorconfig-core-handle-p (car handles))) (should (editorconfig-core-handle-p (cadr handles))))) diff --git a/ert-tests/editorconfig-fnmatch.el b/ert-tests/editorconfig-fnmatch.el index da923e3fcf..41421589ee 100644 --- a/ert-tests/editorconfig-fnmatch.el +++ b/ert-tests/editorconfig-fnmatch.el @@ -3,111 +3,111 @@ (ert-deftest test-editorconfig-fnmatch-p () (let ((cases-t - '(("a.js" "a.js") - ("/dir/a.js" "/dir/a.js") - - ("a.js" "*.js") - ("a.js" "**.js") - ("/dir/a.js" "/dir/*.js") - ("/dir/a.js" "/dir/*") - - ("/dir/sub/a.js" "**.js") - ("/dir/sub/a.py" "/dir/**.py") - - ("a.js" "?.js") - ("abc.js" "a?c.js") - ("/dir/a.js" "/dir/?.js") - - ("a.js" "[abc].js") - ("b.js" "[abc].js") - ("ab.js" "[abc]b.js") - ("/dir/a.js" "/dir/[abc].js") - ("ab[e/]cd.i" "ab[e/]cd.i") - ("a.js" "[a-c].js") - ("1.js" "[1-3].js") - ("a.js" "[a-c1-3].js") - ("1.js" "[a-c1-3].js") - - ("d.js" "[^abc].js") - ("db.js" "[^abc]b.js") - ("/dir/d.js" "/dir/[^abc].js") - ("d.js" "[^a-c].js") - - ("a.js" "a.{py,js}") - ("a.py" "a.{py,js}") - ("/dir/a.py" "/dir/a.{py,js}") - ("/dir/a.py" "/dir/a.{py,js}") - ("a.js" "*.{py,js}") - ("a.py" "*.{py,js}") - ("/dir/a.js" "/dir/*.{py,js}") - ("/dir/a.py" "/dir/*.{py,js}") - ("/dir/sub/a.py" "**.{py,js}") - ("/dir/sub/a.py" "/dir/**.{py,js}") - ("{single}.b" "{single}.b") - ("{.f" "{.f") - ("}.f" "}.f") - - ("a.js" "{a,[0-9]}.js") - ("1.js" "{a,[0-9]}.js") - ("-3.py" "{-3..3}.{js,py}") - - ("1.js" "{0..3}.js") - ("1.js" "{0..+3}.js") - ("-1.js" "{-3..3}.js") - ("-1.js" "{-3..3}.js") - - ("test3" "{test3,test00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 [...] - )) - (cases-nil - '(("a.js" "b.js") - - ("a.js" "*.py") - ("/dir/a.js" "/dir/*.py") - ("/dir/sub/a.js" "/dir/*.js") - - ("/dir/a.js" "/sub/**.js") - ("/dir/sub/a.js" "/sub/**.js") - - ("ab.js" "?.js") - ("ab.js" "?a.js") - ("/dir/ab.js" "/dir/?.js") - ("/dir/ab.js" "/dir/?a.js") - - ("d.js" "[abc].js") - ("db.js" "[abc]b.js") - ("/dir/d.js" "/dir/[abc].js") - ("d.js" "[a-c].js") - ("4.js" "[1-3].js") - ("d.js" "[a-c1-3].js") - ("4.js" "[a-c1-3].js") - - ("a.js" "[^abc].js") - ("ab.js" "[^abc]b.js") - ("/dir/a.js" "/dir/[^abc].js") - ("a.js" "[^a-c].js") - ("a.js" "[^a-c1-3].js") - ("1.js" "[^a-c1-3].js") - - ("a.el" "a.{py,js}") - ("a.el" "*.{py,js}") - ("/dir/a.el" "/dir/a.{py,js}") - ("/dir/a.el" "/dir/*.{py,js}") - ("/dir/a.el" "**.{py,js}") - - ("1.js" "{3..6}.js") - ("-1.js" "{0..3}.js") - ("-1.js" "{3..-3}.js") - ))) + '(("a.js" "a.js") + ("/dir/a.js" "/dir/a.js") + + ("a.js" "*.js") + ("a.js" "**.js") + ("/dir/a.js" "/dir/*.js") + ("/dir/a.js" "/dir/*") + + ("/dir/sub/a.js" "**.js") + ("/dir/sub/a.py" "/dir/**.py") + + ("a.js" "?.js") + ("abc.js" "a?c.js") + ("/dir/a.js" "/dir/?.js") + + ("a.js" "[abc].js") + ("b.js" "[abc].js") + ("ab.js" "[abc]b.js") + ("/dir/a.js" "/dir/[abc].js") + ("ab[e/]cd.i" "ab[e/]cd.i") + ("a.js" "[a-c].js") + ("1.js" "[1-3].js") + ("a.js" "[a-c1-3].js") + ("1.js" "[a-c1-3].js") + + ("d.js" "[^abc].js") + ("db.js" "[^abc]b.js") + ("/dir/d.js" "/dir/[^abc].js") + ("d.js" "[^a-c].js") + + ("a.js" "a.{py,js}") + ("a.py" "a.{py,js}") + ("/dir/a.py" "/dir/a.{py,js}") + ("/dir/a.py" "/dir/a.{py,js}") + ("a.js" "*.{py,js}") + ("a.py" "*.{py,js}") + ("/dir/a.js" "/dir/*.{py,js}") + ("/dir/a.py" "/dir/*.{py,js}") + ("/dir/sub/a.py" "**.{py,js}") + ("/dir/sub/a.py" "/dir/**.{py,js}") + ("{single}.b" "{single}.b") + ("{.f" "{.f") + ("}.f" "}.f") + + ("a.js" "{a,[0-9]}.js") + ("1.js" "{a,[0-9]}.js") + ("-3.py" "{-3..3}.{js,py}") + + ("1.js" "{0..3}.js") + ("1.js" "{0..+3}.js") + ("-1.js" "{-3..3}.js") + ("-1.js" "{-3..3}.js") + + ("test3" "{test3,test0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 [...] + )) + (cases-nil + '(("a.js" "b.js") + + ("a.js" "*.py") + ("/dir/a.js" "/dir/*.py") + ("/dir/sub/a.js" "/dir/*.js") + + ("/dir/a.js" "/sub/**.js") + ("/dir/sub/a.js" "/sub/**.js") + + ("ab.js" "?.js") + ("ab.js" "?a.js") + ("/dir/ab.js" "/dir/?.js") + ("/dir/ab.js" "/dir/?a.js") + + ("d.js" "[abc].js") + ("db.js" "[abc]b.js") + ("/dir/d.js" "/dir/[abc].js") + ("d.js" "[a-c].js") + ("4.js" "[1-3].js") + ("d.js" "[a-c1-3].js") + ("4.js" "[a-c1-3].js") + + ("a.js" "[^abc].js") + ("ab.js" "[^abc]b.js") + ("/dir/a.js" "/dir/[^abc].js") + ("a.js" "[^a-c].js") + ("a.js" "[^a-c1-3].js") + ("1.js" "[^a-c1-3].js") + + ("a.el" "a.{py,js}") + ("a.el" "*.{py,js}") + ("/dir/a.el" "/dir/a.{py,js}") + ("/dir/a.el" "/dir/*.{py,js}") + ("/dir/a.el" "**.{py,js}") + + ("1.js" "{3..6}.js") + ("-1.js" "{0..3}.js") + ("-1.js" "{3..-3}.js") + ))) (dolist (args cases-t) (message "-> t: %S" - `(editorconfig-fnmatch-p ,@args)) + `(editorconfig-fnmatch-p ,@args)) (message " Elapsed: %S" - (car (benchmark-run 3 (should (apply 'editorconfig-fnmatch-p - args)))))) + (car (benchmark-run 3 (should (apply 'editorconfig-fnmatch-p + args)))))) (dolist (args cases-nil) (message "-> nil: %S" - `(editorconfig-fnmatch-p ,@args)) + `(editorconfig-fnmatch-p ,@args)) (message " Elapsed: %S" - (car (benchmark-run 3 (should-not (apply 'editorconfig-fnmatch-p - args))))))) + (car (benchmark-run 3 (should-not (apply 'editorconfig-fnmatch-p + args))))))) ) diff --git a/ert-tests/metadata.el b/ert-tests/metadata.el index d762752209..775dae2ace 100644 --- a/ert-tests/metadata.el +++ b/ert-tests/metadata.el @@ -5,8 +5,8 @@ (ert-deftest test-metadata () (dolist (el metadata-el-files) (message "Loading info: %s" - el) + el) (with-temp-buffer (insert-file-contents el) (message "%S" - (package-buffer-info))))) + (package-buffer-info)))))