contrib: pick: move lisp names from pick to tree

[notmuch] / contrib / notmuch-pick / test / emacs-pick

diff --git a/contrib/notmuch-pick/test/emacs-pick b/contrib/notmuch-pick/test/emacs-pick
index 37f974ad435b9224c41d509a83690aa862b0579f..fae6e9e1b92d5525cc9609e8ef881466db7be052 100755 (executable)
--- a/contrib/notmuch-pick/test/emacs-pick
+++ b/contrib/notmuch-pick/test/emacs-pick
@@ -16,8 +16,8 @@ test_expect_equal_file OUTPUT EXPECTED
 
 test_begin_subtest "Basic notmuch-pick 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)'
@@ -25,22 +25,95 @@ test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox
 
 test_begin_subtest "Refreshed notmuch-pick 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
 
+# 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_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
+           (require (quote notmuch-tree))
+           (notmuch-tree "tag:inbox")
+           (notmuch-test-wait)
+           (forward-line)
+           (notmuch-tree-tag (list "+test_tag"))
+           (test-output)
+           (delete-other-windows)'
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox-tagged
+
+test_begin_subtest "Tag message in notmuch pick 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_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
+           (require (quote notmuch-tree))
+           (notmuch-tree "tag:inbox")
+           (notmuch-test-wait)
+           (forward-line)
+           (notmuch-tree-tag (list "-test_tag"))
+           (test-output)
+           (delete-other-windows)'
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox
+
+test_begin_subtest "Untag message in notmuch pick view (database)"
+output=$(notmuch search --output=messages 'tag:test_tag')
+test_expect_equal "$output" ""
+
+test_begin_subtest "Tag thread in notmuch pick view"
+test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
+           (require (quote notmuch-tree))
+           (notmuch-tree "tag:inbox")
+           (notmuch-test-wait)
+           ;; move to a sizable thread
+           (forward-line 26)
+           (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_begin_subtest "Tag message in notmuch pick view (database)"
+output=$(notmuch search --output=messages 'tag:test_thread_tag')
+test_expect_equal "$output" \
+"id:87ocn0qh6d.fsf@yoom.home.cworth.org
+id:20091118005040.GA25380@dottiness.seas.harvard.edu
+id:yunaayketfm.fsf@aiko.keithp.com
+id:87fx8can9z.fsf@vertex.dottedmag
+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_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
+           (require (quote notmuch-tree))
+           (notmuch-tree "tag:inbox")
+           (notmuch-test-wait)
+           ;; move to the same sizable thread as above
+           (forward-line 26)
+           (notmuch-tree-tag-thread (list "-test_thread_tag"))
+           (test-output)
+           (delete-other-windows)'
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox
+
+test_begin_subtest "Untag message in notmuch pick view (database)"
+output=$(notmuch search --output=messages 'tag:test_thread_tag')
+test_expect_equal "$output" ""
+
 test_begin_subtest "Navigation of notmuch-hello to search results"
 test_emacs '(notmuch-hello)
            (goto-char (point-min))
            (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)'
@@ -52,7 +125,7 @@ test_emacs '(notmuch-hello)
            (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)'
@@ -65,7 +138,7 @@ test_emacs '(notmuch-hello)
            (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)'
@@ -78,12 +151,60 @@ test_emacs '(notmuch-hello)
            (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_begin_subtest "Stash id"
+output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
+                    (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