The test should be run using the wrapper test-wrapper.sh.  This links
the tests into the normal notmuch TEST_DIRECTORY and runs them from
there. After the test is complete then the links are removed.
---

Here are some tests for notmuch-pick. I would have liked to include
the test structure and run them from inside the pick contrib directory
but I couldn't get all the paths to work.

Hence, this slightly hacky solution of linking the relevant stuff (one
test script and one expected output directory) into the normal notmuch
test directory and running from there.                     

Best wishes

Mark

 contrib/notmuch-pick/README                        |    5 +
 contrib/notmuch-pick/test-wrapper.sh               |   16 +++
 contrib/notmuch-pick/test/emacs-pick               |  104 ++++++++++++++++++++
 .../notmuch-pick-single-thread                     |    6 +
 .../pick.expected-output/notmuch-pick-tag-inbox    |   53 ++++++++++
 5 files changed, 184 insertions(+), 0 deletions(-)
 create mode 100755 contrib/notmuch-pick/test-wrapper.sh
 create mode 100755 contrib/notmuch-pick/test/emacs-pick
 create mode 100644 
contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-single-thread
 create mode 100644 
contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox

diff --git a/contrib/notmuch-pick/README b/contrib/notmuch-pick/README
index 8eed974..98251f6 100644
--- a/contrib/notmuch-pick/README
+++ b/contrib/notmuch-pick/README
@@ -15,6 +15,11 @@ Then after the "(require 'notmuch)" line in your .emacs file 
add
 the line "(require 'notmuch-pick nil t)". This will load notmuch-pick on
 your next emacs start.
 
+TEST
+
+Just execute test-wrapper.sh from this directory and it should all
+work. It does require that notmuch has already been built.
+
 USING PICK
 
 The main key entries to notmuch pick are
diff --git a/contrib/notmuch-pick/test-wrapper.sh 
b/contrib/notmuch-pick/test-wrapper.sh
new file mode 100755
index 0000000..3ecf5b9
--- /dev/null
+++ b/contrib/notmuch-pick/test-wrapper.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+fail() {
+    echo ERROR $1
+    exit 1
+}
+
+export PICK_DIR=$PWD
+ln -s $PWD/test/emacs-pick ../../test/ || fail "emacs pick test exists"
+ln -s $PWD/test/pick.expected-output ../../test/ || fail "pick.expected-output 
exists"
+
+cd ../../test || fail "Cannot find test directory"
+./emacs-pick
+
+rm emacs-pick
+rm pick.expected-output
diff --git a/contrib/notmuch-pick/test/emacs-pick 
b/contrib/notmuch-pick/test/emacs-pick
new file mode 100755
index 0000000..9478732
--- /dev/null
+++ b/contrib/notmuch-pick/test/emacs-pick
@@ -0,0 +1,104 @@
+#!/usr/bin/env bash
+
+test_description="emacs interface"
+. test-lib.sh
+
+EXPECTED=$TEST_DIRECTORY/pick.expected-output
+
+add_email_corpus
+test_begin_subtest "Do we have emacs"
+test_emacs '(insert "hello\n")
+            (test-output)'
+cat <<EOF >EXPECTED
+hello
+EOF
+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")
+            (notmuch-test-wait)
+            (test-output)'
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox
+
+test_begin_subtest "Basic notmuch-pick view in emacs (sync)"
+test_emacs '(setq notmuch-pick-asynchronous-parser nil)
+            (notmuch-pick "tag:inbox")
+            (notmuch-test-wait)
+            (test-output)'
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox
+
+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-test-wait)
+            (test-output)'
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox
+
+test_begin_subtest "Navigation of notmuch-hello to search results (sync)"
+test_emacs '(setq notmuch-pick-asynchronous-parser nil)
+            (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-test-wait)
+            (test-output)'
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox
+
+test_begin_subtest "Pick 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-test-wait)
+            (test-output)'
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-single-thread
+
+test_begin_subtest "Pick of a single thread (sync from search)"
+test_emacs '(delete-other-windows)
+            (setq notmuch-pick-asynchronous-parser nil)
+            (notmuch-hello)
+            (goto-char (point-min))
+            (re-search-forward "inbox")
+            (widget-button-press (1- (point)))
+            (notmuch-test-wait)
+            (notmuch-pick-from-search-thread)
+            (notmuch-test-wait)
+            (test-output)'
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-single-thread
+
+test_begin_subtest "Pick 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-test-wait)
+            (test-output)'
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-single-thread
+
+test_begin_subtest "Pick of a single thread (sync from show)"
+test_emacs '(setq notmuch-pick-asynchronous-parser nil)
+            (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-test-wait)
+            (test-output)'
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-single-thread
+
+test_done
diff --git 
a/contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-single-thread 
b/contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-single-thread
new file mode 100644
index 0000000..c9e5ef8
--- /dev/null
+++ b/contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-single-thread
@@ -0,0 +1,6 @@
+  2009-11-17  Mikhail Gusarov       ┬►[notmuch] [PATCH 1/2] Close message file 
after parsing message   headers (inbox)
+  2009-11-17  Mikhail Gusarov       ├─►[notmuch] [PATCH 2/2] Include 
<stdint.h> to get uint32_t in C++ file with gcc 4.4 (inbox, unread)
+  2009-11-17  Carl Worth            ╰┬►[notmuch] [PATCH 1/2] Close message 
file after parsing message headers (inbox, unread)
+  2009-11-17  Keith Packard          ╰┬► ...                                   
           (inbox, unread)
