Skip to content
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

Encoding serialization #64625

Merged
merged 12 commits into from
Oct 19, 2022
Merged

Encoding serialization #64625

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5383691
Rename ObjectWriter.EncodingKind to avoid confusing with Encoding
tmat Oct 10, 2022
087e03f
Factor out TextEncodingKind
tmat Oct 10, 2022
0dceb49
Implement message-pack formatter for Encoding type
tmat Oct 11, 2022
bb1bd8b
Simplify
tmat Oct 11, 2022
5768169
Fix
tmat Oct 11, 2022
5bb23fc
Feedback
tmat Oct 11, 2022
22f43d1
Remove file
tmat Oct 11, 2022
986e605
Feedback
tmat Oct 14, 2022
6b2c20c
Fix
tmat Oct 14, 2022
1b24296
More tests and encoding serialization fix
tmat Oct 16, 2022
4764db6
Fixes
tmat Oct 17, 2022
63f6e10
Fix
tmat Oct 18, 2022
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
95 changes: 30 additions & 65 deletions src/Compilers/Core/CodeAnalysisTest/ObjectSerializationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using System.IO;
using System.Linq;
using System.Text;
using Microsoft.CodeAnalysis.Test.Utilities;
using Roslyn.Utilities;
using Xunit;

Expand Down Expand Up @@ -395,33 +396,33 @@ public void TestEnumMember()
}

[Fact]
public void TestInt32EncodingKinds()
public void TestInt32TypeCodes()
{
Assert.Equal(ObjectWriter.EncodingKind.Int32_1, ObjectWriter.EncodingKind.Int32_0 + 1);
Assert.Equal(ObjectWriter.EncodingKind.Int32_2, ObjectWriter.EncodingKind.Int32_0 + 2);
Assert.Equal(ObjectWriter.EncodingKind.Int32_3, ObjectWriter.EncodingKind.Int32_0 + 3);
Assert.Equal(ObjectWriter.EncodingKind.Int32_4, ObjectWriter.EncodingKind.Int32_0 + 4);
Assert.Equal(ObjectWriter.EncodingKind.Int32_5, ObjectWriter.EncodingKind.Int32_0 + 5);
Assert.Equal(ObjectWriter.EncodingKind.Int32_6, ObjectWriter.EncodingKind.Int32_0 + 6);
Assert.Equal(ObjectWriter.EncodingKind.Int32_7, ObjectWriter.EncodingKind.Int32_0 + 7);
Assert.Equal(ObjectWriter.EncodingKind.Int32_8, ObjectWriter.EncodingKind.Int32_0 + 8);
Assert.Equal(ObjectWriter.EncodingKind.Int32_9, ObjectWriter.EncodingKind.Int32_0 + 9);
Assert.Equal(ObjectWriter.EncodingKind.Int32_10, ObjectWriter.EncodingKind.Int32_0 + 10);
Assert.Equal(ObjectWriter.TypeCode.Int32_1, ObjectWriter.TypeCode.Int32_0 + 1);
Assert.Equal(ObjectWriter.TypeCode.Int32_2, ObjectWriter.TypeCode.Int32_0 + 2);
Assert.Equal(ObjectWriter.TypeCode.Int32_3, ObjectWriter.TypeCode.Int32_0 + 3);
Assert.Equal(ObjectWriter.TypeCode.Int32_4, ObjectWriter.TypeCode.Int32_0 + 4);
Assert.Equal(ObjectWriter.TypeCode.Int32_5, ObjectWriter.TypeCode.Int32_0 + 5);
Assert.Equal(ObjectWriter.TypeCode.Int32_6, ObjectWriter.TypeCode.Int32_0 + 6);
Assert.Equal(ObjectWriter.TypeCode.Int32_7, ObjectWriter.TypeCode.Int32_0 + 7);
Assert.Equal(ObjectWriter.TypeCode.Int32_8, ObjectWriter.TypeCode.Int32_0 + 8);
Assert.Equal(ObjectWriter.TypeCode.Int32_9, ObjectWriter.TypeCode.Int32_0 + 9);
Assert.Equal(ObjectWriter.TypeCode.Int32_10, ObjectWriter.TypeCode.Int32_0 + 10);
}

