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 <ethan@betacantrips.com>

diff --git a/test/emacs b/test/emacs
index e9d823991846c0a411f7e48103b6a8833903f57f..1f84b91558420bb44e667d7a3d1b9d8dde9fad45 100755 (executable)
--- 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 e9a714fa228720901a90b3b83d60fd33c9be6095..64c38d30593dfa5667f3917ca4b490e051e9212f 100755 (executable)
--- 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 076083abce2100dad62877dc6565f119d9f7d0dc..3282c7b148d90a8f3d712a6aefb2d4628cd8c0e4 100644 (file)
--- 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 <lars@seas.harvard.edu> (2009-11-17) (inbox signed)
+Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed unread)
 Subject: [notmuch] Working with Maildir storage?
  Mikhail Gusarov <dottedmag@dottedmag.net> (2009-11-17) (inbox signed unread)
   Lars Kellogg-Stedman <lars@seas.harvard.edu> (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 588f38f4d781a5dda735e6f06e7cafb3219374f9..eaa557a07c5ffb59255bd5c413ede5e981322138 100644 (file)
--- 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 <lars@seas.harvard.edu> (2009-11-17) (inbox signed)
+Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed unread)
 Subject: [notmuch] Working with Maildir storage?
  Mikhail Gusarov <dottedmag@dottedmag.net> (2009-11-17) (inbox signed unread)
   Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed)