--- /dev/null
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 46C756DE0C81\r
+ for <notmuch@notmuchmail.org>; Mon, 14 Dec 2015 09:23:17 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.312\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.312 tagged_above=-999 required=5 tests=[AWL=0.258,\r
+ DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id vaPcKgiKvIDr for <notmuch@notmuchmail.org>;\r
+ Mon, 14 Dec 2015 09:23:15 -0800 (PST)\r
+Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com\r
+ [74.125.82.45]) by arlo.cworth.org (Postfix) with ESMTPS id 34D786DE176C for\r
+ <notmuch@notmuchmail.org>; Mon, 14 Dec 2015 09:23:15 -0800 (PST)\r
+Received: by mail-wm0-f45.google.com with SMTP id n186so128394355wmn.1\r
+ for <notmuch@notmuchmail.org>; Mon, 14 Dec 2015 09:23:15 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:in-reply-to:references\r
+ :mime-version:content-type:content-transfer-encoding;\r
+ bh=Okd8bg293zOfubW+BOKLyHWR7ODw798ORLVT7+cVdx4=;\r
+ b=Sky6SzS9Tb91IerAvVYZJmzh9nN4fS4ukspif3LPvJrRz4pOrcTecAedFfHVgvBrQO\r
+ AisnmGPtV994woGqNyQzXyM5wh2DXaOv3sgeRqnQGRK3LDyttxTOIoiGTh1EnJCWRtKJ\r
+ uOPINSBL23nFGyCeoQfBZN4wFIvkHmrsAPXTljXFmGb7vrOw+9GqHKg+mqOgGaeKtrAp\r
+ 6jamE9Kjeip3Sq9hyHE6XW1hg1TRelcemTW3EJxnrgvdxUNxYmSmtDVr5QMqgcQOrYip\r
+ 5SRIw3438w6L+JBNt0Y0DYXyU8kw+6D/oPamPJ/LksbB2ZSH41qawFI6OY+0Zpl2AMxx\r
+ QPRw==\r
+X-Received: by 10.194.116.133 with SMTP id jw5mr38690368wjb.110.1450113791180;\r
+ Mon, 14 Dec 2015 09:23:11 -0800 (PST)\r
+Received: from localhost (92.40.77.76.threembb.co.uk. [92.40.77.76])\r
+ by smtp.gmail.com with ESMTPSA id ft4sm30411129wjb.37.2015.12.14.09.23.09\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Mon, 14 Dec 2015 09:23:10 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 (rebased) 3/3] test: Update tests for 'authors_matched' and\r
+ authors_non_matched'.\r
+Date: Mon, 14 Dec 2015 17:22:46 +0000\r
+Message-Id: <1450113766-20518-4-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1450113766-20518-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1450113766-20518-1-git-send-email-markwalters1009@gmail.com>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=UTF-8\r
+Content-Transfer-Encoding: 8bit\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 14 Dec 2015 17:23:17 -0000\r
+\r
+From: David Edmondson <dme@dme.org>\r
+\r
+---\r
+ test/T160-json.sh | 9 +++++++++\r
+ test/T170-sexp.sh | 4 ++--\r
+ test/T470-missing-headers.sh | 8 ++++++++\r
+ 3 files changed, 19 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/test/T160-json.sh b/test/T160-json.sh\r
+index b346f37..3958841 100755\r
+--- a/test/T160-json.sh\r
++++ b/test/T160-json.sh\r
+@@ -25,6 +25,10 @@ test_expect_equal_json "$output" "[{\"thread\": \"XXX\",\r
+ \"matched\": 1,\r
+ \"total\": 1,\r
+ \"authors\": \"Notmuch Test Suite\",\r
++ \"authors_matched\": [\r
++ \"Notmuch Test Suite\"\r
++ ],\r
++ \"authors_non_matched\": [],\r
+ \"subject\": \"json-search-subject\",\r
+ \"query\": [\"id:$gen_msg_id\", null],\r
+ \"tags\": [\"inbox\",\r
+@@ -59,6 +63,11 @@ test_expect_equal_json "$output" "[{\"thread\": \"XXX\",\r
+ \"matched\": 1,\r
+ \"total\": 1,\r
+ \"authors\": \"Notmuch Test Suite\",\r
++ \"authors\": \"Notmuch Test Suite\",\r
++ \"authors_matched\": [\r
++ \"Notmuch Test Suite\"\r
++ ],\r
++ \"authors_non_matched\": [],\r
+ \"subject\": \"json-search-utf8-body-sübjéct\",\r
+ \"query\": [\"id:$gen_msg_id\", null],\r
+ \"tags\": [\"inbox\",\r
+diff --git a/test/T170-sexp.sh b/test/T170-sexp.sh\r
+index 800ebc6..6c71491 100755\r
+--- a/test/T170-sexp.sh\r
++++ b/test/T170-sexp.sh\r
+@@ -19,7 +19,7 @@ test_expect_equal "$output" "((((:id \"${gen_msg_id}\" :match t :excluded nil :f\r
+ test_begin_subtest "Search message: sexp"\r
+ add_message "[subject]=\"sexp-search-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"sexp-search-message\""\r
+ output=$(notmuch search --format=sexp "sexp-search-message" | notmuch_search_sanitize)\r
+-test_expect_equal "$output" "((:thread \"0000000000000002\" :timestamp 946728000 :date_relative \"2000-01-01\" :matched 1 :total 1 :authors \"Notmuch Test Suite\" :subject \"sexp-search-subject\" :query (\"id:$gen_msg_id\" nil) :tags (\"inbox\" \"unread\")))"\r
++test_expect_equal "$output" "((:thread \"0000000000000002\" :timestamp 946728000 :date_relative \"2000-01-01\" :matched 1 :total 1 :authors \"Notmuch Test Suite\" :authors_matched (\"Notmuch Test Suite\") :authors_non_matched () :subject \"sexp-search-subject\" :query (\"id:$gen_msg_id\" nil) :tags (\"inbox\" \"unread\")))"\r
+ \r
+ test_begin_subtest "Show message: sexp, utf-8"\r
+ add_message "[subject]=\"sexp-show-utf8-body-sübjéct\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"jsön-show-méssage\""\r
+@@ -44,7 +44,7 @@ test_expect_equal "$output" "((((:id \"$id\" :match t :excluded nil :filename \"\r
+ test_begin_subtest "Search message: sexp, utf-8"\r
+ add_message "[subject]=\"sexp-search-utf8-body-sübjéct\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"jsön-search-méssage\""\r
+ output=$(notmuch search --format=sexp "jsön-search-méssage" | notmuch_search_sanitize)\r
+-test_expect_equal "$output" "((:thread \"0000000000000005\" :timestamp 946728000 :date_relative \"2000-01-01\" :matched 1 :total 1 :authors \"Notmuch Test Suite\" :subject \"sexp-search-utf8-body-sübjéct\" :query (\"id:$gen_msg_id\" nil) :tags (\"inbox\" \"unread\")))"\r
++test_expect_equal "$output" "((:thread \"0000000000000005\" :timestamp 946728000 :date_relative \"2000-01-01\" :matched 1 :total 1 :authors \"Notmuch Test Suite\" :authors_matched (\"Notmuch Test Suite\") :authors_non_matched () :subject \"sexp-search-utf8-body-sübjéct\" :query (\"id:$gen_msg_id\" nil) :tags (\"inbox\" \"unread\")))"\r
+ \r
+ \r
+ test_done\r
+diff --git a/test/T470-missing-headers.sh b/test/T470-missing-headers.sh\r
+index e256c10..66c2a1d 100755\r
+--- a/test/T470-missing-headers.sh\r
++++ b/test/T470-missing-headers.sh\r
+@@ -34,6 +34,10 @@ test_expect_equal_json "$output" '\r
+ [\r
+ {\r
+ "authors": "",\r
++ "authors_matched": [\r
++ ""\r
++ ],\r
++ "authors_non_matched": [],\r
+ "date_relative": "2001-01-05",\r
+ "matched": 1,\r
+ "subject": "",\r
+@@ -48,6 +52,10 @@ test_expect_equal_json "$output" '\r
+ },\r
+ {\r
+ "authors": "Notmuch Test Suite",\r
++ "authors_matched": [\r
++ "Notmuch Test Suite"\r
++ ],\r
++ "authors_non_matched": [],\r
+ "date_relative": "1970-01-01",\r
+ "matched": 1,\r
+ "subject": "",\r
+-- \r
+2.1.4\r
+\r
projects / notmuch-archives.git / commitdiff