[nongnu] elpa/bash-completion 6413d662ba 116/313: Rewrote the tests using ert instead of regress.

[ELPA Syncer]

branch: elpa/bash-completion
commit 6413d662baeeb73d1e3c7881ab94a6030d7abaae
Author: Stephane Zermatten <stephane@boomer.local>
Commit: Stephane Zermatten <stephane@boomer.local>

    Rewrote the tests using ert instead of regress.
---
 bash-completion-test.el | 669 +++++++++++++++++++++++++++++++++++++++++++++++
 bash-completion_test.el | 677 ------------------------------------------------
 2 files changed, 669 insertions(+), 677 deletions(-)

diff --git a/bash-completion-test.el b/bash-completion-test.el
new file mode 100644
index 0000000000..fcfe392127
--- /dev/null
+++ b/bash-completion-test.el
@@ -0,0 +1,669 @@
+;;; bash-completion_test.el --- Tests bash-completion.el
+
+;; Copyright (C) 2009 Stephane Zermatten
+
+;; Author: Stephane Zermatten <szermatt@gmx.net>
+
+;; 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 2 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:
+;;
+;; This file defines `bash-completion-regress' and run the
+;; regression tests if and only if regress is already imported.
+;;
+
+;;; History:
+;;
+
+;;; Code:
+(require 'ert)
+(require 'sz-testutils)
+(require 'cl)
+
+
+(defun bash-completion-test-send (buffer-content)
+  "Run `bash-completion-send' on BUFFER-CONTENT.
+Return (const return-value new-buffer-content)"
+  (let ((process 'proces))
+    (flet ((process-buffer
+           (process)
+           (unless (eq process 'process)
+             (error "unexpected: %s" process))
+           (current-buffer))
+          (process-send-string
+           (process command)
+           (unless (eq process 'process)
+             (error "unexpected process: %s" process))
+           (unless (equal "cmd\n" command)
+             (error "unexpected command: %s" command)))
+          (accept-process-output
+           (process timeout)
+           (unless (eq process 'process)
+             (error "unexpected process: %s" process))
+           (unless (= timeout 3.14)
+             (error "unexpected timeout: %s" timeout))
+           (insert buffer-content)
+           t))
+      (sz-testutils-with-buffer-ret-and-content
+       ""
+       (bash-completion-send "cmd" 'process 3.14)))))
+  
+;; ---------- unit tests
+(ert-deftest bash-completion-join-test ()
+  (should (equal "a hello world b c"
+          (bash-completion-join '("a" "hello" "world" "b" "c"))))
+  (should (equal "a 'hel'\\''lo' world b c"
+          (bash-completion-join '("a" "hel'lo" "world" "b" "c"))))
+  (should (equal "a 'hello world' b c"
+          (bash-completion-join '("a" "hello world" "b" "c")))))
+
+(ert-deftest bash-completion-tokenize-test ()
+  (should (equal '("a" "hello" "world" "b" "c")
+                (sz-testutils-with-buffer
+                 '("a hello world b c")
+                 (bash-completion-strings-from-tokens
+                  (bash-completion-tokenize 1 (line-end-position))))))
+  ;; extra spaces
+  (should (equal '("a" "hello" "world" "b" "c")
+                (sz-testutils-with-buffer
+                 '("  a  hello \n world \t b \r c  ")
+                 (bash-completion-strings-from-tokens
+                  (bash-completion-tokenize 1 (line-end-position 2))))))
+  ;; escaped spaces
+  (should (equal '("a" "hello world" "b" "c")
+                (sz-testutils-with-buffer
+                 '("a hello\\ world b c")
+                 (bash-completion-strings-from-tokens
+                  (bash-completion-tokenize 1 (line-end-position))))))
+  ;; escaped #
+  (should (equal '("a" "hello" "#world#" "b")
+                (sz-testutils-with-buffer
+                 '("a hello \\#world\\# b")
+                 (bash-completion-strings-from-tokens
+                  (bash-completion-tokenize 1 (line-end-position))))))
+  ;; double quotes
+  (should (equal '("a" "hello world" "b" "c")
+                (sz-testutils-with-buffer
+                 '("a \"hello world\" b c")
+                 (bash-completion-strings-from-tokens
+                  (bash-completion-tokenize 1 (line-end-position))))))
+  ;; escaped double quotes
+  (should (equal '("a" "-\"hello world\"-" "b" "c")
+                (sz-testutils-with-buffer
+                 '("a \"-\\\"hello world\\\"-\" b c")
+                 (bash-completion-strings-from-tokens
+                  (bash-completion-tokenize 1 (line-end-position))))))
+  ;; single quotes
+  (should (equal '("a" "hello world" "b" "c")
+                (sz-testutils-with-buffer
+                 '("a \"hello world\" b c")
+                 (bash-completion-strings-from-tokens
+                  (bash-completion-tokenize 1 (line-end-position))))))
+  
+  ;; escaped single quotes
+  (should (equal '("a" "-'hello world'-" "b" "c")
+         (sz-testutils-with-buffer
+          '("a '-\\'hello world\\'-' b c")
+          (bash-completion-strings-from-tokens
+           (bash-completion-tokenize 1 (line-end-position))))))
+
+  ;; complex quote mix
+  (should (equal '("a" "hello world bc" "d")
+         (sz-testutils-with-buffer
+          '("a hel\"lo w\"o'rld b'c d")
+          (bash-completion-strings-from-tokens
+           (bash-completion-tokenize 1 (line-end-position))))))
+
+  ;; unescaped semicolon
+  (should (equal '("to" "infinity" ";" "and beyond")
+                (sz-testutils-with-buffer
+                 "to infinity;and\\ beyond"
+                 (bash-completion-strings-from-tokens
+                  (bash-completion-tokenize 1 (line-end-position))))))
+
+  ;; unescaped &&"
+  (should (equal '("to" "infinity" "&&" "and beyond")
+         (sz-testutils-with-buffer
+          "to infinity&&and\\ beyond"
+          (bash-completion-strings-from-tokens
+           (bash-completion-tokenize 1 (line-end-position))))))
+
+  ;;unescaped ||"
+  (should (equal '("to" "infinity" "||" "and beyond")
+         (sz-testutils-with-buffer
+          "to infinity||and\\ beyond"
+          (bash-completion-strings-from-tokens
+           (bash-completion-tokenize 1 (line-end-position))))))
+
+  ;; quoted ;&|"
+  (should (equal '("to" "infinity;&|and" "beyond")
+                (sz-testutils-with-buffer
+                 "to \"infinity;&|and\" beyond"
+                 (bash-completion-strings-from-tokens
+                  (bash-completion-tokenize 1 (line-end-position)))))))
+
+(ert-deftest bash-completion-parse-line-test ()
+  ;; cursor at end of word"
+  (should (equal
+          '((line . "a hello world")
+            (point . 13)
+            (cword . 2)
+            (words . ("a" "hello" "world"))
+            (stub-start . 9))
+          (sz-testutils-with-buffer
+           "a hello world"
+           (bash-completion-parse-line 1 (line-end-position)))))
+
+  ;; cursor in the middle of a word"
+  (should (equal
+          '((line . "a hello wo")
+            (point . 10)
+            (cword . 2)
+            (words . ("a" "hello" "wo"))
+            (stub-start . 9))
+          (sz-testutils-with-buffer
+           "a hello wo"
+           (bash-completion-parse-line 1 (line-end-position)))))
+  
+  ;; cursor at the beginning"
+  (should (equal
+          '((line . "")
+            (point . 0)
+            (cword . 0)
+            (words . (""))
+            (stub-start . 2))
+          (sz-testutils-with-buffer
+           " "
+           (bash-completion-parse-line 1 (line-end-position)))))
+
+  ;; cursor in the middle"
+  (should (equal
+          '((line . "a hello ")
+            (point . 8)
+            (cword . 2)
+            (words . ("a" "hello" ""))
+            (stub-start . 9))
+          (sz-testutils-with-buffer
+           "a hello "
+           (bash-completion-parse-line 1 (line-end-position)))))
+  
+  ;; cursor at end"
+  (should (equal
+          '((line . "a hello world b c")
+            (point . 17)
+            (cword . 4)
+            (words . ("a" "hello" "world" "b" "c"))
+            (stub-start . 17))
+          (sz-testutils-with-buffer
+           "a hello world b c"
+           (bash-completion-parse-line 1 (line-end-position)))))
+
+  ;; complex multi-command line"
+  (should (equal 
+          '((line . "make -")
+            (point . 6)
+            (cword . 1)
+            (words . ("make" "-"))
+            (stub-start . 27))
+          (sz-testutils-with-buffer
+           "cd /var/tmp ; ZORG=t make -"
+           (bash-completion-parse-line 1 (line-end-position)))))
+
+  ;; pipe
+  (should (equal 
+          '((line . "sort -")
+            (point . 6)
+            (cword . 1)
+            (words . ("sort" "-"))
+            (stub-start . 20))
+          (sz-testutils-with-buffer
+           "ls /var/tmp | sort -"
+           (bash-completion-parse-line 1 (line-end-position)))))
+
+  ;; escaped semicolon"
+  (should (equal 
+          '((line . "find -name '*.txt' -exec echo {} ';' -")
+            (point . 38)
+            (cword . 7)
+            (words . ("find" "-name" "*.txt" "-exec" "echo" "{}" ";" "-"))
+            (stub-start . 38))
+          (sz-testutils-with-buffer
+           "find -name '*.txt' -exec echo {} ';' -"
+           (bash-completion-parse-line 1 (line-end-position)))))
+  
+  ;; at var assignment"
+  (should (equal 
+          '((line . "ZORG=t")
+            (point . 6)
+            (cword . 0)
+            (words . ("ZORG=t"))
+            (stub-start . 19))
+          (sz-testutils-with-buffer
+           "cd /var/tmp ; A=f ZORG=t"
+           (bash-completion-parse-line 1 (line-end-position)))))
+
+  ;; cursor after end"
+  (should (equal 
+          '((line . "a hello world b c ")
+            (point . 18)
+            (cword . 5)
+            (words . ("a" "hello" "world" "b" "c" ""))
+            (stub-start . 19))
+          (sz-testutils-with-buffer
+           "a hello world b c "
+           (bash-completion-parse-line 1 (line-end-position)))))
+
+  ;; with escaped quote"
+  (should (equal 
+          '((line . "cd /vcr/shows/Dexter\\'s")
+            (point . 23)
+            (cword . 1)
+            (words . ("cd" "/vcr/shows/Dexter's"))
+            (stub-start . 4))
+          (sz-testutils-with-buffer
+           "cd /vcr/shows/Dexter\\'s"
+           (bash-completion-parse-line 1 (line-end-position))))))
+
+(ert-deftest bash-completion-add-to-alist-test ()
+  ;; garbage
+  (should (equal nil
+                (let ((bash-completion-alist nil))
+                  (bash-completion-add-to-alist '("just" "some" "garbage")))))
+
+  ;; empty
+  (should (equal nil
+                (let ((bash-completion-alist nil))
+                  (bash-completion-add-to-alist '()))))
+
+  ;; empty string
+  (should (equal nil
+                (let ((bash-completion-alist nil))
+                  (bash-completion-add-to-alist '("")))))
+
+  ;; empty complete
+  (should (equal  nil
+                 (let ((bash-completion-alist nil))
+                   (bash-completion-add-to-alist '("complete")))))
+
+  ;; one command
+  (should (equal '(("cdb" . ("-e" "-F" "_cdargs_aliases")))
+                (let ((bash-completion-alist nil))
+                  (bash-completion-add-to-alist
+                   '("complete" "-e" "-F" "_cdargs_aliases" "cdb"))))))
+
+(ert-deftest bash-completion-build-alist-test ()
+  (should (equal
+          '(("cdb" "-F" "_cdargs_aliases")
+            ("project" "-F" "complete_projects")
+            ("pro" "-F" "complete_projects")
+            ("cv" "-F" "_cdargs_aliases")
+            ("cb" "-F" "_cdargs_aliases")
+            (nil "-F" "_completion_loader"))
+          (sz-testutils-with-buffer
+           "
+complete -F _cdargs_aliases cdb
+complete -F complete_projects project
+complete -F complete_projects pro
+complete -F _cdargs_aliases cv
+complete -F _cdargs_aliases cb
+complete -F _completion_loader -D
+garbage
+"
+           (let ((bash-completion-alist '(garbage)))
+             (bash-completion-build-alist (current-buffer)))))))
+
+(ert-deftest bash-completion-quote-test ()
+  ;; not necessary
+  (should (equal "hello"
+                (bash-completion-quote "hello")))
+  ;; space"
+  (should (equal "'hello world'"
+                (bash-completion-quote "hello world")))
+
+  ;; quote
+  (should (equal "'hell'\\''o'"
+         (bash-completion-quote "hell'o"))))
+
+(ert-deftest bash-completion-generate-list-test ()
+  ;; no custom completion
+  (should
+   (equal (concat "cd >/dev/null 2>&1 " (expand-file-name "~/test")
+                 " ; compgen -o default worl 2>/dev/null")
+         (let ((bash-completion-alist nil)
+               (default-directory "~/test"))
+           (bash-completion-generate-line "hello worl" 7 '("hello" "worl") 1 
nil))))
+
+  ;; custom completion no function or command
+  (should (equal 
+          "cd >/dev/null 2>&1 /test ; compgen -A -G '*.txt' -- worl 
2>/dev/null"
+          (let ((bash-completion-alist '(("zorg" . ("-A" "-G" "*.txt"))))
+                (default-directory "/test"))
+            (bash-completion-generate-line "zorg worl" 7 '("zorg" "worl") 1 
nil))))
+
+  ;; custom completion function
+  (should (equal 
+          "cd >/dev/null 2>&1 /test ; 
__BASH_COMPLETE_WRAPPER='COMP_LINE='\\''zorg worl'\\''; COMP_POINT=7; 
COMP_CWORD=1; COMP_WORDS=( zorg worl ); __zorg \"${COMP_WORDS[@]}\"' compgen -F 
__bash_complete_wrapper -- worl 2>/dev/null"
+          (let ((bash-completion-alist '(("zorg" . ("-F" "__zorg"))))
+                (default-directory "/test"))
+            (bash-completion-generate-line "zorg worl" 7 '("zorg" "worl") 1 
nil))))
+
+  ;; custom completion command
+  (should (equal 
+          "cd >/dev/null 2>&1 /test ; 
__BASH_COMPLETE_WRAPPER='COMP_LINE='\\''zorg worl'\\''; COMP_POINT=7; 
COMP_CWORD=1; COMP_WORDS=( zorg worl ); __zorg \"${COMP_WORDS[@]}\"' compgen -F 
__bash_complete_wrapper -- worl 2>/dev/null"
+          (let ((bash-completion-alist '(("zorg" . ("-C" "__zorg"))))
+                (default-directory "/test"))
+            (bash-completion-generate-line "zorg worl" 7 '("zorg" "worl") 1 
nil))))
+
+  ;; default completion function
+  (should (equal 
+          "cd >/dev/null 2>&1 /test ; 
__BASH_COMPLETE_WRAPPER='COMP_LINE='\\''zorg worl'\\''; COMP_POINT=7; 
COMP_CWORD=1; COMP_WORDS=( zorg worl ); __zorg \"${COMP_WORDS[@]}\"' compgen -F 
__bash_complete_wrapper -- worl 2>/dev/null"
+          (let ((bash-completion-alist '((nil . ("-F" "__zorg"))))
+                (default-directory "/test"))
+            (bash-completion-generate-line "zorg worl" 7 '("zorg" "worl") 1 
t))))
+
+  ;; ignore completion function
+  (should (equal 
+          "cd >/dev/null 2>&1 /test ; compgen -o default worl 2>/dev/null"
+          (let ((bash-completion-alist '((nil . ("-F" "__zorg"))))
+                (default-directory "/test"))
+            (bash-completion-generate-line "zorg worl" 7 '("zorg" "worl") 1 
nil)))))
+
+(ert-deftest bash-completion-generate-list-test ()
+  ;; empty str
+  (should (equal nil
+                (bash-completion-starts-with "" "prefix")))
+
+  ;; starts with
+  (should (equal t
+                (bash-completion-starts-with "blah-blah" "blah-")))
+
+  ;; does not starts with
+  (should (equal nil
+                (bash-completion-starts-with "blah-blah" "blih-")))
+
+  ;; same
+  (should (equal t
+                (bash-completion-starts-with "blah-" "blah-"))))
+
+(ert-deftest bash-completion-send-test ()
+  (should (equal 
+          (cons 0 "line1\nline2\n")
+          (bash-completion-test-send "line1\nline2\n\t0\v")))
+
+  ;; command failed"
+  (should (equal 
+          (cons 1 "line1\nline2\n")
+          (bash-completion-test-send "line1\nline2\n\t1\v")))
+
+  ;; wrapped function returned 124"
+  (should (equal 
+          (cons 124 "line1\nline2\n")
+         (bash-completion-test-send
+          (concat "line1\nli" bash-completion-wrapped-status "ne2\n\t0\v")))))
+
+(ert-deftest bash-completion-cd-command-prefix-test ()
+  ;; no current dir
+  (should (equal ""
+                (let ((default-directory nil))
+                  (bash-completion-cd-command-prefix))))
+  
+  ;; current dir
+  (should (equal "cd >/dev/null 2>&1 /tmp/x ; "
+                (let ((default-directory "/tmp/x"))
+                  (bash-completion-cd-command-prefix))))
+
+  ;; expand tilde
+  (should (equal
+          (concat "cd >/dev/null 2>&1 " (expand-file-name "~/x") " ; ")
+          (let ((default-directory "~/x"))
+            (bash-completion-cd-command-prefix)))))
+
+(ert-deftest bash-completion-addsuffix-test ()
+  (should (equal "hello/"
+                (flet ((file-accessible-directory-p (a) (error "unexpected")))
+                  (bash-completion-addsuffix "hello/"))))
+
+  ;; ends with space"
+  (should (equal "hello "
+                (flet ((file-accessible-directory-p (a) (error "unexpected")))
+                  (bash-completion-addsuffix "hello "))))
+
+  ;; ends with separator"
+  (should (equal "hello:"
+                (flet ((file-accessible-directory-p (a) (error "unexpected")))
+                  (bash-completion-addsuffix "hello:"))))
+
+  ;; check directory"
+  (should (equal "hello/"
+                (flet ((file-accessible-directory-p (a) (equal a 
"/tmp/hello")))
+                  (let ((default-directory "/tmp"))
+                    (bash-completion-addsuffix "hello")))))
+
+  ;; check directory, expand tilde"
+  (should (equal "y/"
+                (flet ((file-accessible-directory-p (a)
+                       (equal a (concat (expand-file-name "y" "~/x")))))
+                  (let ((default-directory "~/x"))
+                    (bash-completion-addsuffix "y"))))))
+
+(ert-deftest bash-completion-starts-with-test ()
+  (should (equal nil (bash-completion-starts-with "" "hello ")))
+  (should (equal t (bash-completion-starts-with "hello world" "hello ")))
+  (should (equal nil (bash-completion-starts-with "hello world" "hullo ")))
+  (should (equal t (bash-completion-starts-with "hello" ""))))
+
+(ert-deftest bash-completion-ends-with-test ()
+  (should (equal nil (bash-completion-ends-with "" "world")))
+  (should (equal t (bash-completion-ends-with "hello world" "world")))
+  (should (equal nil (bash-completion-ends-with "hello world" "wurld")))
+  (should (equal t (bash-completion-ends-with "hello" ""))))
+
+(ert-deftest bash-completion-last-wordbreak-test ()
+  (should (equal '("a:b:c:d:" . "e")
+                (bash-completion-last-wordbreak-split "a:b:c:d:e")))
+  (should (equal '("hello=" . "world")
+                (bash-completion-last-wordbreak-split "hello=world")))
+  (should (equal '("hello>" . "world")
+                (bash-completion-last-wordbreak-split "hello>world")))
+  (should (equal '(">" . "world")
+                (bash-completion-last-wordbreak-split ">world")))
+  (should (equal '("" . "hello")
+                (bash-completion-last-wordbreak-split "hello"))))
+
+(ert-deftest bash-completion-before-last-wordbreak-test ()
+  (should (equal "a:b:c:d:"
+                (bash-completion-before-last-wordbreak "a:b:c:d:e")))
+  (should (equal "hello="
+                (bash-completion-before-last-wordbreak "hello=world")))
+  (should (equal "hello>"
+                (bash-completion-before-last-wordbreak "hello>world")))
+  (should (equal "" (bash-completion-before-last-wordbreak "hello"))))
+
+(ert-deftest bash-completion-after-last-wordbreak-test ()
+  (should (equal "e"
+                (bash-completion-after-last-wordbreak "a:b:c:d:e")))
+  (should (equal "world"
+                (bash-completion-after-last-wordbreak "hello=world")))
+  (should (equal "world"
+                (bash-completion-after-last-wordbreak "hello>world")))
+  (should (equal "hello"
+                (bash-completion-after-last-wordbreak "hello"))))
+
+(ert-deftest bash-completion-fix-test ()
+  ;; escape rest
+  (should (equal "a\\ bc\\ d\\ e"
+                (bash-completion-fix "a\\ bc d e" "a\\ b")))
+
+  ;; do not escape final space
+  (should (equal "ab "
+                (let ((bash-completion-nospace nil))
+                  (bash-completion-fix "ab " "a"))))
+     
+  ;; remove final space
+  (should (equal "ab"
+                (let ((bash-completion-nospace t))
+                  (bash-completion-fix "ab " "a"))))
+
+  ;; unexpand home and escape
+  (should (equal "~/a/hello\\ world"
+                (bash-completion-fix (expand-file-name "~/a/hello world")
+                                     "~/a/he")))
+
+  ;; match after wordbreak and escape
+  (should (equal "a:b:c:hello\\ world"
+                (bash-completion-fix "hello world" "a:b:c:he")))
+
+  ;; just append
+  (should (equal "hello\\ world"
+                (bash-completion-fix " world" "hello")))
+
+  ;; subset of the prefix"
+  (should (equal "Dexter"
+                (bash-completion-fix "Dexter" "Dexter'"))))
+
+(ert-deftest bash-completion-extract-candidates-test ()
+  (should (equal 
+          '("hello\\ world" "hello ")
+          (let ((bash-completion-nospace nil))
+            (flet ((bash-completion-buffer () (current-buffer)))
+              (sz-testutils-with-buffer
+               "hello world\nhello \n\n"
+               (bash-completion-extract-candidates "hello" nil)))))))
+
+(ert-deftest bash-completion-nonsep-test ()
+  (should (equal "^ \t\n\r;&|'\"#"
+                (bash-completion-nonsep nil)))
+  (should (equal "^ \t\n\r'"
+                (bash-completion-nonsep ?')))
+  (should (equal "^ \t\n\r\""
+                (bash-completion-nonsep ?\"))))
+
+(ert-deftest bash-completion-escape-candiate-test ()
+  ;; no quote
+  (should (equal "He\\ said:\\ \\\"hello,\\ \\'you\\'\\\""
+         (bash-completion-escape-candidate "He said: \"hello, 'you'\"" nil)))
+
+  ;; no quote
+  (should (equal "\\#hello\\#"
+                (bash-completion-escape-candidate "#hello#" nil)))
+
+  ;; single quote
+  (should (equal "He said: \"hello, '\\''you'\\''\""
+                (bash-completion-escape-candidate "He said: \"hello, 'you'\"" 
?')))
+
+  ;; double quote
+  (should (equal "He said: \\\"hello, 'you'\\\""
+                (bash-completion-escape-candidate "He said: \"hello, 'you'\"" 
?\")))
+
+  ;; no quote not if double quoted
+  (should (equal "\"hello, you"
+                (bash-completion-escape-candidate "\"hello, you" nil)))
+  
+  ;; no quote not if single quoted
+  (should (equal "'hello, you"
+                (bash-completion-escape-candidate "'hello, you" nil))))
+
+(ert-deftest bash-completion-quote-test ()
+  ;; allowed
+  (should (equal "abc_ABC/1-2.3"
+                (bash-completion-quote "abc_ABC/1-2.3")))
+
+  ;; quoted
+  (should (equal "'a$b'" (bash-completion-quote "a$b")))
+
+  ;; quoted single quote
+  (should (equal "'a'\\''b'" (bash-completion-quote "a'b"))))
+
+(ert-deftest bash-completion-join-test ()
+  (should (equal "ls -l /a/b '/a/b c' '/a/b'\\''c' '$help/d'"
+                (bash-completion-join '("ls" "-l" "/a/b" "/a/b c" "/a/b'c" 
"$help/d")))))
+
+
+;; ---------- integration tests
+
+(defmacro bash-completion_test-harness (&rest body)
+  `(let ((bash-completion-process nil) (bash-completion-alist nil))
+     (unwind-protect
+        (progn ,@body)
+       ;; tearDown
+       (condition-case err
+          (when bash-completion-process
+            (let ((buffer (process-buffer bash-completion-process)))
+              (kill-process bash-completion-process)
+              (kill-buffer buffer)))
+        (error (message "error in bash-completion_test tearDown: %s" err))))))
+
+(defmacro bash-completion_test-with-shell (complete-me)
+  `(bash-completion_test-harness
+    (let ((shell-buffer nil)
+         (explicit-shell-file-name bash-completion-prog))
+      (unwind-protect
+         (progn
+           (setq shell-buffer (shell (generate-new-buffer-name
+                                      "*bash-completion_test-with-shell*")))
+           ;; accept process output until there's nothing left
+           (while (accept-process-output nil 0.6))
+           ;; do a completion and return the result
+           (with-current-buffer shell-buffer
+             (insert ,complete-me)
+             (let ((start (point)))
+               (bash-completion-dynamic-complete-legacy)
+               (buffer-substring-no-properties start (point-max)))))
+       ;; finally
+       (when (and shell-buffer (buffer-live-p shell-buffer))
+         (with-current-buffer shell-buffer
+           (insert "\nexit\n"))
+         (kill-buffer shell-buffer))))))
+
+(ert-deftest bash-completion-interaction-test ()
+  (should (equal
+          '(nil t t ("help ") "t\n" nil nil)
+          (bash-completion_test-harness
+           (list
+            (bash-completion-is-running)
+            (buffer-live-p (bash-completion-buffer))
+            (bash-completion-is-running)
+            ;; TODO: why does bash-completion-comm return twice the
+            ;; same string? Fix.
+            (delete-dups  
+             (bash-completion-comm "hel" 4 '("hel") 0 nil))
+            (progn
+              (bash-completion-send "echo $EMACS_BASH_COMPLETE")
+              (with-current-buffer (bash-completion-buffer)
+                (buffer-string)))
+            (bash-completion-reset)
+            (bash-completion-is-running))))))
+
+(ert-deftest bash-completion-setenv-test ()
+  (should (equal
+          "t\n"
+          (bash-completion_test-harness
+           (bash-completion-send "echo $EMACS_BASH_COMPLETE")
+           (with-current-buffer (bash-completion-buffer)
+             (buffer-string))))))
+
+(ert-deftest bash-completion-one-completion-test ()
+  ;; TODO: Fix this test. It is flakey because of timing issues. 
+  (should (bash-completion-ends-with
+          (bash-completion_test-with-shell "__bash_complete_")
+          "__bash_complete_wrapper ")))
+
+(ert-deftest bash-completion-wordbreak-completion-test ()
+  (should (bash-completion-ends-with
+          (bash-completion_test-with-shell "export PATH=/sbin:/bi")
+          "export PATH=/sbin:/bin/")))
+
+;;; bash-completion_test.el ends here
diff --git a/bash-completion_test.el b/bash-completion_test.el
deleted file mode 100644
index c829bda400..0000000000
--- a/bash-completion_test.el
+++ /dev/null
@@ -1,677 +0,0 @@
-;;; bash-completion_test.el --- Tests bash-completion.el
-
-;; Copyright (C) 2009 Stephane Zermatten
-
-;; Author: Stephane Zermatten <szermatt@gmx.net>
-
-;; 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 2 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:
-;;
-;; This file defines `bash-completion-regress' and run the
-;; regression tests if and only if regress is already imported.
-;;
-
-;;; History:
-;;
-
-;;; Code:
-(eval-when-compile
-  (require 'sz-testutils)
-  (require 'cl)
-
-  (defun bash-completion-test-send (buffer-content)
-    "Run `bash-completion-send' on BUFFER-CONTENT.
-Return (const return-value new-buffer-content)"
-    (let ((process 'proces))
-      (flet ((process-buffer
-             (process)
-             (unless (eq process 'process)
-               (error "unexpected: %s" process))
-             (current-buffer))
-            (process-send-string
-             (process command)
-             (unless (eq process 'process)
-               (error "unexpected process: %s" process))
-             (unless (equal "cmd\n" command)
-               (error "unexpected command: %s" command)))
-            (accept-process-output
-             (process timeout)
-             (unless (eq process 'process)
-               (error "unexpected process: %s" process))
-             (unless (= timeout 3.14)
-               (error "unexpected timeout: %s" timeout))
-             (insert buffer-content)
-             t))
-       (sz-testutils-with-buffer-ret-and-content
-        ""
-        (bash-completion-send "cmd" 'process 3.14)))))
-  
-  (defvar bash-completion-run-integration-tests nil
-    "Run integration tests. Integration start subprocess (bash
-shells) and as a result are too slow to be run in many
-cases. That's why they need to be enabled manually.")
-
-  ;; This code will not appear in the compiled (.elc) file
-
-  ;; ---------- unit tests
-  (put 'bash-completion-regress 'regression-suite t)
-  (setq bash-completion-regress
-   '("bash-completion-regress"
-     ;; Each test in the suite is of the form:
-     ;;   ([description] probe grader)
-     ;;   DESCRIPTION - string
-     ;;   PROBE -  a sexp which runs the actual test
-     ;;   GRADER - the desired result or a sexp which determines
-     ;;   how we did
-
-     ("bash-completion-join simple"
-      (bash-completion-join '("a" "hello" "world" "b" "c"))
-      "a hello world b c")
-
-     ("bash-completion-join escape quote"
-      (bash-completion-join '("a" "hel'lo" "world" "b" "c"))
-      "a 'hel'\\''lo' world b c")
-
-     ("bash-completion-join escape space"
-      (bash-completion-join '("a" "hello world" "b" "c"))
-      "a 'hello world' b c")
-
-     ("bash-completion-tokenize simple"
-      (sz-testutils-with-buffer
-       '("a hello world b c")
-       (bash-completion-strings-from-tokens
-       (bash-completion-tokenize 1 (line-end-position))))
-      '("a" "hello" "world" "b" "c"))
-
-     ("bash-completion-tokenize simple extra spaces"
-      (sz-testutils-with-buffer
-       '("  a  hello \n world \t b \r c  ")
-       (bash-completion-strings-from-tokens
-       (bash-completion-tokenize 1 (line-end-position 2))))
-      '("a" "hello" "world" "b" "c"))
-
-     ("bash-completion-tokenize escaped space"
-      (sz-testutils-with-buffer
-       '("a hello\\ world b c")
-       (bash-completion-strings-from-tokens
-       (bash-completion-tokenize 1 (line-end-position))))
-      '("a" "hello world" "b" "c"))
-
-     ("bash-completion-tokenize escaped #"
-      (sz-testutils-with-buffer
-       '("a hello \\#world\\# b")
-       (bash-completion-strings-from-tokens
-       (bash-completion-tokenize 1 (line-end-position))))
-      '("a" "hello" "#world#" "b"))
-
-     ("bash-completion-tokenize double quotes"
-      (sz-testutils-with-buffer
-       '("a \"hello world\" b c")
-       (bash-completion-strings-from-tokens
-       (bash-completion-tokenize 1 (line-end-position))))
-      '("a" "hello world" "b" "c"))
-
-     ("bash-completion-tokenize double quotes escaped"
-      (sz-testutils-with-buffer
-       '("a \"-\\\"hello world\\\"-\" b c")
-       (bash-completion-strings-from-tokens
-       (bash-completion-tokenize 1 (line-end-position))))
-      '("a" "-\"hello world\"-" "b" "c"))
-
-     ("bash-completion-tokenize single quotes"
-      (sz-testutils-with-buffer
-       '("a \"hello world\" b c")
-       (bash-completion-strings-from-tokens
-       (bash-completion-tokenize 1 (line-end-position))))
-      '("a" "hello world" "b" "c"))
-
-     ("bash-completion-tokenize single quotes escaped"
-      (sz-testutils-with-buffer
-       '("a '-\\'hello world\\'-' b c")
-       (bash-completion-strings-from-tokens
-       (bash-completion-tokenize 1 (line-end-position))))
-      '("a" "-'hello world'-" "b" "c"))
-
-     ("bash-completion-tokenize complex quote mix"
-      (sz-testutils-with-buffer
-       '("a hel\"lo w\"o'rld b'c d")
-       (bash-completion-strings-from-tokens
-       (bash-completion-tokenize 1 (line-end-position))))
-      '("a" "hello world bc" "d"))
-
-     ("bash-completion-tokenize unescaped semicolon"
-      (sz-testutils-with-buffer
-       "to infinity;and\\ beyond"
-       (bash-completion-strings-from-tokens
-       (bash-completion-tokenize 1 (line-end-position))))
-      '("to" "infinity" ";" "and beyond"))
-
-     ("bash-completion-tokenize unescaped &&"
-      (sz-testutils-with-buffer
-       "to infinity&&and\\ beyond"
-       (bash-completion-strings-from-tokens
-       (bash-completion-tokenize 1 (line-end-position))))
-      '("to" "infinity" "&&" "and beyond"))
-
-     ("bash-completion-tokenize unescaped ||"
-      (sz-testutils-with-buffer
-       "to infinity||and\\ beyond"
-       (bash-completion-strings-from-tokens
-       (bash-completion-tokenize 1 (line-end-position))))
-      '("to" "infinity" "||" "and beyond"))
-
-     ("bash-completion-tokenize quoted ;&|"
-      (sz-testutils-with-buffer
-       "to \"infinity;&|and\" beyond"
-       (bash-completion-strings-from-tokens
-       (bash-completion-tokenize 1 (line-end-position))))
-      '("to" "infinity;&|and" "beyond"))
-
-     ("bash-completion-parse-line cursor at end of word"
-      (sz-testutils-with-buffer
-       "a hello world"
-       (bash-completion-parse-line 1 (line-end-position)))
-      '((line . "a hello world")
-       (point . 13)
-       (cword . 2)
-       (words . ("a" "hello" "world"))
-       (stub-start . 9)))
-
-     ("bash-completion-parse-line cursor in the middle of a word"
-      (sz-testutils-with-buffer
-       "a hello wo"
-       (bash-completion-parse-line 1 (line-end-position)))
-      '((line . "a hello wo")
-       (point . 10)
-       (cword . 2)
-       (words . ("a" "hello" "wo"))
-       (stub-start . 9)))
-
-     ("bash-completion-parse-line cursor at the beginning"
-      (sz-testutils-with-buffer
-       " "
-       (bash-completion-parse-line 1 (line-end-position)))
-      '((line . "")
-       (point . 0)
-       (cword . 0)
-       (words . (""))
-       (stub-start . 2)
-       ))
-
-     ("bash-completion-parse-line cursor in the middle"
-      (sz-testutils-with-buffer
-       "a hello "
-       (bash-completion-parse-line 1 (line-end-position)))
-      '((line . "a hello ")
-       (point . 8)
-       (cword . 2)
-       (words . ("a" "hello" ""))
-       (stub-start . 9)))
-
-     ("bash-completion-parse-line cursor at end"
-      (sz-testutils-with-buffer
-       "a hello world b c"
-       (bash-completion-parse-line 1 (line-end-position)))
-      '((line . "a hello world b c")
-       (point . 17)
-       (cword . 4)
-       (words . ("a" "hello" "world" "b" "c"))
-       (stub-start . 17)))
-
-     ("bash-completion-parse-line complex multi-command line"
-      (sz-testutils-with-buffer
-       "cd /var/tmp ; ZORG=t make -"
-       (bash-completion-parse-line 1 (line-end-position)))
-      '((line . "make -")
-       (point . 6)
-       (cword . 1)
-       (words . ("make" "-"))
-       (stub-start . 27)))
-
-
-     ("bash-completion-parse-line pipe"
-      (sz-testutils-with-buffer
-       "ls /var/tmp | sort -"
-       (bash-completion-parse-line 1 (line-end-position)))
-      '((line . "sort -")
-       (point . 6)
-       (cword . 1)
-       (words . ("sort" "-"))
-       (stub-start . 20)))
-
-     ("bash-completion-parse-line escaped semicolon"
-      (sz-testutils-with-buffer
-       "find -name '*.txt' -exec echo {} ';' -"
-       (bash-completion-parse-line 1 (line-end-position)))
-      '((line . "find -name '*.txt' -exec echo {} ';' -")
-       (point . 38)
-       (cword . 7)
-       (words . ("find" "-name" "*.txt" "-exec" "echo" "{}" ";" "-"))
-       (stub-start . 38)))
-
-     ("bash-completion-parse-line at var assignment"
-      (sz-testutils-with-buffer
-       "cd /var/tmp ; A=f ZORG=t"
-       (bash-completion-parse-line 1 (line-end-position)))
-      '((line . "ZORG=t")
-       (point . 6)
-       (cword . 0)
-       (words . ("ZORG=t"))
-       (stub-start . 19)))
-
-     ("bash-completion-parse-line cursor after end"
-      (sz-testutils-with-buffer
-       "a hello world b c "
-       (bash-completion-parse-line 1 (line-end-position)))
-      '((line . "a hello world b c ")
-       (point . 18)
-       (cword . 5)
-       (words . ("a" "hello" "world" "b" "c" ""))
-       (stub-start . 19)))
-
-     ("bash-completion-parse-line with escaped quote"
-      (sz-testutils-with-buffer
-       "cd /vcr/shows/Dexter\\'s"
-       (bash-completion-parse-line 1 (line-end-position)))
-      '((line . "cd /vcr/shows/Dexter\\'s")
-       (point . 23)
-       (cword . 1)
-       (words . ("cd" "/vcr/shows/Dexter's"))
-       (stub-start . 4)))
-
-     ("bash-completion-add-to-alist garbage"
-      (let ((bash-completion-alist nil))
-       (bash-completion-add-to-alist '("just" "some" "garbage")))
-      nil)
-
-     ("bash-completion-add-to-alist empty"
-      (let ((bash-completion-alist nil))
-       (bash-completion-add-to-alist '()))
-      nil)
-
-     ("bash-completion-add-to-alist empty string"
-      (let ((bash-completion-alist nil))
-       (bash-completion-add-to-alist '("")))
-      nil)
-
-     ("bash-completion-add-to-alist empty complete"
-      (let ((bash-completion-alist nil))
-       (bash-completion-add-to-alist '("complete")))
-      nil)
-
-     ("bash-completion-add-to-alist one command"
-      (let ((bash-completion-alist nil))
-       (bash-completion-add-to-alist '("complete" "-e" "-F" "_cdargs_aliases" 
"cdb")))
-      '(("cdb" . ("-e" "-F" "_cdargs_aliases"))))
-
-     ("bash-completion-build-alist"
-      (sz-testutils-with-buffer
-       "
-complete -F _cdargs_aliases cdb
-complete -F complete_projects project
-complete -F complete_projects pro
-complete -F _cdargs_aliases cv
-complete -F _cdargs_aliases cb
-complete -F _completion_loader -D
-garbage
-"
-       (let ((bash-completion-alist '(garbage)))
-        (bash-completion-build-alist (current-buffer))))
-      '(("cdb" "-F" "_cdargs_aliases")
-       ("project" "-F" "complete_projects")
-       ("pro" "-F" "complete_projects")
-       ("cv" "-F" "_cdargs_aliases")
-       ("cb" "-F" "_cdargs_aliases")
-       (nil "-F" "_completion_loader")))
-     
-     ("bash-completion-quote not necessary"
-      (bash-completion-quote "hello")
-      "hello")
-
-     ("bash-completion-quote space"
-      (bash-completion-quote "hello world")
-      "'hello world'")
-
-     ("bash-completion-quote quote"
-      (bash-completion-quote "hell'o")
-      "'hell'\\''o'")
-
-     ("bash-completion-generate-line no custom completion"
-      (let ((bash-completion-alist nil)
-           (default-directory "~/test"))
-       (bash-completion-generate-line "hello worl" 7 '("hello" "worl") 1 nil))
-      (concat "cd >/dev/null 2>&1 " (expand-file-name "~/test") " ; compgen -o 
default worl 2>/dev/null"))
-
-     ("bash-completion-generate-line custom completion no function or command"
-      (let ((bash-completion-alist '(("zorg" . ("-A" "-G" "*.txt"))))
-           (default-directory "/test"))
-       (bash-completion-generate-line "zorg worl" 7 '("zorg" "worl") 1 nil))
-      "cd >/dev/null 2>&1 /test ; compgen -A -G '*.txt' -- worl 2>/dev/null")
-
-     ("bash-completion-generate-line custom completion function"
-      (let ((bash-completion-alist '(("zorg" . ("-F" "__zorg"))))
-           (default-directory "/test"))
-       (bash-completion-generate-line "zorg worl" 7 '("zorg" "worl") 1 nil))
-      "cd >/dev/null 2>&1 /test ; __BASH_COMPLETE_WRAPPER='COMP_LINE='\\''zorg 
worl'\\''; COMP_POINT=7; COMP_CWORD=1; COMP_WORDS=( zorg worl ); __zorg 
\"${COMP_WORDS[@]}\"' compgen -F __bash_complete_wrapper -- worl 2>/dev/null")
-
-     ("bash-completion-generate-line custom completion command"
-      (let ((bash-completion-alist '(("zorg" . ("-C" "__zorg"))))
-           (default-directory "/test"))
-       (bash-completion-generate-line "zorg worl" 7 '("zorg" "worl") 1 nil))
-      "cd >/dev/null 2>&1 /test ; __BASH_COMPLETE_WRAPPER='COMP_LINE='\\''zorg 
worl'\\''; COMP_POINT=7; COMP_CWORD=1; COMP_WORDS=( zorg worl ); __zorg 
\"${COMP_WORDS[@]}\"' compgen -F __bash_complete_wrapper -- worl 2>/dev/null")
-
-     ("bash-completion-generate-line default completion function"
-      (let ((bash-completion-alist '((nil . ("-F" "__zorg"))))
-           (default-directory "/test"))
-       (bash-completion-generate-line "zorg worl" 7 '("zorg" "worl") 1 t))
-      "cd >/dev/null 2>&1 /test ; __BASH_COMPLETE_WRAPPER='COMP_LINE='\\''zorg 
worl'\\''; COMP_POINT=7; COMP_CWORD=1; COMP_WORDS=( zorg worl ); __zorg 
\"${COMP_WORDS[@]}\"' compgen -F __bash_complete_wrapper -- worl 2>/dev/null")
-
-     ("bash-completion-generate-line ignore completion function"
-      (let ((bash-completion-alist '((nil . ("-F" "__zorg"))))
-           (default-directory "/test"))
-       (bash-completion-generate-line "zorg worl" 7 '("zorg" "worl") 1 nil))
-      "cd >/dev/null 2>&1 /test ; compgen -o default worl 2>/dev/null")
-     
-     ("bash-completion-starts-with empty str"
-      (bash-completion-starts-with "" "prefix")
-      nil)
-
-     ("bash-completion-starts-with starts with"
-      (bash-completion-starts-with "blah-blah" "blah-")
-      t)
-
-     ("bash-completion-starts-with does not starts with"
-      (bash-completion-starts-with "blah-blah" "blih-")
-      nil)
-
-     ("bash-completion-starts-with same"
-      (bash-completion-starts-with "blah-" "blah-")
-      t)
-
-     ("bash-completion-send"
-      (bash-completion-test-send "line1\nline2\n\t0\v")
-      (cons 0 "line1\nline2\n"))
-
-     ("bash-completion-send command failed"
-      (bash-completion-test-send "line1\nline2\n\t1\v")
-      (cons 1 "line1\nline2\n"))
-
-     ("bash-completion-send wrapped function returned 124"
-      (bash-completion-test-send (concat "line1\nli" 
bash-completion-wrapped-status "ne2\n\t0\v"))
-      (cons 124 "line1\nline2\n"))
-
-     ("bash-completion-cd-command-prefix no current dir"
-      (let ((default-directory nil))
-       (bash-completion-cd-command-prefix))
-      "")
-
-     ("bash-completion-cd-command-prefix current dir"
-      (let ((default-directory "/tmp/x"))
-       (bash-completion-cd-command-prefix))
-      "cd >/dev/null 2>&1 /tmp/x ; ")
-
-     ("bash-completion-cd-command-prefix expand tilde"
-      (let ((default-directory "~/x"))
-       (bash-completion-cd-command-prefix))
-      (concat "cd >/dev/null 2>&1 " (expand-file-name "~/x") " ; "))
-
-     ("bash-completion-addsuffix ends with /"
-      (flet ((file-accessible-directory-p (a) (error "unexpected")))
-       (bash-completion-addsuffix "hello/"))
-      "hello/")
-
-     ("bash-completion-addsuffix ends with space"
-      (flet ((file-accessible-directory-p (a) (error "unexpected")))
-       (bash-completion-addsuffix "hello "))
-      "hello ")
-
-     ("bash-completion-addsuffix ends with separator"
-      (flet ((file-accessible-directory-p (a) (error "unexpected")))
-       (bash-completion-addsuffix "hello:"))
-      "hello:")
-
-     ("bash-completion-addsuffix check directory"
-      (flet ((file-accessible-directory-p (a) (equal a "/tmp/hello")))
-       (let ((default-directory "/tmp"))
-         (bash-completion-addsuffix "hello")))
-      "hello/")
-
-     ("bash-completion-addsuffix check directory, expand tilde"
-      (flet ((file-accessible-directory-p (a) (equal a (concat 
(expand-file-name "y" "~/x")))))
-       (let ((default-directory "~/x"))
-         (bash-completion-addsuffix "y")))
-      "y/")
-
-     ("bash-completion-starts-with"
-      (list
-       (bash-completion-starts-with "" "hello ")
-       (bash-completion-starts-with "hello world" "hello ")
-       (bash-completion-starts-with "hello world" "hullo ")
-       (bash-completion-starts-with "hello" ""))
-      '(nil t nil t))
-
-     ("bash-completion-ends-with"
-      (list
-       (bash-completion-ends-with "" "world")
-       (bash-completion-ends-with "hello world" "world")
-       (bash-completion-ends-with "hello world" "wurld")
-       (bash-completion-ends-with "hello" ""))
-      '(nil t nil t))
-
-     ("bash-completion-last-wordbreak-split"
-      (list
-       (bash-completion-last-wordbreak-split "a:b:c:d:e")
-       (bash-completion-last-wordbreak-split "hello=world")
-       (bash-completion-last-wordbreak-split "hello>world")
-       (bash-completion-last-wordbreak-split ">world")
-       (bash-completion-last-wordbreak-split "hello"))
-      '(("a:b:c:d:" . "e")
-       ("hello=" . "world")
-       ("hello>" . "world")
-       (">" . "world")
-       ("" . "hello")))
-
-
-     ("bash-completion-before-last-wordbreak"
-      (list
-       (bash-completion-before-last-wordbreak "a:b:c:d:e")
-       (bash-completion-before-last-wordbreak "hello=world")
-       (bash-completion-before-last-wordbreak "hello>world")
-       (bash-completion-before-last-wordbreak "hello"))
-      '("a:b:c:d:" "hello=" "hello>" ""))
-
-     ("bash-completion-after-last-wordbreak"
-      (list
-       (bash-completion-after-last-wordbreak "a:b:c:d:e")
-       (bash-completion-after-last-wordbreak "hello=world")
-       (bash-completion-after-last-wordbreak "hello>world")
-       (bash-completion-after-last-wordbreak "hello"))
-      '("e" "world" "world" "hello"))
-
-     ("bash-completion-fix escape rest"
-      (bash-completion-fix "a\\ bc d e" "a\\ b")
-      "a\\ bc\\ d\\ e")
-
-     ("bash-completion-fix do not escape final space"
-      (let ((bash-completion-nospace nil))
-       (bash-completion-fix "ab " "a"))
-      "ab ")
-     
-     ("bash-completion-fix remove final space"
-      (let ((bash-completion-nospace t))
-       (bash-completion-fix "ab " "a"))
-      "ab")
-
-     ("bash-completion-fix unexpand home and escape"
-      (bash-completion-fix (expand-file-name "~/a/hello world") "~/a/he")
-      "~/a/hello\\ world")
-
-     ("bash-completion-fix match after wordbreak and escape"
-      (bash-completion-fix "hello world" "a:b:c:he")
-      "a:b:c:hello\\ world")
-
-     ("bash-completion-fix just append"
-      (bash-completion-fix " world" "hello")
-      "hello\\ world")
-
-     ("bash-completion-fix subset of the prefix"
-      (bash-completion-fix "Dexter" "Dexter'")
-      "Dexter")
-
-     ("bash-completion-extract-candidates"
-      (let ((bash-completion-nospace nil))
-       (flet ((bash-completion-buffer () (current-buffer)))
-         (sz-testutils-with-buffer
-          "hello world\nhello \n\n"
-          (bash-completion-extract-candidates "hello" nil))))
-      '("hello\\ world" "hello "))
-
-     ("bash-completion-nonsep"
-      (list
-       (bash-completion-nonsep nil)
-       (bash-completion-nonsep ?')
-       (bash-completion-nonsep ?\"))
-      '("^ \t\n\r;&|'\"#" "^ \t\n\r'" "^ \t\n\r\""))
-
-
-     ("bash-completion-escape-candidate no quote"
-      (bash-completion-escape-candidate "He said: \"hello, 'you'\"" nil)
-      "He\\ said:\\ \\\"hello,\\ \\'you\\'\\\"")
-
-     ("bash-completion-escape-candidate no quote"
-      (bash-completion-escape-candidate "#hello#" nil)
-      "\\#hello\\#")
-
-     ("bash-completion-escape-candidate single quote"
-      (bash-completion-escape-candidate "He said: \"hello, 'you'\"" ?')
-      "He said: \"hello, '\\''you'\\''\"")
-
-     ("bash-completion-escape-candidate double quote"
-      (bash-completion-escape-candidate "He said: \"hello, 'you'\"" ?\")
-      "He said: \\\"hello, 'you'\\\"")
-
-     ("bash-completion-escape-candidate no quote not if double quoted"
-      (bash-completion-escape-candidate "\"hello, you" nil)
-      "\"hello, you")
-
-     ("bash-completion-escape-candidate no quote not if single quoted"
-      (bash-completion-escape-candidate "'hello, you" nil)
-      "'hello, you")
-
-     ("bash-completion-quote allowed"
-      (bash-completion-quote "abc_ABC/1-2.3")
-      "abc_ABC/1-2.3")
-
-     ("bash-completion-quote quoted"
-      (bash-completion-quote "a$b")
-      "'a$b'")
-
-     ("bash-completion-quote quoted single quote"
-      (bash-completion-quote "a'b")
-      "'a'\\''b'")
-
-     ("bash-completion-join"
-      (bash-completion-join '("ls" "-l" "/a/b" "/a/b c" "/a/b'c" "$help/d"))
-      "ls -l /a/b '/a/b c' '/a/b'\\''c' '$help/d'")
-
-     ))
-
-  ;; ---------- integration tests
-
-  (defmacro bash-completion_test-harness (&rest body)
-    `(let ((bash-completion-process nil) (bash-completion-alist nil))
-      (unwind-protect
-         (progn ,@body)
-       ;; tearDown
-       (condition-case err
-           (when bash-completion-process
-             (let ((buffer (process-buffer bash-completion-process)))
-               (kill-process bash-completion-process)
-               (kill-buffer buffer)))
-         (error (message "error in bash-completion_test tearDown: %s" err))))))
-
-  (defmacro bash-completion_test-with-shell (&rest body)
-    `(bash-completion_test-harness
-       (let ((shell-buffer nil)
-             (explicit-shell-file-name bash-completion-prog))
-         (unwind-protect
-             (progn
-               (setq shell-buffer (shell (generate-new-buffer-name 
"*bash-completion_test-with-shell*")))
-               ;; accept process output until there's nothing left
-               (while (accept-process-output nil 0.6))
-               ;; do a completion and return the result
-               (with-current-buffer shell-buffer
-                 (let ((start (point)))
-                   (progn ,@body)
-                   (buffer-substring-no-properties start (point-max)))))
-           ;; finally
-           (when (and shell-buffer (buffer-live-p shell-buffer))
-             (with-current-buffer shell-buffer
-               (insert "\nexit\n"))
-             (kill-buffer shell-buffer))))))
-
-  (put 'bash-completion-regress-integration 'regression-suite t)
-  (setq bash-completion-regress-integration '(
-       ("bash-completion interaction"
-       (bash-completion_test-harness
-        (list
-         (bash-completion-is-running)
-         (buffer-live-p (bash-completion-buffer))
-         (bash-completion-is-running)
-         (bash-completion-comm "hel" 4 '("hel") 0 nil)
-         (progn
-           (bash-completion-send "echo $EMACS_BASH_COMPLETE")
-           (with-current-buffer (bash-completion-buffer)
-             (buffer-string)))
-         (bash-completion-reset)
-         (bash-completion-is-running)))
-       '(nil t t ("help ") "t\n" nil nil))
-
-       ("bash-completion setenv"
-       (bash-completion_test-harness
-        (bash-completion-send "echo $EMACS_BASH_COMPLETE")
-        (with-current-buffer (bash-completion-buffer)
-          (buffer-string)))
-       "t\n")
-
-       ("bash-completion execute one completion"
-       (bash-completion_test-with-shell
-        (let ((start (point)))
-          (insert "__bash_complete_")
-          (bash-completion-dynamic-complete)))
-       "__bash_complete_wrapper ")
-
-       ("bash-completion execute wordbreak completion"
-       (bash-completion_test-with-shell
-        (let ((start (point)))
-          (insert "export PATH=/sbin:/bi")
-          (bash-completion-dynamic-complete)))
-       "export PATH=/sbin:/bin/")
-
-       )))
-
-;; Run diagnostics when this module is evaluated or compiled
-;; if and only if the "regress" package is already loaded.
-;; This code will not appear in the compiled (.elc) file
-(eval-when-compile
-  (autoload 'regress "regress" "run regression test suites" t)
-  (when (featurep 'regress)
-    (regress bash-completion-regress)
-    (when bash-completion-run-integration-tests
-      (regress bash-completion-regress-integration))))
-
-;;; bash-completion_test.el ends here