debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: conform to content length, encoding fields

Browse source 
Update tests to expect content-length and content-transfer-encoding
fields in show --format=json output, for leaf parts with omitted body
content.
This commit is contained in:
Peter Wang 2012-12-15 14:06:45 +11:00 committed by David Bremner
parent b96ba6326a
commit 732f50a20a
4 changed files with 40 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
test/crypto
View file

@ -61,7 +61,8 @@ expected='[[[{"id": "XXXXX",
"content-type": "text/plain", "content-type": "text/plain",
"content": "This is a test signed message.\n"}, "content": "This is a test signed message.\n"},
{"id": 3, {"id": 3,
"content-type": "application/pgp-signature"}]}]}, "content-type": "application/pgp-signature",
"content-length": 315}]}]},
[]]]]' []]]]'
test_expect_equal_json \ test_expect_equal_json \
"$output" \ "$output" \
@ -95,7 +96,8 @@ expected='[[[{"id": "XXXXX",
"content-type": "text/plain", "content-type": "text/plain",
"content": "This is a test signed message.\n"}, "content": "This is a test signed message.\n"},
{"id": 3, {"id": 3,
"content-type": "application/pgp-signature"}]}]}, "content-type": "application/pgp-signature",
"content-length": 315}]}]},
[]]]]' []]]]'
test_expect_equal_json \ test_expect_equal_json \
"$output" \ "$output" \
@ -127,7 +129,8 @@ expected='[[[{"id": "XXXXX",
"content-type": "text/plain", "content-type": "text/plain",
"content": "This is a test signed message.\n"}, "content": "This is a test signed message.\n"},
{"id": 3, {"id": 3,
"content-type": "application/pgp-signature"}]}]}, "content-type": "application/pgp-signature",
"content-length": 315}]}]},
[]]]]' []]]]'
test_expect_equal_json \ test_expect_equal_json \
"$output" \ "$output" \
@ -196,7 +199,8 @@ expected='[[[{"id": "XXXXX",
"sigstatus": [], "sigstatus": [],
"content-type": "multipart/encrypted", "content-type": "multipart/encrypted",
"content": [{"id": 2, "content": [{"id": 2,
"content-type": "application/pgp-encrypted"}, "content-type": "application/pgp-encrypted",
"content-length": 11},
{"id": 3, {"id": 3,
"content-type": "multipart/mixed", "content-type": "multipart/mixed",
"content": [{"id": 4, "content": [{"id": 4,
@ -204,6 +208,8 @@ expected='[[[{"id": "XXXXX",
"content": "This is a test encrypted message.\n"}, "content": "This is a test encrypted message.\n"},
{"id": 5, {"id": 5,
"content-type": "application/octet-stream", "content-type": "application/octet-stream",
"content-length": 28,
"content-transfer-encoding": "base64",
"filename": "TESTATTACHMENT"}]}]}]}, "filename": "TESTATTACHMENT"}]}]}]},
[]]]]' []]]]'
test_expect_equal_json \ test_expect_equal_json \
@ -231,9 +237,11 @@ test_expect_equal_file OUTPUT TESTATTACHMENT
test_begin_subtest "decryption failure with missing key" test_begin_subtest "decryption failure with missing key"
mv "${GNUPGHOME}"{,.bak} mv "${GNUPGHOME}"{,.bak}
# The length of the encrypted attachment varies so must be normalized.
output=$(notmuch show --format=json --decrypt subject:"test encrypted message 001" \ output=$(notmuch show --format=json --decrypt subject:"test encrypted message 001" \
| notmuch_json_show_sanitize \ | notmuch_json_show_sanitize \
| sed -e 's|"created": [1234567890]*|"created": 946728000|') | sed -e 's|"created": [1234567890]*|"created": 946728000|' \
| sed -e 's|"content-length": 6[1234567890]*|"content-length": 652|')
expected='[[[{"id": "XXXXX", expected='[[[{"id": "XXXXX",
"match": true, "match": true,
"excluded": false, "excluded": false,
@ -249,9 +257,11 @@ expected='[[[{"id": "XXXXX",
"encstatus": [{"status": "bad"}], "encstatus": [{"status": "bad"}],
"content-type": "multipart/encrypted", "content-type": "multipart/encrypted",
"content": [{"id": 2, "content": [{"id": 2,
"content-type": "application/pgp-encrypted"}, "content-type": "application/pgp-encrypted",
"content-length": 11},
{"id": 3, {"id": 3,
"content-type": "application/octet-stream"}]}]}, "content-type": "application/octet-stream",
"content-length": 652}]}]},
[]]]]' []]]]'
test_expect_equal_json \ test_expect_equal_json \
"$output" \ "$output" \
@ -287,7 +297,8 @@ expected='[[[{"id": "XXXXX",
"userid": " Notmuch Test Suite <test_suite@notmuchmail.org> (INSECURE!)"}], "userid": " Notmuch Test Suite <test_suite@notmuchmail.org> (INSECURE!)"}],
"content-type": "multipart/encrypted", "content-type": "multipart/encrypted",
"content": [{"id": 2, "content": [{"id": 2,
"content-type": "application/pgp-encrypted"}, "content-type": "application/pgp-encrypted",
"content-length": 11},
{"id": 3, {"id": 3,
"content-type": "text/plain", "content-type": "text/plain",
"content": "This is another test encrypted message.\n"}]}]}, "content": "This is another test encrypted message.\n"}]}]},
@ -342,7 +353,8 @@ expected='[[[{"id": "XXXXX",
"content-type": "text/plain", "content-type": "text/plain",
"content": "This is a test signed message.\n"}, "content": "This is a test signed message.\n"},
{"id": 3, {"id": 3,
"content-type": "application/pgp-signature"}]}]}, "content-type": "application/pgp-signature",
"content-length": 315}]}]},
[]]]]' []]]]'
test_expect_equal_json \ test_expect_equal_json \
"$output" \ "$output" \

