[PATCH 3/4] test: add some tests for --include-text-content option

diff --git a/fa/86d14546a7779780c0f7ac270fc779ab34229b b/fa/86d14546a7779780c0f7ac270fc779ab34229b
new file mode 100644 (file)
index 0000000..ccca715
--- /dev/null
+++ b/fa/86d14546a7779780c0f7ac270fc779ab34229b
@@ -0,0 +1,89 @@
+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 87C53429E2F\r
+       for <notmuch@notmuchmail.org>; Sun, 22 Jul 2012 07:38:18 -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 8Dcg7-wTF3G2 for <notmuch@notmuchmail.org>;\r
+       Sun, 22 Jul 2012 07:38:16 -0700 (PDT)\r
+Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com\r
+       [209.85.212.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 8B19B431FB6\r
+       for <notmuch@notmuchmail.org>; Sun, 22 Jul 2012 07:38:13 -0700 (PDT)\r
+Received: by mail-wi0-f179.google.com with SMTP id hq4so1563921wib.2\r
+       for <notmuch@notmuchmail.org>; Sun, 22 Jul 2012 07:38:13 -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=f6jmu3XZncueOLqAcFEAyQ9wR4sHczCRzQ4Ha5tShb0=;\r
+       b=g9HMytcoRROkyPJy65b+KEAWxeBt314DP1UkswYhOHFQvmSbxGPO9UKboajomRLIiB\r
+       cSAp1AU3GzZ8y3KllkvIKLTZjCBzAOFslWFv4gUUTvvud/mbtcVzlKAb5p0e+lssx4QQ\r
+       tAeBaSSx/fHxmhuFmxNe8NMYkXk+juqEtuiVpkiUgdEDbdm0HVRVttx3dZMQm3Sxh/pv\r
+       Zz3N2OSC4rxJgeR8N57jmlbYyHzvGfOEE0XPJiEO1Ab+a9DAusPi0QqjTs2N3uv8XR4S\r
+       +LcMuMcx92ZTxBngLnDfyob539lcQcZ5/L39JvSRVxANP7vcNZ2fbFLntmM3+MuS3zVk\r
+       kH2Q==\r
+Received: by 10.216.85.149 with SMTP id u21mr6701439wee.147.1342967893107;\r
+       Sun, 22 Jul 2012 07:38:13 -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
+ ex20sm16719766wid.7.2012.07.22.07.38.11       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sun, 22 Jul 2012 07:38:12 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/4] test: add some tests for --include-text-content option\r
+Date: Sun, 22 Jul 2012 15:37:58 +0100\r
+Message-Id: <1342967879-20453-4-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1342967879-20453-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1342967879-20453-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: Sun, 22 Jul 2012 14:38:19 -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 6439788..53cb039 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 --include-text-content=true"\r
++output=$(notmuch show --format=json --include-text-content=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 --include-text-content=false"\r
++output=$(notmuch show --format=json --include-text-content=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\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\"}]}, []]]]"\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_search_sanitize)\r
+-- \r
+1.7.9.1\r
+\r