[PATCH 3.5/8] Query parser tests for wildcard queries.

diff --git a/ad/36c58282d536140795ab1af13dcd43b6ea0744 b/ad/36c58282d536140795ab1af13dcd43b6ea0744
new file mode 100644 (file)
index 0000000..fbd8a8a
--- /dev/null
+++ b/ad/36c58282d536140795ab1af13dcd43b6ea0744
@@ -0,0 +1,187 @@
+Return-Path: <amdragon@mit.edu>\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 D0E03431FD0\r
+       for <notmuch@notmuchmail.org>; Thu, 20 Jan 2011 22:40:07 -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 jA8UcThkPqfM for <notmuch@notmuchmail.org>;\r
+       Thu, 20 Jan 2011 22:40:07 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
+       [18.9.25.13])\r
+       by olra.theworths.org (Postfix) with ESMTP id 48926431FB6\r
+       for <notmuch@notmuchmail.org>; Thu, 20 Jan 2011 22:40:07 -0800 (PST)\r
+X-AuditID: 1209190d-b7cacae000000a14-5b-4d392a46dc74\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+       by dmz-mailsec-scanner-2.mit.edu (Symantec Brightmail Gateway) with\r
+       SMTP id 68.9C.02580.64A293D4; Fri, 21 Jan 2011 01:40:06 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id p0L6e5JS018056; \r
+       Fri, 21 Jan 2011 01:40:05 -0500\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+       (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id p0L6e4Sh004864\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Fri, 21 Jan 2011 01:40:04 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.72)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1PgAfE-0000zj-08; Fri, 21 Jan 2011 01:40:04 -0500\r
+Date: Fri, 21 Jan 2011 01:40:03 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3.5/8] Query parser tests for wildcard queries.\r
+Message-ID: <20110121064003.GK13226@mit.edu>\r
+References: <1295165458-9573-1-git-send-email-amdragon@mit.edu>\r
+       <1295165458-9573-4-git-send-email-amdragon@mit.edu>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <1295165458-9573-4-git-send-email-amdragon@mit.edu>\r
+User-Agent: Mutt/1.5.20 (2009-06-14)\r
+X-Brightmail-Tracker: AAAAAA==\r
+Cc: amdragon@mit.edu\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 Jan 2011 06:40:08 -0000\r
+\r
+Since wildcard queries require a database, qparser-test can now open a\r
+database.\r
+---\r
+This is intended to be applied after patch 3/5 in this series,\r
+id:1295165458-9573-4-git-send-email-amdragon@mit.edu\r
+\r
+ test/qparser                           |    7 +++++++\r
+ test/qparser-test.cc                   |   25 ++++++++++++++++++++++++-\r
+ test/qparser.expected-output/wildcards |   20 ++++++++++++++++++++\r
+ 3 files changed, 51 insertions(+), 1 deletions(-)\r
+ create mode 100644 test/qparser.expected-output/wildcards\r
+\r
+diff --git a/test/qparser b/test/qparser\r
+index 7ed5c97..d77e2b2 100755\r
+--- a/test/qparser\r
++++ b/test/qparser\r
+@@ -34,4 +34,11 @@ output=$(../qparser-test < $EXPECTED/probs)\r
+ expected=$(cat $EXPECTED/probs)\r
+ test_expect_equal "$output" "$expected"\r
+ \r
++add_message '[body]="Peter Piper picked a peck of pickled peppers"'\r
++\r
++test_begin_subtest "Wildcards"\r
++output=$(../qparser-test -d < $EXPECTED/wildcards)\r
++expected=$(cat $EXPECTED/wildcards)\r
++test_expect_equal "$output" "$expected"\r
++\r
+ test_done\r
+diff --git a/test/qparser-test.cc b/test/qparser-test.cc\r
+index 01d6bae..ae6c8b9 100644\r
+--- a/test/qparser-test.cc\r
++++ b/test/qparser-test.cc\r
+@@ -42,6 +42,7 @@ extern "C" {\r
+ #include "../notmuch-client.h"\r
+ }\r
+ \r
++static notmuch_database_t *notmuch;\r
+ static _notmuch_qparser_t *qparser;\r
+ static Xapian::QueryParser xqparser;\r
+ \r
+@@ -98,7 +99,7 @@ test_one (void *ctx, const char *query_str)\r
+ static _notmuch_qparser_t *\r
+ create_qparser (void *ctx)\r
+ {\r
+-    _notmuch_qparser_t *qparser = _notmuch_qparser_create (ctx, NULL);\r
++    _notmuch_qparser_t *qparser = _notmuch_qparser_create (ctx, notmuch);\r
+     _notmuch_qparser_add_db_prefix (qparser, "prob", "P", FALSE);\r
+     _notmuch_qparser_add_db_prefix (qparser, "lit", "L", TRUE);\r
+     _notmuch_qparser_add_db_prefix (qparser, "tag", "K", TRUE);\r
+@@ -109,6 +110,8 @@ static Xapian::QueryParser\r
+ create_xapian_qparser (void)\r
+ {\r
+     Xapian::QueryParser xq;\r
++    if (notmuch)\r
++      xq.set_database (*notmuch->xapian_db);\r
+     xq.set_default_op (Xapian::Query::OP_AND);\r
+     xq.add_prefix ("prob", "P");\r
+     xq.add_boolean_prefix ("lit", "L");\r
+@@ -120,9 +123,27 @@ int\r
+ main (int argc, char **argv)\r
+ {\r
+     void *ctx;\r
++    notmuch_config_t *config;\r
+ \r
+     ctx = talloc_new (NULL);\r
+ \r
++    if (argc > 1 && strcmp(argv[1], "-d") == 0) {\r
++      argc--;\r
++      argv++;\r
++\r
++      /* Open the database */\r
++      config = notmuch_config_open (ctx, NULL, NULL);\r
++      if (config == NULL)\r
++          return 1;\r
++\r
++      notmuch = notmuch_database_open (notmuch_config_get_database_path (config),\r
++                                       NOTMUCH_DATABASE_MODE_READ_ONLY);\r
++      if (notmuch == NULL)\r
++          return 1;\r
++    } else {\r
++      notmuch = NULL;\r
++    }\r
++\r
+     qparser = create_qparser (ctx);\r
+     xqparser = create_xapian_qparser ();\r
+ \r
+@@ -149,5 +170,7 @@ main (int argc, char **argv)\r
+       }\r
+     }\r
+ \r
++    if (notmuch)\r
++      notmuch_database_close (notmuch);\r
+     return 0;\r
+ }\r
+diff --git a/test/qparser.expected-output/wildcards b/test/qparser.expected-output/wildcards\r
+new file mode 100644\r
+index 0000000..6f62829\r
+--- /dev/null\r
++++ b/test/qparser.expected-output/wildcards\r
+@@ -0,0 +1,20 @@\r
++# Basic wildcard expansion\r
++p* AND x\r
++[lex]    "p"* AND "x"\r
++[parse]  (AND "p"* "x")\r
++[gen]    ((peck:(pos=1) SYNONYM peppers:(pos=1) SYNONYM peter:(pos=1) SYNONYM picked:(pos=1) SYNONYM pickled:(pos=1) SYNONYM piper:(pos=1)) AND x:(pos=2))\r
++\r
++# Incompatible; Xapian considers this a syntax error\r
++*\r
++[lex]    ""*\r
++[parse]  ""*\r
++[gen]    <alldocuments>\r
++[xapian] \r
++\r
++# Wildcard that matches nothing.  Xapian handles this differently\r
++# but equivalently.\r
++nosuchterm* AND x\r
++[lex]    "nosuchterm"* AND "x"\r
++[parse]  (AND "nosuchterm"* "x")\r
++[gen]    (nosuchterm AND x:(pos=1))\r
++[xapian] \r
+-- \r
+1.7.2.3\r
+\r