4
test/json
View file

@ -45,7 +45,9 @@ emacs_deliver_message \
(insert \"Message-ID: <$id>\n\")" (insert \"Message-ID: <$id>\n\")"
output=$(notmuch show --format=json "id:$id") output=$(notmuch show --format=json "id:$id")
filename=$(notmuch search --output=files "id:$id") filename=$(notmuch search --output=files "id:$id")
test_expect_equal_json "$output" "[[[{\"id\": \"$id\", \"match\": true, \"excluded\": false, \"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\", \"Date\": \"Sat, 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\"}]}]}, []]]]" # Get length of README after base64-encoding, minus additional newline.
attachment_length=$(( $(base64 $TEST_DIRECTORY/README | wc -c) - 1 ))
test_expect_equal_json "$output" "[[[{\"id\": \"$id\", \"match\": true, \"excluded\": false, \"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\", \"Date\": \"Sat, 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\", \"content-length\": $attachment_length, \"content-transfer-encoding\": \"base64\", \"filename\": \"README\"}]}]}, []]]]"
test_begin_subtest "Search message: json, utf-8" 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\"" 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\""

24
test/multipart
View file

@ -326,11 +326,11 @@ cat <<EOF >EXPECTED
{"id": 2, "content-type": "multipart/mixed", "content": [ {"id": 2, "content-type": "multipart/mixed", "content": [
{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"Subject": "html message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [ {"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"Subject": "html message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [
{"id": 4, "content-type": "multipart/alternative", "content": [ {"id": 4, "content-type": "multipart/alternative", "content": [
{"id": 5, "content-type": "text/html"}, {"id": 5, "content-type": "text/html", "content-length": 71},
{"id": 6, "content-type": "text/plain", "content": "This is an embedded message, with a multipart/alternative part.\n"}]}]}]}, {"id": 6, "content-type": "text/plain", "content": "This is an embedded message, with a multipart/alternative part.\n"}]}]}]},
{"id": 7, "content-type": "text/plain", "filename": "attachment", "content": "This is a text attachment.\n"}, {"id": 7, "content-type": "text/plain", "filename": "attachment", "content": "This is a text attachment.\n"},
{"id": 8, "content-type": "text/plain", "content": "And this message is signed.\n\n-Carl\n"}]}, {"id": 8, "content-type": "text/plain", "content": "And this message is signed.\n\n-Carl\n"}]},
{"id": 9, "content-type": "application/pgp-signature"}]}]} {"id": 9, "content-type": "application/pgp-signature", "content-length": 197}]}]}
EOF EOF
test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED)" test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED)"
@ -341,11 +341,11 @@ cat <<EOF >EXPECTED
{"id": 2, "content-type": "multipart/mixed", "content": [ {"id": 2, "content-type": "multipart/mixed", "content": [
{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"Subject": "html message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [ {"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"Subject": "html message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [
{"id": 4, "content-type": "multipart/alternative", "content": [ {"id": 4, "content-type": "multipart/alternative", "content": [
{"id": 5, "content-type": "text/html"}, {"id": 5, "content-type": "text/html", "content-length": 71},
{"id": 6, "content-type": "text/plain", "content": "This is an embedded message, with a multipart/alternative part.\n"}]}]}]}, {"id": 6, "content-type": "text/plain", "content": "This is an embedded message, with a multipart/alternative part.\n"}]}]}]},
{"id": 7, "content-type": "text/plain", "filename": "attachment", "content": "This is a text attachment.\n"}, {"id": 7, "content-type": "text/plain", "filename": "attachment", "content": "This is a text attachment.\n"},
{"id": 8, "content-type": "text/plain", "content": "And this message is signed.\n\n-Carl\n"}]}, {"id": 8, "content-type": "text/plain", "content": "And this message is signed.\n\n-Carl\n"}]},
{"id": 9, "content-type": "application/pgp-signature"}]} {"id": 9, "content-type": "application/pgp-signature", "content-length": 197}]}
EOF EOF
test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED)" test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED)"
@ -355,7 +355,7 @@ cat <<EOF >EXPECTED
{"id": 2, "content-type": "multipart/mixed", "content": [ {"id": 2, "content-type": "multipart/mixed", "content": [
{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"Subject": "html message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [ {"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"Subject": "html message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [
{"id": 4, "content-type": "multipart/alternative", "content": [ {"id": 4, "content-type": "multipart/alternative", "content": [
{"id": 5, "content-type": "text/html"}, {"id": 5, "content-type": "text/html", "content-length": 71},
{"id": 6, "content-type": "text/plain", "content": "This is an embedded message, with a multipart/alternative part.\n"}]}]}]}, {"id": 6, "content-type": "text/plain", "content": "This is an embedded message, with a multipart/alternative part.\n"}]}]}]},
{"id": 7, "content-type": "text/plain", "filename": "attachment", "content": "This is a text attachment.\n"}, {"id": 7, "content-type": "text/plain", "filename": "attachment", "content": "This is a text attachment.\n"},
{"id": 8, "content-type": "text/plain", "content": "And this message is signed.\n\n-Carl\n"}]} {"id": 8, "content-type": "text/plain", "content": "And this message is signed.\n\n-Carl\n"}]}
@ -367,7 +367,7 @@ notmuch show --format=json --part=3 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OU
cat <<EOF >EXPECTED cat <<EOF >EXPECTED
{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"Subject": "html message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [ {"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"Subject": "html message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [
{"id": 4, "content-type": "multipart/alternative", "content": [ {"id": 4, "content-type": "multipart/alternative", "content": [
{"id": 5, "content-type": "text/html"}, {"id": 5, "content-type": "text/html", "content-length": 71},
{"id": 6, "content-type": "text/plain", "content": "This is an embedded message, with a multipart/alternative part.\n"}]}]}]} {"id": 6, "content-type": "text/plain", "content": "This is an embedded message, with a multipart/alternative part.\n"}]}]}]}
EOF EOF
test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED)" test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED)"
@ -376,7 +376,7 @@ test_begin_subtest "--format=json --part=4, rfc822's multipart/alternative"
notmuch show --format=json --part=4 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT notmuch show --format=json --part=4 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT
cat <<EOF >EXPECTED cat <<EOF >EXPECTED
{"id": 4, "content-type": "multipart/alternative", "content": [ {"id": 4, "content-type": "multipart/alternative", "content": [
{"id": 5, "content-type": "text/html"}, {"id": 5, "content-type": "text/html", "content-length": 71},
{"id": 6, "content-type": "text/plain", "content": "This is an embedded message, with a multipart/alternative part.\n"}]} {"id": 6, "content-type": "text/plain", "content": "This is an embedded message, with a multipart/alternative part.\n"}]}
EOF EOF
test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED)" test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED)"
@ -384,7 +384,7 @@ test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED)"
test_begin_subtest "--format=json --part=5, rfc822's html part" test_begin_subtest "--format=json --part=5, rfc822's html part"
notmuch show --format=json --part=5 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT notmuch show --format=json --part=5 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT
cat <<EOF >EXPECTED cat <<EOF >EXPECTED
{"id": 5, "content-type": "text/html"} {"id": 5, "content-type": "text/html", "content-length": 71}
EOF EOF
test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED)" test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED)"
@ -412,7 +412,7 @@ test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED)"
test_begin_subtest "--format=json --part=9, pgp signature (unverified)" test_begin_subtest "--format=json --part=9, pgp signature (unverified)"
notmuch show --format=json --part=9 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT notmuch show --format=json --part=9 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT
cat <<EOF >EXPECTED cat <<EOF >EXPECTED
{"id": 9, "content-type": "application/pgp-signature"} {"id": 9, "content-type": "application/pgp-signature", "content-length": 197}
EOF EOF
test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED)" test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED)"
@ -624,7 +624,8 @@ cat <<EOF >EXPECTED
"body": [{"id": 4, "body": [{"id": 4,
"content-type": "multipart/alternative", "content-type": "multipart/alternative",
"content": [{"id": 5, "content": [{"id": 5,
"content-type": "text/html"}, "content-type": "text/html",
"content-length": 71},
{"id": 6, {"id": 6,
"content-type": "text/plain", "content-type": "text/plain",
"content": "This is an embedded message, with a multipart/alternative part.\n"}]}]}]}, "content": "This is an embedded message, with a multipart/alternative part.\n"}]}]}]},
@ -636,7 +637,8 @@ cat <<EOF >EXPECTED
"content-type": "text/plain", "content-type": "text/plain",
"content": "And this message is signed.\n\n-Carl\n"}]}, "content": "And this message is signed.\n\n-Carl\n"}]},
{"id": 9, {"id": 9,
"content-type": "application/pgp-signature"}]}]}} "content-type": "application/pgp-signature",
"content-length": 197}]}]}}
EOF EOF
test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED)" test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED)"

