[Patch v8 14/18] test/tagging: add test for compound queries with batch tagging

diff --git a/df/9d02e4a0f1708a5b4bf574d837044a53fa6269 b/df/9d02e4a0f1708a5b4bf574d837044a53fa6269
new file mode 100644 (file)
index 0000000..902a9aa
--- /dev/null
+++ b/df/9d02e4a0f1708a5b4bf574d837044a53fa6269
@@ -0,0 +1,104 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id CCDA9431FBD\r
+       for <notmuch@notmuchmail.org>; Fri, 21 Dec 2012 05:08:41 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id Tz5V8T2lyt1w for <notmuch@notmuchmail.org>;\r
+       Fri, 21 Dec 2012 05:08:40 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 31DC0431FBF\r
+       for <notmuch@notmuchmail.org>; Fri, 21 Dec 2012 05:08:39 -0800 (PST)\r
+Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.82.78] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1Tm2L7-0005dk-PA; Fri, 21 Dec 2012 09:08:37 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1Tm2L2-0005zl-Aa; Fri, 21 Dec 2012 09:08:32 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v8 14/18] test/tagging: add test for compound queries with\r
+       batch tagging\r
+Date: Fri, 21 Dec 2012 09:08:23 -0400\r
+Message-Id: <1356095307-22895-14-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1356095307-22895-1-git-send-email-david@tethera.net>\r
+References: <1356095307-22895-1-git-send-email-david@tethera.net>\r
+X-Spam_bar: -\r
+Cc: David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 21 Dec 2012 13:08:42 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+This is to watch for errors in quoting the query.\r
+---\r
+ test/tagging |   28 ++++++++++++++++++++++++++++\r
+ 1 file changed, 28 insertions(+)\r
+\r
+diff --git a/test/tagging b/test/tagging\r
+index 1d59af0..88cd18b 100755\r
+--- a/test/tagging\r
++++ b/test/tagging\r
+@@ -174,6 +174,34 @@ notmuch dump --format=batch-tag | sort > OUTPUT\r
+ notmuch restore --format=batch-tag < BACKUP\r
+ test_expect_equal_file EXPECTED OUTPUT\r
+ \r
++test_begin_subtest '--batch: compound queries'\r
++notmuch dump --format=batch-tag > BACKUP\r
++\r
++notmuch tag --batch <<EOF\r
++# match nothing\r
+++compound1 -- One and Two\r
++# match everything\r
+++compound2 -- One or Two\r
+++tag%20with%20spaces -- *\r
++# redundant compound query\r
+++compound3 -- id:msg-002@notmuch-test-suite and Two\r
++# check for prefix in second token\r
+++compound4 -- Two and id:msg-002@notmuch-test-suite\r
++# both have prefixes\r
++-unread -- tag:tag%20with%20spaces and id:msg-002@notmuch-test-suite\r
++# remove from only msg-001\r
++-tag%20with%20spaces -- tag:unread and tag:compound2\r
++EOF\r
++\r
++cat <<EOF > EXPECTED\r
+++compound2 +compound3 +compound4 +inbox +tag%20with%20spaces +tag4 +tag5 -- id:msg-002@notmuch-test-suite\r
+++compound2 +inbox +tag5 +unread -- id:msg-001@notmuch-test-suite\r
++EOF\r
++\r
++notmuch dump --format=batch-tag | sort > OUTPUT\r
++notmuch restore --format=batch-tag < BACKUP\r
++test_expect_equal_file EXPECTED OUTPUT\r
++\r
+ test_begin_subtest '--batch: unicode tags'\r
+ notmuch dump --format=batch-tag > BACKUP\r
+ \r
+-- \r
+1.7.10.4\r
+\r