Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,71 +5,6 @@ namespace Microsoft.VisualStudio.TestTools.UnitTesting;

public sealed partial class Assert
{
private static int GetEscapedCharacterLength(string value, int index)
{
char c = value[index];
return char.IsHighSurrogate(c) && index + 1 < value.Length && char.IsLowSurrogate(value[index + 1])
? 2
: char.IsSurrogate(c)
? 6
: c switch
{
'"' or '\\' or '\n' or '\r' or '\t' or '\0' => 2,
_ when char.IsControl(c) => 6,
_ => 1,
};
}

private static void AppendEscapedToken(StringBuilder builder, string value, StringToken token)
{
for (int i = token.Start; i < token.End; i++)
{
char c = value[i];
switch (c)
{
case '"':
builder.Append("\\\"");
break;
case '\\':
builder.Append("\\\\");
break;
case '\n':
builder.Append("\\n");
break;
case '\r':
builder.Append("\\r");
break;
case '\t':
builder.Append("\\t");
break;
case '\0':
builder.Append("\\0");
break;
default:
if (char.IsControl(c) || IsUnpairedSurrogate(value, i))
{
builder.Append("\\u");
builder.Append(((int)c).ToString("X4", CultureInfo.InvariantCulture));
}
else
{
builder.Append(c);
}

break;
}
}
}

private static bool IsUnpairedSurrogate(string value, int index)
{
char c = value[index];
return char.IsHighSurrogate(c)
? index + 1 >= value.Length || !char.IsLowSurrogate(value[index + 1])
: char.IsLowSurrogate(c)
&& (index == 0 || !char.IsHighSurrogate(value[index - 1]));
}

private static string? CreateCodePointDiagnostic(StringTokenWindow expected, StringTokenWindow actual)
=> NeedsCodePointDiagnostic(expected) || NeedsCodePointDiagnostic(actual)
? $"expected {FormatCodePoints(expected)}; actual {FormatCodePoints(actual)}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using Microsoft.VisualStudio.TestTools.UnitTesting.Internal;

namespace Microsoft.VisualStudio.TestTools.UnitTesting;

public sealed partial class Assert
Expand All @@ -11,7 +13,7 @@ private static int GetRenderedStringLengthUpToBudget(string value)
for (int i = 0; i < value.Length && length <= StringDifferencePreviewBudget; i++)
{
char c = value[i];
length += GetEscapedCharacterLength(value, i);
length += StringEscapeHelper.GetEscapedCharacterLength(value, i);
if (char.IsHighSurrogate(c) && i + 1 < value.Length && char.IsLowSurrogate(value[i + 1]))
{
i++;
Expand Down Expand Up @@ -106,7 +108,7 @@ private static StringPreview CreatePreview(StringTokenWindow window, bool useInl
for (int i = beforeStart; i < window.Before.Length; i++)
{
StringToken token = window.Before[i];
AppendEscapedToken(builder, window.Value, token);
StringEscapeHelper.AppendEscapedString(builder, window.Value, token.Start, token.End, escapeUnpairedSurrogates: true, useExtendedEscapes: false);
isPrefixSafe &= token.IsSafePrefix;
}

Expand All @@ -115,7 +117,8 @@ private static StringPreview CreatePreview(StringTokenWindow window, bool useInl

for (int i = 0; i < afterCount; i++)
{
AppendEscapedToken(builder, window.Value, window.After[i]);
StringToken token = window.After[i];
StringEscapeHelper.AppendEscapedString(builder, window.Value, token.Start, token.End, escapeUnpairedSurrogates: true, useExtendedEscapes: false);
}

if (omittedAfter)
Expand Down Expand Up @@ -187,7 +190,7 @@ private static string RenderMismatch(StringTokenWindow window, bool makeWhitespa
}

StringBuilder builder = new(mismatch.RenderedLength);
AppendEscapedToken(builder, window.Value, mismatch);
StringEscapeHelper.AppendEscapedString(builder, window.Value, mismatch.Start, mismatch.End, escapeUnpairedSurrogates: true, useExtendedEscapes: false);
return builder.ToString();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using Microsoft.VisualStudio.TestTools.UnitTesting.Internal;

namespace Microsoft.VisualStudio.TestTools.UnitTesting;

public sealed partial class Assert
Expand Down Expand Up @@ -79,7 +81,7 @@ private static StringToken CreateStringToken(string value, int start, int length
for (int i = start; i < start + length;)
{
ScalarInfo scalar = GetScalar(value, i);
renderedLength += GetEscapedCharacterLength(value, i);
renderedLength += StringEscapeHelper.GetEscapedCharacterLength(value, i);
isSafePrefix &= scalar.Value <= 0x7F && !scalar.IsUnpairedSurrogate;
hasUnpairedSurrogate |= scalar.IsUnpairedSurrogate;
scalarCount++;
Expand Down
178 changes: 12 additions & 166 deletions src/TestFramework/TestFramework/Assertions/AssertionValueRenderer.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using Microsoft.VisualStudio.TestTools.UnitTesting.Internal;

namespace Microsoft.VisualStudio.TestTools.UnitTesting;

/// <summary>
Expand Down Expand Up @@ -33,125 +35,7 @@ internal static string RenderValue(object? value)
/// Determines whether a rendered string is exactly the representation produced by the built-in renderer.
/// </summary>
internal static bool IsBuiltInStringRendering(string value, string rendered)
{
if (rendered.Length < 2 || rendered[0] != '"' || rendered[rendered.Length - 1] != '"')
{
return false;
}

int renderedIndex = 1;
foreach (char c in value)
{
switch (c)
{
case '"':
if (!TryMatch(rendered, ref renderedIndex, '\\', '"'))
{
return false;
}

break;
case '\\':
if (!TryMatch(rendered, ref renderedIndex, '\\', '\\'))
{
return false;
}

break;
case '\n':
if (!TryMatch(rendered, ref renderedIndex, '\\', 'n'))
{
return false;
}

break;
case '\r':
if (!TryMatch(rendered, ref renderedIndex, '\\', 'r'))
{
return false;
}

break;
case '\t':
if (!TryMatch(rendered, ref renderedIndex, '\\', 't'))
{
return false;
}

break;
case '\0':
if (!TryMatch(rendered, ref renderedIndex, '\\', '0'))
{
return false;
}

break;
default:
if (char.IsControl(c))
{
if (!TryMatchUnicodeEscape(rendered, ref renderedIndex, c))
{
return false;
}
}
else if (!TryMatch(rendered, ref renderedIndex, c))
{
return false;
}

break;
}
}

return renderedIndex == rendered.Length - 1;
}

private static char GetHexDigit(int value)
{
int nibble = value & 0xF;
return (char)(nibble < 10 ? '0' + nibble : 'A' + nibble - 10);
}

private static bool TryMatch(string rendered, ref int renderedIndex, char expected)
{
if (renderedIndex >= rendered.Length - 1 || rendered[renderedIndex] != expected)
{
return false;
}

renderedIndex++;
return true;
}

private static bool TryMatch(string rendered, ref int renderedIndex, char first, char second)
{
if (renderedIndex + 2 > rendered.Length - 1
|| rendered[renderedIndex] != first
|| rendered[renderedIndex + 1] != second)
{
return false;
}

renderedIndex += 2;
return true;
}

private static bool TryMatchUnicodeEscape(string rendered, ref int renderedIndex, char value)
{
if (renderedIndex + 6 > rendered.Length - 1
|| rendered[renderedIndex] != '\\'
|| rendered[renderedIndex + 1] != 'u'
|| rendered[renderedIndex + 2] != GetHexDigit(value >> 12)
|| rendered[renderedIndex + 3] != GetHexDigit(value >> 8)
|| rendered[renderedIndex + 4] != GetHexDigit(value >> 4)
|| rendered[renderedIndex + 5] != GetHexDigit(value))
{
return false;
}

renderedIndex += 6;
return true;
}
=> StringEscapeHelper.IsEscapedString(value, rendered);

private static string RenderBuiltIn(object? value)
=> value switch
Expand Down Expand Up @@ -194,60 +78,22 @@ private static string RenderString(string value)
{
StringBuilder sb = new(value.Length + 2);
sb.Append('"');
foreach (char c in value)
{
switch (c)
{
case '"':
sb.Append("\\\"");
break;
case '\\':
sb.Append("\\\\");
break;
case '\n':
sb.Append("\\n");
break;
case '\r':
sb.Append("\\r");
break;
case '\t':
sb.Append("\\t");
break;
case '\0':
sb.Append("\\0");
break;
default:
if (char.IsControl(c))
{
sb.Append("\\u");
sb.Append(((int)c).ToString("X4", CultureInfo.InvariantCulture));
}
else
{
sb.Append(c);
}

break;
}
}

StringEscapeHelper.AppendEscapedString(sb, value, 0, value.Length, escapeUnpairedSurrogates: false, useExtendedEscapes: false);
sb.Append('"');
return sb.ToString();
}

/// <summary>
/// Renders a char value with single quotes and escape sequences.
/// </summary>
private static string RenderChar(char value) =>
value switch
{
'\n' => "'\\n'",
'\r' => "'\\r'",
'\t' => "'\\t'",
'\0' => "'\\0'",
_ when char.IsControl(value) => $"'\\u{(int)value:X4}'",
_ => $"'{value}'",
};
private static string RenderChar(char value)
{
StringBuilder sb = new(8);
sb.Append('\'');
StringEscapeHelper.AppendEscapedChar(sb, value, useExtendedEscapes: false);
sb.Append('\'');
return sb.ToString();
}

/// <summary>
/// Renders a collection in JSON-style array notation.
Expand Down
Loading
Loading