fixup Change T095

diff --git a/test/T095-search-filter-by.sh b/test/T095-search-filter-by.sh
index 8b05d768bb86e99aaed7b6b39828ae443ea0fa4d..15c9f779bff1800c1289ffb16e460c2aed3890b2 100755 (executable)
--- a/test/T095-search-filter-by.sh
+++ b/test/T095-search-filter-by.sh
@@ -2,17 +2,17 @@
 test_description='duplicite address filtering in "notmuch search --output=recipients"'
 . ./test-lib.sh
 
-add_message '[to]="Real Name <foo@example.com>, Real Name <bar@example.com>"'
-add_message '[to]="Nickname <foo@example.com>"' '[cc]="Real Name <Bar@Example.COM>"'
-add_message '[to]="Nickname <foo@example.com>"' '[bcc]="Real Name <Bar@Example.COM>"'
+add_message '[to]="John Doe <foo@example.com>, John Doe <bar@example.com>"'
+add_message '[to]="\"Doe, John\" <foo@example.com>"' '[cc]="John Doe <Bar@Example.COM>"'
+add_message '[to]="\"Doe, John\" <foo@example.com>"' '[bcc]="John Doe <Bar@Example.COM>"'
 
 test_begin_subtest "--output=recipients"
 notmuch search --output=recipients "*" >OUTPUT
 cat <<EOF >EXPECTED
-Real Name <foo@example.com>
-Real Name <bar@example.com>
-Nickname <foo@example.com>
-Real Name <Bar@Example.COM>
+John Doe <foo@example.com>
+John Doe <bar@example.com>
+"Doe, John" <foo@example.com>
+John Doe <Bar@Example.COM>
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
@@ -20,53 +20,53 @@ test_begin_subtest "--output=recipients --filter-by=nameaddr"
 notmuch search --output=recipients --filter-by=nameaddr "*" >OUTPUT
 # The same as above
 cat <<EOF >EXPECTED
-Real Name <foo@example.com>
-Real Name <bar@example.com>
-Nickname <foo@example.com>
-Real Name <Bar@Example.COM>
+John Doe <foo@example.com>
+John Doe <bar@example.com>
+"Doe, John" <foo@example.com>
+John Doe <Bar@Example.COM>
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
 test_begin_subtest "--output=recipients --filter-by=name"
 notmuch search --output=recipients --filter-by=name "*" >OUTPUT
 cat <<EOF >EXPECTED
-Real Name <foo@example.com>
-Nickname <foo@example.com>
+John Doe <foo@example.com>
+"Doe, John" <foo@example.com>
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
 test_begin_subtest "--output=recipients --filter-by=addr"
 notmuch search --output=recipients --filter-by=addr "*" >OUTPUT
 cat <<EOF >EXPECTED
-Real Name <foo@example.com>
-Real Name <bar@example.com>
-Real Name <Bar@Example.COM>
+John Doe <foo@example.com>
+John Doe <bar@example.com>
+John Doe <Bar@Example.COM>
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
 test_begin_subtest "--output=recipients --filter-by=addrfold"
 notmuch search --output=recipients --filter-by=addrfold "*" >OUTPUT
 cat <<EOF >EXPECTED
-Real Name <foo@example.com>
-Real Name <bar@example.com>
+John Doe <foo@example.com>
+John Doe <bar@example.com>
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
 test_begin_subtest "--output=recipients --filter-by=nameaddrfold"
 notmuch search --output=recipients --filter-by=nameaddrfold "*" >OUTPUT
 cat <<EOF >EXPECTED
-Real Name <foo@example.com>
-Real Name <bar@example.com>
-Nickname <foo@example.com>
+John Doe <foo@example.com>
+John Doe <bar@example.com>
+"Doe, John" <foo@example.com>
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
 test_begin_subtest "--output=recipients --filter-by=nameaddrfold --output=count"
 notmuch search --output=recipients --filter-by=nameaddrfold --output=count "*" | sort -n >OUTPUT
 cat <<EOF >EXPECTED
-1      Real Name <foo@example.com>
-2      Nickname <foo@example.com>
-3      Real Name <bar@example.com>
+1      John Doe <foo@example.com>
+2      "Doe, John" <foo@example.com>
+3      John Doe <bar@example.com>
 EOF
 test_expect_equal_file OUTPUT EXPECTED