On Fri, 1 Jul 2011 06:03:50 +0400, Dmitry Kurochkin <dmitry.kurochkin@gmail.com> wrote: > The patch adds a test to check that json show format includes > filenames for attachments with inline disposition. > --- > > Carl, I owe you this test case for my patch that added filenames > for inline attachments :) > > Regards, > Dmitry > > test/json | 13 +++++++++++++ > 1 files changed, 13 insertions(+), 0 deletions(-) > > diff --git a/test/json b/test/json > index 5a2544c..592b068 100755 > --- a/test/json > +++ b/test/json > @@ -23,6 +23,19 @@ add_message "[subject]=\"json-show-utf8-body-sübjéct\"" "[date]=\"Sat, 01 Jan > output=$(notmuch show --format=json "jsön-show-méssage") > test_expect_equal "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-utf8-body-sübjéct\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Cc\": \"\", \"Bcc\": \"\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 -0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"jsön-show-méssage\n\"}]}, []]]]" > > +test_begin_subtest "Show message: json, inline attachment filename" > +subject='json-show-inline-attachment-filename' > +id="json-show-inline-attachment-filename@notmuchmail.org" > +emacs_deliver_message \ > + "$subject" \ > + 'This is a test message with inline attachment with a filename' \ > + "(mml-attach-file \"$TEST_DIRECTORY/README\" nil nil \"inline\") > + (message-goto-eoh) > + (insert \"Message-ID: <$id>\n\")" > +output=$(notmuch show --format=json "id:$id") > +filename=$(notmuch search --output=files "id:$id") > +test_expect_equal "$output" "[[[{\"id\": \"$id\", \"match\": true, \"filename\": \"$filename\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\"], \"headers\": {\"Subject\": \"$subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"test_suite@notmuchmail.org\", \"Cc\": \"\", \"Bcc\": \"\", \"Date\": \"01 Jan 2000 12:00:00 -0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"multipart/mixed\", \"content\": [{\"id\": 2, \"content-type\": \"text/plain\", \"content\": \"This is a test message with inline attachment with a filename\"}, {\"id\": 3, \"content-type\": \"application/octet-stream\", \"filename\": \"README\"}]}]}, []]]]" > + > test_begin_subtest "Search message: json, utf-8" > add_message "[subject]=\"json-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=json "jsön-search-méssage" | notmuch_search_sanitize) > -- > 1.7.5.4 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch Appears to have been merged in by the powers that be: commit 749abb74 Thanks! Peace -- Pieter