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 E69D2429E26 for ; Fri, 24 Oct 2014 01:48:20 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.699 X-Spam-Level: X-Spam-Status: No, score=-0.699 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7, UNPARSEABLE_RELAY=0.001] 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 joHQOvwpGnkt for ; Fri, 24 Oct 2014 01:48:14 -0700 (PDT) Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 43B3B431FD7 for ; Fri, 24 Oct 2014 01:48:14 -0700 (PDT) Received: by mail-wg0-f49.google.com with SMTP id x12so600212wgg.20 for ; Fri, 24 Oct 2014 01:48:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:user-agent:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-type :content-transfer-encoding; bh=52F0LC4x2r3whZp2mZvlbnVSXrWE8OmeM/qfuXEZ3LM=; b=RykuS65+dlMT6iHJPFdtb0hk7p81Q+N1HsRzCk4OArcXgeunzYCV0XLJYfQTTSxNKK SZzogmCiuM11DaxN/zV+Qp9m2s1REbrYQsOhLlfXosAhflITrzCTEpY9Lik1bKU//q4E KtmXSCkkGTu5ktocFhWNOue/OFrNdvpY5dOIkpy0NYO2b+e/zv6nH0njxKrwqno6Za62 Y17MyIsXsDCXS7W3xkfaa/3DpRYoR8XC/Af3bNmhtyTTsOcZzrp2Ph+Gs9JJniSsv5zF fovRXFTsflGBc+nyLv6A8byrcIG5cOjrfZRyUjZaPz/Wls3XdRs8FCDUULxVjgUE5PPW vnxw== X-Gm-Message-State: ALoCoQkziUTCXSPHAa60asnBk29pnYAxt3r0Ywxo0IaR94fhJVe3TryHOgi3/YvQeV7ykL6MOJuV X-Received: by 10.180.36.134 with SMTP id q6mr2580692wij.56.1414140492889; Fri, 24 Oct 2014 01:48:12 -0700 (PDT) Received: from disaster-area.hh.sledj.net (disaster-area.hh.sledj.net. [81.149.164.25]) by mx.google.com with ESMTPSA id wt3sm4840424wjb.40.2014.10.24.01.48.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Oct 2014 01:48:12 -0700 (PDT) Received: from localhost (30000@localhost [local]); by localhost (OpenSMTPD) with ESMTPA id b87c556d; for ; Fri, 24 Oct 2014 08:48:08 +0000 (UTC) User-Agent: OpenSMTPD enqueuer (Demoostik) From: David Edmondson To: notmuch@notmuchmail.org Subject: [PATCH v1 3/3] test: Update tests for :authors_matched and :authors_non_matched. Date: Fri, 24 Oct 2014 09:48:08 +0100 Message-Id: <1414140488-29978-4-git-send-email-dme@dme.org> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1414140488-29978-1-git-send-email-dme@dme.org> References: <1414140488-29978-1-git-send-email-dme@dme.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Fri, 24 Oct 2014 08:48:21 -0000 --- test/T160-json.sh | 4 ++++ test/T170-sexp.sh | 4 ++-- test/T470-missing-headers.sh | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test/T160-json.sh b/test/T160-json.sh index c1cf649..d3cf2e7 100755 --- a/test/T160-json.sh +++ b/test/T160-json.sh @@ -25,6 +25,8 @@ test_expect_equal_json "$output" "[{\"thread\": \"XXX\", \"matched\": 1, \"total\": 1, \"authors\": \"Notmuch Test Suite\", + \"authors_matched\": \"Notmuch Test Suite\", + \"authors_non_matched\": \"\", \"subject\": \"json-search-subject\", \"query\": [\"id:$gen_msg_id\", null], \"tags\": [\"inbox\", @@ -59,6 +61,8 @@ test_expect_equal_json "$output" "[{\"thread\": \"XXX\", \"matched\": 1, \"total\": 1, \"authors\": \"Notmuch Test Suite\", + \"authors_matched\": \"Notmuch Test Suite\", + \"authors_non_matched\": \"\", \"subject\": \"json-search-utf8-body-sübjéct\", \"query\": [\"id:$gen_msg_id\", null], \"tags\": [\"inbox\", diff --git a/test/T170-sexp.sh b/test/T170-sexp.sh index 667e319..8a57b74 100755 --- a/test/T170-sexp.sh +++ b/test/T170-sexp.sh @@ -19,7 +19,7 @@ test_expect_equal "$output" "((((:id \"${gen_msg_id}\" :match t :excluded nil :f test_begin_subtest "Search message: sexp" add_message "[subject]=\"sexp-search-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"sexp-search-message\"" output=$(notmuch search --format=sexp "sexp-search-message" | notmuch_search_sanitize) -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\")))" +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\")))" test_begin_subtest "Show message: sexp, utf-8" 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\"" @@ -44,7 +44,7 @@ test_expect_equal "$output" "((((:id \"$id\" :match t :excluded nil :filename \" test_begin_subtest "Search message: sexp, utf-8" 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\"" output=$(notmuch search --format=sexp "jsön-search-méssage" | notmuch_search_sanitize) -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\")))" +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\")))" test_done diff --git a/test/T470-missing-headers.sh b/test/T470-missing-headers.sh index cb38301..5d66e7e 100755 --- a/test/T470-missing-headers.sh +++ b/test/T470-missing-headers.sh @@ -34,6 +34,8 @@ test_expect_equal_json "$output" ' [ { "authors": "", + "authors_matched": "", + "authors_non_matched": "", "date_relative": "2001-01-05", "matched": 1, "subject": "", @@ -48,6 +50,8 @@ test_expect_equal_json "$output" ' }, { "authors": "Notmuch Test Suite", + "authors_matched": "Notmuch Test Suite", + "authors_non_matched": "", "date_relative": "1970-01-01", "matched": 1, "subject": "", -- 2.1.1