Skip to content

fixed issue 36752 mail address display name #37874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Aug 28, 2020
Merged

fixed issue 36752 mail address display name #37874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
aa1be52
fixed issue 36752 mail address displayname
jaymin93 Jun 14, 2020
1064352
added unit test for the double qoutes
jaymin93 Jun 25, 2020
2c40297
updated order of assert equal
jaymin93 Jun 25, 2020
6a19647
space removed as per suggestion
jaymin93 Jul 9, 2020
8ec7528
added more test cases , removed _ from mailaddress
jaymin93 Aug 1, 2020
6a84ddd
inline tests
jaymin93 Aug 6, 2020
221e6c5
spited test and added conditions to match empty display name
jaymin93 Aug 7, 2020
2d8530a
Update src/libraries/System.Net.Mail/tests/Unit/MailAddressTests/Mail…
jaymin93 Aug 12, 2020
ec8331a
Update src/libraries/System.Net.Mail/tests/Unit/MailAddressTests/Mail…
jaymin93 Aug 12, 2020
a49ad0b
suggested changes for name change and space removed
jaymin93 Aug 12, 2020
afc3e74
Merge branch 'master' of https://github.com/jaymin93/runtime
jaymin93 Aug 12, 2020
efdfd64
removed if condition
jaymin93 Aug 12, 2020
e6b2664
moved sub string to after ctor
jaymin93 Aug 12, 2020
cfe0575
Update src/libraries/System.Net.Mail/tests/Unit/MailAddressTests/Mail…
jaymin93 Aug 25, 2020
5e088a2
Update src/libraries/System.Net.Mail/tests/Unit/MailAddressTests/Mail…
jaymin93 Aug 25, 2020
8917106
Update src/libraries/System.Net.Mail/tests/Unit/MailAddressTests/Mail…
jaymin93 Aug 25, 2020
c11bfa8
added more test case as suggested
jaymin93 Aug 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Mail/src/System/Net/Mail/MailAddress.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public override string ToString()
}
else
{
return "\"" + DisplayName + "\" " + SmtpAddress;
return "\"" + DisplayName.Replace("\"", "\\\"") + "\" " + SmtpAddress;
}
}

Expand Down
37 changes: 37 additions & 0 deletions src/libraries/System.Net.Mail/tests/Unit/MailAddressTests/MailAddressDisplayNameTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,43 @@ public void MailAddress_WithUnicodeDisplayAndMailAddress_ToStringShouldReturnDis
Assert.Equal(string.Format("\"{0}\" <{1}>", DisplayNameWithUnicode, Address), _mailAddress.ToString());
}

[Theory]
[InlineData(Address, "test\"Display\"Name")]
[InlineData(Address, "Hello \"world hello\" world")]
[InlineData(Address, "Hello \"world")]
[InlineData(Address, "Hello \"\"world")]
[InlineData(Address, "\"")]
[InlineData(Address, "Hello \\\"world hello\\\" world")]
public void MailAddress_WithDoubleQuotesDisplayAndMailAddress_ToStringShouldReturnEscapedDisplayNameAndAddressInAngleBrackets(string address, string displayName)
{
MailAddress mailAddress = new MailAddress(address, displayName);
Assert.Equal(displayName, mailAddress.DisplayName);
Assert.Equal(string.Format("\"{0}\" <{1}>", displayName.Replace("\"", "\\\""), address), mailAddress.ToString());
}

[Theory]
[InlineData(Address, "\"John Doe\"")]
[InlineData(Address, "\"\"")]
[InlineData(Address, "\"\"\"")]
[InlineData(Address, "\"John \"Johnny\" Doe\"")]
public void MailAddress_WithOuterDoubleQuotesDisplayAndMailAddress_ToStringShouldReturnEscapedDisplayNameAndAddressInAngleBrackets(string address, string displayName)
{
MailAddress mailAddress = new MailAddress(address, displayName);
displayName = displayName.Substring(1, displayName.Length - 2);

Assert.Equal(displayName, mailAddress.DisplayName);

if (string.IsNullOrEmpty(displayName))
{
Assert.Equal($"{address}", mailAddress.ToString());
}
else
{
Assert.Equal($"\"{displayName.Replace("\"", "\\\"")}\" <{address}>", mailAddress.ToString());
}
}


[Fact]
public void MailAddress_WithNoDisplayName_AndOnlyAddress_ToStringShouldOutputAddressOnlyWithNoAngleBrackets()
{
Expand Down