+  2009-11-18  Carl Worth              ╰─► ...                                  
           (inbox, unread)
+End of search results.
diff --git 
a/contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox 
b/contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox
new file mode 100644
index 0000000..484141e
--- /dev/null
+++ b/contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox
@@ -0,0 +1,53 @@
+  2010-12-29  François Boulogne     ─►[aur-general] Guidelines: cp, mkdir vs 
install      (inbox, unread)
+  2010-12-16  Olivier Berger        ─►Essai accentué                           
           (inbox, unread)
+  2009-11-18  Chris Wilson          ─►[notmuch] [PATCH 1/2] Makefile: evaluate 
pkg-config once (inbox, unread)
+  2009-11-18  Alex Botero-Lowry     ┬►[notmuch] [PATCH] Error out if no query 
is supplied to search    instead of going into an infinite loop (attachment, 
inbox, unread)
+  2009-11-18  Carl Worth            ╰─►[notmuch] [PATCH] Error out if no query 
is supplied to search instead of going into an infinite loop (inbox, unread)
+  2009-11-17  Ingmar Vanhassel      ┬►[notmuch] [PATCH] Typsos                 
           (inbox, unread)
+  2009-11-18  Carl Worth            ╰─► ...                                    
           (inbox, unread)
+  2009-11-17  Adrian Perez de Cast  ┬►[notmuch] Introducing myself             
           (inbox, signed, unread)
+  2009-11-18  Keith Packard         ├─► ...                                    
           (inbox, unread)
+  2009-11-18  Carl Worth            ╰─► ...                                    
           (inbox, unread)
+  2009-11-17  Israel Herraiz        ┬►[notmuch] New to the list                
           (inbox, unread)
+  2009-11-18  Keith Packard         ├─► ...                                    
           (inbox, unread)
+  2009-11-18  Carl Worth            ╰─► ...                                    
           (inbox, unread)
+  2009-11-17  Jan Janak             ┬►[notmuch] What a great idea!             
           (inbox, unread)
+  2009-11-17  Jan Janak             ├─► ...                                    
           (inbox, unread)
+  2009-11-18  Carl Worth            ╰─► ...                                    
           (inbox, unread)
+  2009-11-17  Jan Janak             ┬►[notmuch] [PATCH] Older versions of 
install do not support -C. (inbox, unread)
+  2009-11-18  Carl Worth            ╰─► ...                                    
           (inbox, unread)
+  2009-11-17  Aron Griffis          ┬►[notmuch] archive                        
           (inbox, unread)
+  2009-11-18  Keith Packard         ╰┬► ...                                    
           (inbox, unread)
+  2009-11-18  Carl Worth             ╰─► ...                                   
           (inbox, unread)
