From: Mark Walters Date: Mon, 23 Jul 2012 16:17:19 +0000 (+0100) Subject: [PATCH 2/4] test: add tests for the new --body=true|false option X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=34a5a4945ad875b623df6905c6659608c2b6f9bd;p=notmuch-archives.git [PATCH 2/4] test: add tests for the new --body=true|false option --- diff --git a/99/f3ad44de30eea006738aeeadb2eb5df8636d0e b/99/f3ad44de30eea006738aeeadb2eb5df8636d0e new file mode 100644 index 000000000..0b7b7c53f --- /dev/null +++ b/99/f3ad44de30eea006738aeeadb2eb5df8636d0e @@ -0,0 +1,89 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id E2C12431FAF + for ; Mon, 23 Jul 2012 09:17:35 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id YvjzPcYxmoI2 for ; + Mon, 23 Jul 2012 09:17:34 -0700 (PDT) +Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com + [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + 22B3F431FC4 for ; Mon, 23 Jul 2012 09:17:31 -0700 + (PDT) +Received: by wgbdt14 with SMTP id dt14so4951441wgb.2 + for ; Mon, 23 Jul 2012 09:17:29 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=yfYE+//obOnHYjfRaSnSSvMW9cPetGf0Y1+gUFlfj64=; + b=EPJVEy61+HkLVcspKlJzgVBO6OTyVLOlN+KBZDtSjAlwVNdTrj5LZGdsU2fn0QyZCJ + t0mVRgE3I7dljfMcH/l03kNiwQhwirNjrvxD5MB+KPG/OxNm8A1qczGzFT2lJ11X5JeV + P1jF2sHjN3Nz8FOTDDmNyKOEGkvZOcQnDYSP4EJbolXiHoLvhi+7dSlGWV6ciSnH4wyP + i6XFSYK5s4cFQ3PluvSFXWIMyRt/gqkwucZeGyj4PXloO5vQTOvV1eHChckxAEBXc9BS + 7KXIPHt1jt7H0azGop8XKQyWO2NpTgG3eAVtl1Y/bORCeGtq4UmCBeS6rtqnbsyZTVUq + 2Dpg== +Received: by 10.180.92.7 with SMTP id ci7mr32959949wib.1.1343060249905; + Mon, 23 Jul 2012 09:17:29 -0700 (PDT) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + bc2sm26167005wib.0.2012.07.23.09.17.28 (version=TLSv1/SSLv3 cipher=OTHER); + Mon, 23 Jul 2012 09:17:29 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH 2/4] test: add tests for the new --body=true|false option +Date: Mon, 23 Jul 2012 17:17:19 +0100 +Message-Id: <1343060241-18283-3-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1343060241-18283-1-git-send-email-markwalters1009@gmail.com> +References: <1343060241-18283-1-git-send-email-markwalters1009@gmail.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 23 Jul 2012 16:17:36 -0000 + +--- + test/json | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/test/json b/test/json +index 6439788..709b34f 100755 +--- a/test/json ++++ b/test/json +@@ -7,6 +7,15 @@ add_message "[subject]=\"json-show-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:0 + output=$(notmuch show --format=json "json-show-message") + 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 \", \"To\": \"Notmuch Test Suite \", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]" + ++# This should be the same output as above. ++test_begin_subtest "Show message: json --body=true" ++output=$(notmuch show --format=json --body=true "json-show-message") ++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 \", \"To\": \"Notmuch Test Suite \", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]" ++ ++test_begin_subtest "Show message: json --body=false" ++output=$(notmuch show --format=json --body=false "json-show-message") ++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 \", \"To\": \"Notmuch Test Suite \", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}}, []]]]" ++ + test_begin_subtest "Search message: json" + add_message "[subject]=\"json-search-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"json-search-message\"" + output=$(notmuch search --format=json "json-search-message" | notmuch_search_sanitize) +-- +1.7.9.1 +