From 518eed1ba725c524d279e364deba1a191bbb38b2 Mon Sep 17 00:00:00 2001 From: Ethan Glasser-Camp Date: Wed, 17 Oct 2012 22:16:52 -0400 Subject: [PATCH] test: Move tests from emacs to emacs-show This requires changing the contents of the crypto tests, as one thread that was marked read by the earlier tests in test/emacs is no longer marked read. This moves tests for: - 09d19ac "test: emacs: toggle eliding of non-matching messages in `notmuch-show'", which should have actually read: "test: emacs: toggle processing of cryptographic MIME parts in `notmuch-show'". See commit 19ec74c5. - 5ea1dbe "test: emacs: toggle eliding of non-matching messages in `notmuch-show'" - 345faab "test: emacs: toggle thread content indentation in `notmuch-show'" Signed-off-by: Ethan Glasser-Camp --- test/emacs | 67 ----------------- test/emacs-show | 71 +++++++++++++++++++ ...tmuch-show-elide-non-matching-messages-off | 0 ...otmuch-show-elide-non-matching-messages-on | 0 .../notmuch-show-indent-thread-content-off | 0 ...notmuch-show-process-crypto-mime-parts-off | 2 +- .../notmuch-show-process-crypto-mime-parts-on | 2 +- 7 files changed, 73 insertions(+), 69 deletions(-) rename test/{emacs.expected-output => emacs-show.expected-output}/notmuch-show-elide-non-matching-messages-off (100%) rename test/{emacs.expected-output => emacs-show.expected-output}/notmuch-show-elide-non-matching-messages-on (100%) rename test/{emacs.expected-output => emacs-show.expected-output}/notmuch-show-indent-thread-content-off (100%) rename test/{emacs.expected-output => emacs-show.expected-output}/notmuch-show-process-crypto-mime-parts-off (98%) rename test/{emacs.expected-output => emacs-show.expected-output}/notmuch-show-process-crypto-mime-parts-on (98%) diff --git a/test/emacs b/test/emacs index e9d82399..1f84b915 100755 --- a/test/emacs +++ b/test/emacs @@ -783,71 +783,4 @@ EOF test_expect_equal_file OUTPUT EXPECTED -test_begin_subtest "don't process cryptographic MIME parts" -test_emacs '(let ((notmuch-crypto-process-mime nil)) - (notmuch-show "id:20091117203301.GV3165@dottiness.seas.harvard.edu") - (test-visible-output))' -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-process-crypto-mime-parts-off - -test_begin_subtest "process cryptographic MIME parts" -test_emacs '(let ((notmuch-crypto-process-mime t)) - (notmuch-show "id:20091117203301.GV3165@dottiness.seas.harvard.edu") - (test-visible-output))' -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-process-crypto-mime-parts-on - -test_begin_subtest "process cryptographic MIME parts (w/ notmuch-show-toggle-process-crypto)" -test_emacs '(let ((notmuch-crypto-process-mime nil)) - (notmuch-show "id:20091117203301.GV3165@dottiness.seas.harvard.edu") - (notmuch-show-toggle-process-crypto) - (test-visible-output))' -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-process-crypto-mime-parts-on - -test_begin_subtest "notmuch-show: don't elide non-matching messages" -test_emacs '(let ((notmuch-show-only-matching-messages nil)) - (notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"") - (notmuch-test-wait) - (notmuch-search-show-thread) - (notmuch-test-wait) - (test-visible-output))' -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-off - -test_begin_subtest "notmuch-show: elide non-matching messages" -test_emacs '(let ((notmuch-show-only-matching-messages t)) - (notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"") - (notmuch-test-wait) - (notmuch-search-show-thread) - (notmuch-test-wait) - (test-visible-output))' -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-on - -test_begin_subtest "notmuch-show: elide non-matching messages (w/ notmuch-show-toggle-elide-non-matching)" -test_emacs '(let ((notmuch-show-only-matching-messages nil)) - (notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"") - (notmuch-test-wait) - (notmuch-search-show-thread) - (notmuch-test-wait) - (notmuch-show-toggle-elide-non-matching) - (test-visible-output))' -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-on - -test_begin_subtest "notmuch-show: elide non-matching messages (w/ prefix arg to notmuch-show)" -test_emacs '(let ((notmuch-show-only-matching-messages nil)) - (notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"") - (notmuch-test-wait) - (let ((current-prefix-arg t)) - (notmuch-search-show-thread)) - (notmuch-test-wait) - (test-visible-output))' -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-on - -test_begin_subtest "notmuch-show: disable indentation of thread content (w/ notmuch-show-toggle-thread-indentation)" -test_emacs '(notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"") - (notmuch-test-wait) - (notmuch-search-show-thread) - (notmuch-test-wait) - (notmuch-show-toggle-thread-indentation) - (test-visible-output)' -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-indent-thread-content-off - - test_done diff --git a/test/emacs-show b/test/emacs-show index e9a714fa..64c38d30 100755 --- a/test/emacs-show +++ b/test/emacs-show @@ -3,6 +3,10 @@ test_description="emacs notmuch-show view" . test-lib.sh +EXPECTED=$TEST_DIRECTORY/emacs-show.expected-output + +add_email_corpus + test_begin_subtest "Hiding Original Message region at beginning of a message" message_id='OriginalMessageHiding.1@notmuchmail.org' add_message \ @@ -36,4 +40,71 @@ test_begin_subtest "Bare subject #3" output=$(test_emacs '(notmuch-show-strip-re "the cure: fix the regexp")') test_expect_equal "$output" '"the cure: fix the regexp"' +test_begin_subtest "don't process cryptographic MIME parts" +test_emacs '(let ((notmuch-crypto-process-mime nil)) + (notmuch-show "id:20091117203301.GV3165@dottiness.seas.harvard.edu") + (test-visible-output))' +test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-process-crypto-mime-parts-off + +test_begin_subtest "process cryptographic MIME parts" +test_emacs '(let ((notmuch-crypto-process-mime t)) + (notmuch-show "id:20091117203301.GV3165@dottiness.seas.harvard.edu") + (test-visible-output))' +test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-process-crypto-mime-parts-on + +test_begin_subtest "process cryptographic MIME parts (w/ notmuch-show-toggle-process-crypto)" +test_emacs '(let ((notmuch-crypto-process-mime nil)) + (notmuch-show "id:20091117203301.GV3165@dottiness.seas.harvard.edu") + (notmuch-show-toggle-process-crypto) + (test-visible-output))' +test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-process-crypto-mime-parts-on + +test_begin_subtest "notmuch-show: don't elide non-matching messages" +test_emacs '(let ((notmuch-show-only-matching-messages nil)) + (notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"") + (notmuch-test-wait) + (notmuch-search-show-thread) + (notmuch-test-wait) + (test-visible-output))' +test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-off + +test_begin_subtest "notmuch-show: elide non-matching messages" +test_emacs '(let ((notmuch-show-only-matching-messages t)) + (notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"") + (notmuch-test-wait) + (notmuch-search-show-thread) + (notmuch-test-wait) + (test-visible-output))' +test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-on + +test_begin_subtest "notmuch-show: elide non-matching messages (w/ notmuch-show-toggle-elide-non-matching)" +test_emacs '(let ((notmuch-show-only-matching-messages nil)) + (notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"") + (notmuch-test-wait) + (notmuch-search-show-thread) + (notmuch-test-wait) + (notmuch-show-toggle-elide-non-matching) + (test-visible-output))' +test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-on + +test_begin_subtest "notmuch-show: elide non-matching messages (w/ prefix arg to notmuch-show)" +test_emacs '(let ((notmuch-show-only-matching-messages nil)) + (notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"") + (notmuch-test-wait) + (let ((current-prefix-arg t)) + (notmuch-search-show-thread)) + (notmuch-test-wait) + (test-visible-output))' +test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-on + +test_begin_subtest "notmuch-show: disable indentation of thread content (w/ notmuch-show-toggle-thread-indentation)" +test_emacs '(notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"") + (notmuch-test-wait) + (notmuch-search-show-thread) + (notmuch-test-wait) + (notmuch-show-toggle-thread-indentation) + (test-visible-output)' +test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-indent-thread-content-off + + test_done diff --git a/test/emacs.expected-output/notmuch-show-elide-non-matching-messages-off b/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-off similarity index 100% rename from test/emacs.expected-output/notmuch-show-elide-non-matching-messages-off rename to test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-off diff --git a/test/emacs.expected-output/notmuch-show-elide-non-matching-messages-on b/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-on similarity index 100% rename from test/emacs.expected-output/notmuch-show-elide-non-matching-messages-on rename to test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-on diff --git a/test/emacs.expected-output/notmuch-show-indent-thread-content-off b/test/emacs-show.expected-output/notmuch-show-indent-thread-content-off similarity index 100% rename from test/emacs.expected-output/notmuch-show-indent-thread-content-off rename to test/emacs-show.expected-output/notmuch-show-indent-thread-content-off diff --git a/test/emacs.expected-output/notmuch-show-process-crypto-mime-parts-off b/test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-off similarity index 98% rename from test/emacs.expected-output/notmuch-show-process-crypto-mime-parts-off rename to test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-off index 076083ab..3282c7b1 100644 --- a/test/emacs.expected-output/notmuch-show-process-crypto-mime-parts-off +++ b/test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-off @@ -1,4 +1,4 @@ -Lars Kellogg-Stedman (2009-11-17) (inbox signed) +Lars Kellogg-Stedman (2009-11-17) (inbox signed unread) Subject: [notmuch] Working with Maildir storage? Mikhail Gusarov (2009-11-17) (inbox signed unread) Lars Kellogg-Stedman (2009-11-17) (inbox signed) diff --git a/test/emacs.expected-output/notmuch-show-process-crypto-mime-parts-on b/test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-on similarity index 98% rename from test/emacs.expected-output/notmuch-show-process-crypto-mime-parts-on rename to test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-on index 588f38f4..eaa557a0 100644 --- a/test/emacs.expected-output/notmuch-show-process-crypto-mime-parts-on +++ b/test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-on @@ -1,4 +1,4 @@ -Lars Kellogg-Stedman (2009-11-17) (inbox signed) +Lars Kellogg-Stedman (2009-11-17) (inbox signed unread) Subject: [notmuch] Working with Maildir storage? Mikhail Gusarov (2009-11-17) (inbox signed unread) Lars Kellogg-Stedman (2009-11-17) (inbox signed)