+  2009-11-17  Keith Packard         ┬►[notmuch] [PATCH] Make notmuch-show 'X' 
(and 'x') commands remove        inbox (and unread) tags (inbox, unread)
+  2009-11-18  Carl Worth            ╰─►[notmuch] [PATCH] Make notmuch-show 'X' 
(and 'x') commands remove inbox (and unread) tags (inbox, unread)
+  2009-11-17  Lars Kellogg-Stedman  ┬►[notmuch] Working with Maildir storage?  
           (inbox, signed, unread)
+  2009-11-17  Mikhail Gusarov       ├┬► ...                                    
           (inbox, signed, unread)
+  2009-11-17  Lars Kellogg-Stedman  │╰┬► ...                                   
           (inbox, signed, unread)
+  2009-11-17  Mikhail Gusarov       │ ├─► ...                                  
           (inbox, unread)
+  2009-11-17  Keith Packard         │ ╰┬► ...                                  
           (inbox, unread)
+  2009-11-18  Lars Kellogg-Stedman  │  ╰─► ...                                 
           (inbox, signed, unread)
+  2009-11-18  Carl Worth            ╰─► ...                                    
           (inbox, unread)
+  2009-11-17  Mikhail Gusarov       ┬►[notmuch] [PATCH 1/2] Close message file 
after parsing message   headers (inbox, unread)
+  2009-11-17  Mikhail Gusarov       ├─►[notmuch] [PATCH 2/2] Include 
<stdint.h> to get uint32_t in C++ file with gcc 4.4 (inbox, unread)
+  2009-11-17  Carl Worth            ╰┬►[notmuch] [PATCH 1/2] Close message 
file after parsing message headers (inbox, unread)
+  2009-11-17  Keith Packard          ╰┬► ...                                   
           (inbox, unread)
+  2009-11-18  Carl Worth              ╰─► ...                                  
           (inbox, unread)
+  2009-11-18  Keith Packard         ┬►[notmuch] [PATCH] Create a default 
notmuch-show-hook that        highlights URLs and uses word-wrap (inbox, unread)
+  2009-11-18  Alexander Botero-Low  ╰─►[notmuch] [PATCH] Create a default 
notmuch-show-hook that highlights URLs and uses word-wrap (inbox, unread)
+  2009-11-18  Alexander Botero-Low  ─►[notmuch] request for pull               
           (inbox, unread)
+  2009-11-18  Jjgod Jiang           ┬►[notmuch] Mac OS X/Darwin compatibility 
issues      (inbox, unread)
+  2009-11-18  Alexander Botero-Low  ╰┬► ...                                    
           (inbox, unread)
+  2009-11-18  Jjgod Jiang            ╰┬► ...                                   
           (inbox, unread)
+  2009-11-18  Alexander Botero-Low    ╰─► ...                                  
           (inbox, unread)
+  2009-11-18  Rolland Santimano     ─►[notmuch] Link to mailing list archives 
?           (inbox, unread)
+  2009-11-18  Jan Janak             ─►[notmuch] [PATCH] notmuch new: Support 
for conversion of spool   subdirectories into tags (inbox, unread)
+  2009-11-18  Stewart Smith         ─►[notmuch] [PATCH] count_files: sort 
directory in inode order before      statting (inbox, unread)
+  2009-11-18  Stewart Smith         ─►[notmuch] [PATCH 2/2] Read mail 
directory in inode number order (inbox, unread)
+  2009-11-18  Stewart Smith         ─►[notmuch] [PATCH] Fix linking with gcc 
to use g++ to link in C++ libs. (inbox, unread)
+  2009-11-18  Lars Kellogg-Stedman  ┬►[notmuch] "notmuch help" outputs to 
stderr?         (attachment, inbox, signed, unread)
+  2009-11-18  Lars Kellogg-Stedman  ╰─► ...                                    
           (attachment, inbox, signed, unread)
+  2009-11-17  Mikhail Gusarov       ─►[notmuch] [PATCH] Handle rename of 
message file     (inbox, unread)
+  2009-11-17  Alex Botero-Lowry     ┬►[notmuch] preliminary FreeBSD support    
           (attachment, inbox, unread)
+  2009-11-17  Carl Worth            ╰─► ...                                    
           (inbox, unread)
+End of search results.
-- 
1.7.9.1

_______________________________________________
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

Reply via email to