4
test/sexp
View file

@ -37,7 +37,9 @@ emacs_deliver_message \
(insert \"Message-ID: <$id>\n\")" (insert \"Message-ID: <$id>\n\")"
output=$(notmuch show --format=sexp "id:$id") output=$(notmuch show --format=sexp "id:$id")
filename=$(notmuch search --output=files "id:$id") filename=$(notmuch search --output=files "id:$id")
test_expect_equal "$output" "((((:id \"$id\" :match t :excluded nil :filename \"$filename\" :timestamp 946728000 :date_relative \"2000-01-01\" :tags (\"inbox\") :headers (:Subject \"sexp-show-inline-attachment-filename\" :From \"Notmuch Test Suite <test_suite@notmuchmail.org>\" :To \"test_suite@notmuchmail.org\" :Date \"Sat, 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\"))))) ())))" # Get length of README after base64-encoding, minus additional newline.
attachment_length=$(( $(base64 $TEST_DIRECTORY/README | wc -c) - 1 ))
test_expect_equal "$output" "((((:id \"$id\" :match t :excluded nil :filename \"$filename\" :timestamp 946728000 :date_relative \"2000-01-01\" :tags (\"inbox\") :headers (:Subject \"sexp-show-inline-attachment-filename\" :From \"Notmuch Test Suite <test_suite@notmuchmail.org>\" :To \"test_suite@notmuchmail.org\" :Date \"Sat, 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\" :content-transfer-encoding \"base64\" :content-length $attachment_length))))) ())))"
test_begin_subtest "Search message: sexp, utf-8" 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\"" 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\""