X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=contrib%2Fnotmuch-pick%2Ftest%2Femacs-pick;h=05ce85d0c16dfdebd6da8a1434c585318c6b2a94;hp=6834998500a1ab1dfd2f375c63f0afbab94149a4;hb=dae09c690b898909ad551feaf265e86f91bf3630;hpb=0d8a3cc7fd93c426a1c5691ebb7dcdfc66bf29d9

diff --git a/contrib/notmuch-pick/test/emacs-pick b/contrib/notmuch-pick/test/emacs-pick
index 68349985..05ce85d0 100755
--- a/contrib/notmuch-pick/test/emacs-pick
+++ b/contrib/notmuch-pick/test/emacs-pick
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
-test_description="emacs pick interface"
+test_description="emacs tree view interface"
 . test-lib.sh
 
-EXPECTED=$TEST_DIRECTORY/pick.expected-output
+EXPECTED=$TEST_DIRECTORY/tree.expected-output
 
 add_email_corpus
 test_begin_subtest "Do we have emacs"
@@ -14,73 +14,73 @@ hello
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
-test_begin_subtest "Basic notmuch-pick view in emacs"
+test_begin_subtest "Basic notmuch-tree view in emacs"
 test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
-	    (require (quote notmuch-pick))
-	    (notmuch-pick "tag:inbox")
+	    (require (quote notmuch-tree))
+	    (notmuch-tree "tag:inbox")
 	    (notmuch-test-wait)
 	    (test-output)
 	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
 
-test_begin_subtest "Refreshed notmuch-pick view in emacs"
+test_begin_subtest "Refreshed notmuch-tree view in emacs"
 test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
-	    (require (quote notmuch-pick))
-	    (notmuch-pick "tag:inbox")
+	    (require (quote notmuch-tree))
+	    (notmuch-tree "tag:inbox")
 	    (notmuch-test-wait)
-	    (notmuch-pick-refresh-view)
+	    (notmuch-tree-refresh-view)
 	    (notmuch-test-wait)
 	    (test-output)
 	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
 
 # In the following tag tests we make sure the display is updated
 # correctly and, in a separate test, that the database is updated
 # correctly.
 
-test_begin_subtest "Tag message in notmuch pick view (display)"
+test_begin_subtest "Tag message in notmuch tree view (display)"
 test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
-	    (require (quote notmuch-pick))
-	    (notmuch-pick "tag:inbox")
+	    (require (quote notmuch-tree))
+	    (notmuch-tree "tag:inbox")
 	    (notmuch-test-wait)
 	    (forward-line)
-	    (notmuch-pick-tag "+test_tag")
+	    (notmuch-tree-tag (list "+test_tag"))
 	    (test-output)
 	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox-tagged
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox-tagged
 
-test_begin_subtest "Tag message in notmuch pick view (database)"
+test_begin_subtest "Tag message in notmuch tree view (database)"
 output=$(notmuch search --output=messages 'tag:test_tag')
 test_expect_equal "$output" "id:877h1wv7mg.fsf@inf-8657.int-evry.fr"
 
-test_begin_subtest "Untag message in notmuch pick view"
+test_begin_subtest "Untag message in notmuch tree view"
 test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
-	    (require (quote notmuch-pick))
-	    (notmuch-pick "tag:inbox")
+	    (require (quote notmuch-tree))
+	    (notmuch-tree "tag:inbox")
 	    (notmuch-test-wait)
 	    (forward-line)
-	    (notmuch-pick-tag "-test_tag")
+	    (notmuch-tree-tag (list "-test_tag"))
 	    (test-output)
 	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
 
-test_begin_subtest "Untag message in notmuch pick view (database)"
+test_begin_subtest "Untag message in notmuch tree view (database)"
 output=$(notmuch search --output=messages 'tag:test_tag')
 test_expect_equal "$output" ""
 
-test_begin_subtest "Tag thread in notmuch pick view"
+test_begin_subtest "Tag thread in notmuch tree view"
 test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
-	    (require (quote notmuch-pick))
-	    (notmuch-pick "tag:inbox")
+	    (require (quote notmuch-tree))
+	    (notmuch-tree "tag:inbox")
 	    (notmuch-test-wait)
 	    ;; move to a sizable thread
 	    (forward-line 26)
-	    (notmuch-pick-tag-thread "+test_thread_tag")
+	    (notmuch-tree-tag-thread (list "+test_thread_tag"))
 	    (test-output)
 	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox-thread-tagged
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox-thread-tagged
 
-test_begin_subtest "Tag message in notmuch pick view (database)"
+test_begin_subtest "Tag message in notmuch tree view (database)"
 output=$(notmuch search --output=messages 'tag:test_thread_tag')
 test_expect_equal "$output" \
 "id:87ocn0qh6d.fsf@yoom.home.cworth.org
@@ -91,19 +91,19 @@ id:20091117203301.GV3165@dottiness.seas.harvard.edu
 id:87iqd9rn3l.fsf@vertex.dottedmag
 id:20091117190054.GU3165@dottiness.seas.harvard.edu"
 
-test_begin_subtest "Untag thread in notmuch pick view"
+test_begin_subtest "Untag thread in notmuch tree view"
 test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
