[PATCH v2 (rebased) 2/4] test: add tests for the new --body=true|false option

diff --git a/ed/519ec6b64b94ad091a2b74bcd40c1f307c9c11 b/ed/519ec6b64b94ad091a2b74bcd40c1f307c9c11
new file mode 100644 (file)
index 0000000..c7168fe
--- /dev/null
+++ b/ed/519ec6b64b94ad091a2b74bcd40c1f307c9c11
@@ -0,0 +1,90 @@
+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 olra.theworths.org (Postfix) with ESMTP id 8F6BB431FD2\r
+       for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 11:25:39 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] 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 LqXvZulCvelX for <notmuch@notmuchmail.org>;\r
+       Tue, 24 Jul 2012 11:25:38 -0700 (PDT)\r
+Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 2960C431FB6   for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 11:25:38 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f45.google.com with SMTP id dt14so5995257wgb.2\r
+       for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 11:25:37 -0700 (PDT)\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:x-mailer:in-reply-to:references;\r
+       bh=QJy4t4ksf8WaySTKWREcxMfI78PHMmerVlFsMsCXLO0=;\r
+       b=GaLzUlVqzpem0oEhyAkqtZmjW/odkFUBqzg8+xwax5hN31YiEk6O/fcEsNANn4MtHy\r
+       xTTXmm5vb+mcS/UI14hgsvtH3/HNNQMSLOwhrCbhs747V2gyDFVJIMODkD+FX+I8lz0U\r
+       zsp6ua/6J5vWBMzSfvhNEojLKAe03g+IN8VSa5Epn7L/PD52sc0HAv/+4AQJiCQTtiF6\r
+       gA0Nx4pd6VBYTo039IrDZGrgx0XMAVAeistx4SY/P9aqjqVJhwNgr8tdv0rxEwn+kjhw\r
+       FpECRlFqsloCT94NGgkaok6/EM+7m9RJ45gashXKr4B2tVaOUbKXTKg/fIxZhPqsGKF3\r
+       F2PQ==\r
+Received: by 10.216.235.102 with SMTP id t80mr415075weq.87.1343154327554;\r
+       Tue, 24 Jul 2012 11:25:27 -0700 (PDT)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223])     by mx.google.com with ESMTPS id\r
+ y5sm5494691wiw.9.2012.07.24.11.25.26  (version=TLSv1/SSLv3 cipher=OTHER);     Tue,\r
+ 24 Jul 2012 11:25:26 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 (rebased) 2/4] test: add tests for the new\r
+       --body=true|false option\r
+Date: Tue, 24 Jul 2012 19:23:28 +0100\r
+Message-Id: <1343154210-26841-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1343154210-26841-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1343154210-26841-1-git-send-email-markwalters1009@gmail.com>\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: Tue, 24 Jul 2012 18:25:39 -0000\r
+\r
+---\r
+ test/json |    9 +++++++++\r
+ 1 files changed, 9 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/test/json b/test/json\r
+index 337b3f5..831e105 100755\r
+--- a/test/json\r
++++ b/test/json\r
+@@ -7,6 +7,15 @@ add_message "[subject]=\"json-show-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:0\r
+ output=$(notmuch show --format=json "json-show-message")\r
+ test_expect_equal "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]"\r
+ \r
++# This should be the same output as above.\r
++test_begin_subtest "Show message: json --body=true"\r
++output=$(notmuch show --format=json --body=true "json-show-message")\r
++test_expect_equal "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]"\r
++\r
++test_begin_subtest "Show message: json --body=false"\r
++output=$(notmuch show --format=json --body=false "json-show-message")\r
++test_expect_equal "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}}, []]]]"\r
++\r
+ test_begin_subtest "Search message: json"\r
+ add_message "[subject]=\"json-search-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"json-search-message\""\r
+ output=$(notmuch search --format=json "json-search-message" | notmuch_json_show_sanitize | notmuch_search_sanitize)\r
+-- \r
+1.7.9.1\r
+\r