[Fact]
public void TestUInt32EncodingKinds()
public void TestUInt32TypeCodes()
{
Assert.Equal(ObjectWriter.EncodingKind.UInt32_1, ObjectWriter.EncodingKind.UInt32_0 + 1);
Assert.Equal(ObjectWriter.EncodingKind.UInt32_2, ObjectWriter.EncodingKind.UInt32_0 + 2);
Assert.Equal(ObjectWriter.EncodingKind.UInt32_3, ObjectWriter.EncodingKind.UInt32_0 + 3);
Assert.Equal(ObjectWriter.EncodingKind.UInt32_4, ObjectWriter.EncodingKind.UInt32_0 + 4);
Assert.Equal(ObjectWriter.EncodingKind.UInt32_5, ObjectWriter.EncodingKind.UInt32_0 + 5);
Assert.Equal(ObjectWriter.EncodingKind.UInt32_6, ObjectWriter.EncodingKind.UInt32_0 + 6);
Assert.Equal(ObjectWriter.EncodingKind.UInt32_7, ObjectWriter.EncodingKind.UInt32_0 + 7);
Assert.Equal(ObjectWriter.EncodingKind.UInt32_8, ObjectWriter.EncodingKind.UInt32_0 + 8);
Assert.Equal(ObjectWriter.EncodingKind.UInt32_9, ObjectWriter.EncodingKind.UInt32_0 + 9);
Assert.Equal(ObjectWriter.EncodingKind.UInt32_10, ObjectWriter.EncodingKind.UInt32_0 + 10);
Assert.Equal(ObjectWriter.TypeCode.UInt32_1, ObjectWriter.TypeCode.UInt32_0 + 1);
Assert.Equal(ObjectWriter.TypeCode.UInt32_2, ObjectWriter.TypeCode.UInt32_0 + 2);
Assert.Equal(ObjectWriter.TypeCode.UInt32_3, ObjectWriter.TypeCode.UInt32_0 + 3);
Assert.Equal(ObjectWriter.TypeCode.UInt32_4, ObjectWriter.TypeCode.UInt32_0 + 4);
Assert.Equal(ObjectWriter.TypeCode.UInt32_5, ObjectWriter.TypeCode.UInt32_0 + 5);
Assert.Equal(ObjectWriter.TypeCode.UInt32_6, ObjectWriter.TypeCode.UInt32_0 + 6);
Assert.Equal(ObjectWriter.TypeCode.UInt32_7, ObjectWriter.TypeCode.UInt32_0 + 7);
Assert.Equal(ObjectWriter.TypeCode.UInt32_8, ObjectWriter.TypeCode.UInt32_0 + 8);
Assert.Equal(ObjectWriter.TypeCode.UInt32_9, ObjectWriter.TypeCode.UInt32_0 + 9);
Assert.Equal(ObjectWriter.TypeCode.UInt32_10, ObjectWriter.TypeCode.UInt32_0 + 10);
}

private void TestRoundTripType(Type type)
Expand Down Expand Up @@ -1138,62 +1139,26 @@ private void TestRoundTripArray<T>(T[] values)
TestRoundTripValue(values);
}

[Theory]
[CombinatorialData]
public void Encoding_Utf8(bool byteOrderMark)
{
TestRoundtripEncoding(new UTF8Encoding(byteOrderMark));
}

[Theory]
[CombinatorialData]
public void Encoding_UTF32(bool bigEndian, bool byteOrderMark)
{
TestRoundtripEncoding(new UTF32Encoding(bigEndian, byteOrderMark));
}
public static IEnumerable<Encoding[]> GetEncodingTestCases()
=> EncodingTestHelpers.GetEncodingTestCases();

[Theory]
[CombinatorialData]
public void Encoding_Unicode(bool bigEndian, bool byteOrderMark)
{
TestRoundtripEncoding(new UnicodeEncoding(bigEndian, byteOrderMark));
}

[Fact]
public void Encoding_AllAvailable()
{
foreach (var info in Encoding.GetEncodings())
{
TestRoundtripEncoding(Encoding.GetEncoding(info.Name));
}
}

private static void TestRoundtripEncoding(Encoding encoding)
[MemberData(nameof(GetEncodingTestCases))]
public void Encodings(Encoding original)
{
using var stream = new MemoryStream();

using (var writer = new ObjectWriter(stream, leaveOpen: true))
{
writer.WriteEncoding(encoding);
writer.WriteEncoding(original);
}

stream.Position = 0;

using var reader = ObjectReader.TryGetReader(stream);
Assert.NotNull(reader);
var actualEncoding = (Encoding)((Encoding)reader.ReadValue()).Clone();
var expectedEncoding = (Encoding)encoding.Clone();

// set the fallbacks to the same instance so that equality comparison does not take them into account:
actualEncoding.EncoderFallback = EncoderFallback.ExceptionFallback;
actualEncoding.DecoderFallback = DecoderFallback.ExceptionFallback;
expectedEncoding.EncoderFallback = EncoderFallback.ExceptionFallback;
expectedEncoding.DecoderFallback = DecoderFallback.ExceptionFallback;

Assert.Equal(expectedEncoding.GetPreamble(), actualEncoding.GetPreamble());
Assert.Equal(expectedEncoding.CodePage, actualEncoding.CodePage);
Assert.Equal(expectedEncoding.WebName, actualEncoding.WebName);
Assert.Equal(expectedEncoding, actualEncoding);
var deserialized = (Encoding)reader.ReadValue();
EncodingTestHelpers.AssertEncodingsEqual(original, deserialized);
}

[Fact]
Expand Down
4 changes: 2 additions & 2 deletions src/Compilers/Core/Portable/InternalUtilities/EncodingExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
using System.IO;
using System.Text;

namespace Roslyn.Utilities
namespace Microsoft.CodeAnalysis
{
internal static class EncodingExtensions
internal static partial class EncodingExtensions
{
/// <summary>
/// Get maximum char count needed to decode the entire stream.
Expand Down
Loading