-	    (require (quote notmuch-pick))
-	    (notmuch-pick "tag:inbox")
+	    (require (quote notmuch-tree))
+	    (notmuch-tree "tag:inbox")
 	    (notmuch-test-wait)
 	    ;; move to the same sizable thread as above
 	    (forward-line 26)
-	    (notmuch-pick-tag-thread "-test_thread_tag")
+	    (notmuch-tree-tag-thread (list "-test_thread_tag"))
 	    (test-output)
 	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
 
-test_begin_subtest "Untag message in notmuch pick view (database)"
+test_begin_subtest "Untag message in notmuch tree view (database)"
 output=$(notmuch search --output=messages 'tag:test_thread_tag')
 test_expect_equal "$output" ""
 
@@ -113,58 +113,98 @@ test_emacs '(notmuch-hello)
 	    (re-search-forward "inbox")
 	    (widget-button-press (1- (point)))
 	    (notmuch-test-wait)
-	    (notmuch-pick-from-search-current-query)
+	    (notmuch-tree-from-search-current-query)
 	    (notmuch-test-wait)
 	    (test-output)
 	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
 
-test_begin_subtest "Pick of a single thread (from search)"
+test_begin_subtest "Tree view of a single thread (from search)"
 test_emacs '(notmuch-hello)
 	    (goto-char (point-min))
 	    (re-search-forward "inbox")
 	    (widget-button-press (1- (point)))
 	    (notmuch-test-wait)
-	    (notmuch-pick-from-search-thread)
+	    (notmuch-tree-from-search-thread)
 	    (notmuch-test-wait)
 	    (test-output)
 	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-single-thread
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread
 
-test_begin_subtest "Pick of a single thread (from show)"
+test_begin_subtest "Tree view of a single thread (from show)"
 test_emacs '(notmuch-hello)
 	    (goto-char (point-min))
 	    (re-search-forward "inbox")
 	    (widget-button-press (1- (point)))
 	    (notmuch-test-wait)
 	    (notmuch-search-show-thread)
-	    (notmuch-pick-from-show-current-query)
+	    (notmuch-tree-from-show-current-query)
 	    (notmuch-test-wait)
 	    (test-output)
 	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-single-thread
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread
 
-test_begin_subtest "Message window of pick"
+test_begin_subtest "Message window of tree view"
 test_emacs '(notmuch-hello)
 	    (goto-char (point-min))
 	    (re-search-forward "inbox")
 	    (widget-button-press (1- (point)))
 	    (notmuch-test-wait)
 	    (notmuch-search-next-thread)
-	    (notmuch-pick-from-search-thread)
+	    (notmuch-tree-from-search-thread)
 	    (notmuch-test-wait)
-	    (select-window notmuch-pick-message-window)
+	    (select-window notmuch-tree-message-window)
 	    (test-output)
 	    (delete-other-windows)'
 cp OUTPUT /tmp/mjwout
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-show-window
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-show-window
 
 test_begin_subtest "Stash id"
 output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
-		     (require (quote notmuch-pick))
-		     (notmuch-pick "id:1258498485-sup-142@elly")
+		     (require (quote notmuch-tree))
+		     (notmuch-tree "id:1258498485-sup-142@elly")
 		     (notmuch-test-wait)
 		     (notmuch-show-stash-message-id)')
 test_expect_equal "$output" "\"Stashed: id:1258498485-sup-142@elly\""
 
+test_begin_subtest "Move to next matching message"
+output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
+		     (require (quote notmuch-tree))
+		     (notmuch-tree "from:cworth")
+		     (notmuch-test-wait)
+		     (notmuch-tree-next-matching-message)
+		     (notmuch-show-stash-message-id)')
+test_expect_equal "$output" "\"Stashed: id:878we4qdqf.fsf@yoom.home.cworth.org\""
+
+test_begin_subtest "Move to next thread"
+output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
+		     (require (quote notmuch-tree))
+		     (notmuch-tree "tag:inbox")
+		     (notmuch-test-wait)
+		     (forward-line 26)
+		     (notmuch-tree-next-thread)
+		     (notmuch-show-stash-message-id)')
+test_expect_equal "$output" "\"Stashed: id:1258471718-6781-1-git-send-email-dottedmag@dottedmag.net\""
+
+test_begin_subtest "Move to previous thread"
+output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
+		     (require (quote notmuch-tree))
+		     (notmuch-tree "tag:inbox")
+		     (notmuch-test-wait)
+		     (forward-line 26)
+		     (notmuch-tree-prev-thread)
+		     (notmuch-show-stash-message-id)')
+test_expect_equal "$output" "\"Stashed: id:20091117190054.GU3165@dottiness.seas.harvard.edu\""
+
+test_begin_subtest "Move to previous previous thread"
+output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
+		     (require (quote notmuch-tree))
+		     (notmuch-tree "tag:inbox")
+		     (notmuch-test-wait)
+		     (forward-line 26)
+		     (notmuch-tree-prev-thread)
+		     (notmuch-tree-prev-thread)
+		     (notmuch-show-stash-message-id)')
+test_expect_equal "$output" "\"Stashed: id:1258493565-13508-1-git-send-email-keithp@keithp.com\""
+
 test_done