This matches the current behavior of the buttonizer, so it passes, but many of these cases are not what you'd want (and some of them aren't even valid Xapian queries). The next patch will fix the handling of these cases and update the test. --- test/emacs-show | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ test/test-lib.el | 14 ++++++++++++++ 2 files changed, 64 insertions(+)
diff --git a/test/emacs-show b/test/emacs-show index 64c38d3..9712633 100755 --- a/test/emacs-show +++ b/test/emacs-show @@ -106,5 +106,55 @@ test_emacs '(notmuch-search "from:[email protected] and subject:\"Maildir st (test-visible-output)' test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-indent-thread-content-off +test_begin_subtest "id buttonization" +add_message '[body]=" +id:abc +id:abc.def. id:abc,def, id:abc;def; id:abc:def: +id:foo@bar.?baz? id:foo@bar!.baz! +(id:[email protected]) [id:[email protected]] +id:[email protected]... +id:2+2=5 +id:=_-:/.[]@$%+ +id:abc)def +id:ab\"c def +id:\"abc\"def +id:\"ab\"\"c\"def +id:\"ab c\"def +id:\"abc\".def +id:\"abc +\" +id:) +id: +cid:xxx"' +test_emacs '(notmuch-show "id:'$gen_msg_id'") + (notmuch-test-mark-links) + (test-visible-output)' +cat <<EOF >EXPECTED +Notmuch Test Suite <[email protected]> (2001-01-05) (inbox) +Subject: id buttonization +To: Notmuch Test Suite <[email protected]> +Date: Fri, 05 Jan 2001 15:43:57 +0000 + +<<id:abc>> +<<id:abc.def.>> <<id:abc,def,>> <<id:abc;def;>> <<id:abc:def:>> +<<id:foo@bar.?baz?>> <<id:foo@bar!.baz!>> +(<<id:[email protected])>> [<<id:[email protected]]>> +<<id:[email protected]...>> +<<id:2+2=5>> +<<id:=_-:/.[]@$%+>> +<<id:abc)def>> +<<id:ab>>"c def +<<id:"abc">>def +<<id:"ab">>"c"def +id:"ab c"def +<<id:"abc">>.def +id:"abc +" +<<id:)>> +id: +c<<id:xxx>> +EOF +test_expect_equal_file EXPECTED OUTPUT + test_done diff --git a/test/test-lib.el b/test/test-lib.el index fa3380c..dece811 100644 --- a/test/test-lib.el +++ b/test/test-lib.el @@ -107,6 +107,20 @@ nothing." (ad-set-arg 1 (char-to-string char)) ad-do-it)))) +(defun notmuch-test-mark-links () + "Enclose links in the current buffer with << and >>." + ;; Links are often created by jit-lock functions + (jit-lock-fontify-now) + (save-excursion + (let ((inhibit-read-only t)) + (goto-char (point-min)) + (let ((button)) + (while (setq button (next-button (point))) + (goto-char (button-start button)) + (insert "<<") + (goto-char (button-end button)) + (insert ">>")))))) + (defmacro notmuch-test-run (&rest body) "Evaluate a BODY of test expressions and output the result." `(with-temp-buffer -- 1.7.10.4 _______________________________________________ notmuch mailing list [email protected] http://notmuchmail.org/mailman/listinfo/notmuch
