From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id B06B642116A for ; Sat, 26 Oct 2013 15:02:30 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 1.514 X-Spam-Level: * X-Spam-Status: No, score=1.514 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, URI_HEX=1.313] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id H7JTwnGyM5wB for ; Sat, 26 Oct 2013 15:02:26 -0700 (PDT) Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id E3C75431FD9 for ; Sat, 26 Oct 2013 15:02:20 -0700 (PDT) Received: by mail-wg0-f52.google.com with SMTP id k14so385718wgh.31 for ; Sat, 26 Oct 2013 15:02:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+vltQD9SSHzx5DD4aO1EJt645EVg+mDqm/mqUOf1ME0=; b=GceJ7XoJu9dGE4iamDfy/H1ROnswQIxMgUjdF/SetdLHH/tQCL0tYkml7uE7q65aE6 fMXB4DWo7PO2+TjOeN7StmEH2loB0Pr5O1KcGmiDbU7lL53/HP49jinkN52QvUS41njC VfxWllLPUqgjy89j+uvwBye4b3HqxB8wO6Pf/EXhFwNymKWFTc9Jjqz48CTs2Y85vJJ2 imAeB0JzKmMMzYy+eNWLXLvmIIXBDQci+9J1hahBxIxV9PbaQ1iBXFuMwBI04ts30sgA XeHzGoyuonb9tIeB7oYwoWeumIr31L2QVCuN+aAezNPVcWp0a7gQrmS4hThNGkYIODD+ s9Mg== X-Received: by 10.194.250.6 with SMTP id yy6mr12596831wjc.13.1382824939794; Sat, 26 Oct 2013 15:02:19 -0700 (PDT) Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) by mx.google.com with ESMTPSA id ey4sm19988719wic.11.2013.10.26.15.02.18 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 26 Oct 2013 15:02:19 -0700 (PDT) From: Mark Walters To: notmuch@notmuchmail.org Subject: [PATCH 4/4] pick: rename test emacs-pick to emacs-tree Date: Sat, 26 Oct 2013 23:02:08 +0100 Message-Id: <1382824928-3771-5-git-send-email-markwalters1009@gmail.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1382824928-3771-1-git-send-email-markwalters1009@gmail.com> References: <1382824928-3771-1-git-send-email-markwalters1009@gmail.com> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Oct 2013 22:02:31 -0000 Also fixup run-tests.sh --- contrib/notmuch-pick/run-tests.sh | 2 +- contrib/notmuch-pick/test/emacs-pick | 210 ---------------------------------- contrib/notmuch-pick/test/emacs-tree | 210 ++++++++++++++++++++++++++++++++++ 3 files changed, 211 insertions(+), 211 deletions(-) delete mode 100755 contrib/notmuch-pick/test/emacs-pick create mode 100755 contrib/notmuch-pick/test/emacs-tree diff --git a/contrib/notmuch-pick/run-tests.sh b/contrib/notmuch-pick/run-tests.sh index 4832d72..1767949 100755 --- a/contrib/notmuch-pick/run-tests.sh +++ b/contrib/notmuch-pick/run-tests.sh @@ -7,7 +7,7 @@ fail() { exit 1 } -TESTS="emacs-pick" +TESTS="emacs-tree" TESTFILES="$TESTS tree.expected-output" export PICK_DIR="`cd \`dirname "$0"\` && pwd`" diff --git a/contrib/notmuch-pick/test/emacs-pick b/contrib/notmuch-pick/test/emacs-pick deleted file mode 100755 index 05ce85d..0000000 --- a/contrib/notmuch-pick/test/emacs-pick +++ /dev/null @@ -1,210 +0,0 @@ -#!/usr/bin/env bash - -test_description="emacs tree view interface" -. test-lib.sh - -EXPECTED=$TEST_DIRECTORY/tree.expected-output - -add_email_corpus -test_begin_subtest "Do we have emacs" -test_emacs '(insert "hello\n") - (test-output)' -cat <EXPECTED -hello -EOF -test_expect_equal_file OUTPUT EXPECTED - -test_begin_subtest "Basic notmuch-tree view in emacs" -test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'") - (require (quote notmuch-tree)) - (notmuch-tree "tag:inbox") - (notmuch-test-wait) - (test-output) - (delete-other-windows)' -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox - -test_begin_subtest "Refreshed notmuch-tree view in emacs" -test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'") - (require (quote notmuch-tree)) - (notmuch-tree "tag:inbox") - (notmuch-test-wait) - (notmuch-tree-refresh-view) - (notmuch-test-wait) - (test-output) - (delete-other-windows)' -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 tree 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-tree-tag-inbox-tagged - -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 tree 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-tree-tag-inbox - -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 tree 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-tree-tag-inbox-thread-tagged - -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 -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 tree 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-tree-tag-inbox - -test_begin_subtest "Untag message in notmuch tree 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-tree-from-search-current-query) - (notmuch-test-wait) - (test-output) - (delete-other-windows)' -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox - -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-tree-from-search-thread) - (notmuch-test-wait) - (test-output) - (delete-other-windows)' -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread - -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-tree-from-show-current-query) - (notmuch-test-wait) - (test-output) - (delete-other-windows)' -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread - -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-tree-from-search-thread) - (notmuch-test-wait) - (select-window notmuch-tree-message-window) - (test-output) - (delete-other-windows)' -cp OUTPUT /tmp/mjwout -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-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 diff --git a/contrib/notmuch-pick/test/emacs-tree b/contrib/notmuch-pick/test/emacs-tree new file mode 100755 index 0000000..05ce85d --- /dev/null +++ b/contrib/notmuch-pick/test/emacs-tree @@ -0,0 +1,210 @@ +#!/usr/bin/env bash + +test_description="emacs tree view interface" +. test-lib.sh + +EXPECTED=$TEST_DIRECTORY/tree.expected-output + +add_email_corpus +test_begin_subtest "Do we have emacs" +test_emacs '(insert "hello\n") + (test-output)' +cat <EXPECTED +hello +EOF +test_expect_equal_file OUTPUT EXPECTED + +test_begin_subtest "Basic notmuch-tree view in emacs" +test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'") + (require (quote notmuch-tree)) + (notmuch-tree "tag:inbox") + (notmuch-test-wait) + (test-output) + (delete-other-windows)' +test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox + +test_begin_subtest "Refreshed notmuch-tree view in emacs" +test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'") + (require (quote notmuch-tree)) + (notmuch-tree "tag:inbox") + (notmuch-test-wait) + (notmuch-tree-refresh-view) + (notmuch-test-wait) + (test-output) + (delete-other-windows)' +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 tree 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-tree-tag-inbox-tagged + +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 tree 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-tree-tag-inbox + +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 tree 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-tree-tag-inbox-thread-tagged + +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 +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 tree 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-tree-tag-inbox + +test_begin_subtest "Untag message in notmuch tree 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-tree-from-search-current-query) + (notmuch-test-wait) + (test-output) + (delete-other-windows)' +test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox + +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-tree-from-search-thread) + (notmuch-test-wait) + (test-output) + (delete-other-windows)' +test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread + +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-tree-from-show-current-query) + (notmuch-test-wait) + (test-output) + (delete-other-windows)' +test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread + +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-tree-from-search-thread) + (notmuch-test-wait) + (select-window notmuch-tree-message-window) + (test-output) + (delete-other-windows)' +cp OUTPUT /tmp/mjwout +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-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 -- 1.7.9.1