Skip to content

Big-endian test case fixes: System.Runtime #49691

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 1 commit into from
Mar 16, 2021
Merged

Big-endian test case fixes: System.Runtime #49691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 30 additions & 0 deletions src/libraries/System.Runtime.Extensions/tests/System/BitConverterArray.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,108 +7,138 @@ namespace System.Tests
{
public class BitConverterArray : BitConverterBase
{
private byte[] RangeToLittleEndian(byte[] array, int index, int length)
{
if (!BitConverter.IsLittleEndian)
{
array = (byte[]) array.Clone();
Array.Reverse(array, index, length);
}
return array;
}

public override void ConvertFromBool(bool boolean, byte[] expected)
{
Assert.Equal(expected, BitConverter.GetBytes(boolean));
}

public override void ConvertFromShort(short num, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 2);
Assert.Equal(expected, BitConverter.GetBytes(num));
}

public override void ConvertFromChar(char character, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 2);
Assert.Equal(expected, BitConverter.GetBytes(character));
}

public override void ConvertFromInt(int num, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 4);
Assert.Equal(expected, BitConverter.GetBytes(num));
}

public override void ConvertFromLong(long num, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 8);
Assert.Equal(expected, BitConverter.GetBytes(num));
}

public override void ConvertFromUShort(ushort num, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 2);
Assert.Equal(expected, BitConverter.GetBytes(num));
}

public override void ConvertFromUInt(uint num, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 4);
Assert.Equal(expected, BitConverter.GetBytes(num));
}

public override void ConvertFromULong(ulong num, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 8);
Assert.Equal(expected, BitConverter.GetBytes(num));
}

public override void ConvertFromHalf(Half num, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 2);
Assert.Equal(expected, BitConverter.GetBytes(num));
}

public override void ConvertFromFloat(float num, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 4);
Assert.Equal(expected, BitConverter.GetBytes(num));
}

public override void ConvertFromDouble(double num, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 8);
Assert.Equal(expected, BitConverter.GetBytes(num));
}

public override void ToChar(int index, char expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, index, 2);
Assert.Equal(expected, BitConverter.ToChar(byteArray, index));
}

public override void ToInt16(int index, short expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, index, 2);
Assert.Equal(expected, BitConverter.ToInt16(byteArray, index));
}

public override void ToInt32(int expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, 0, 4);
Assert.Equal(expected, BitConverter.ToInt32(byteArray, 0));
}

public override void ToInt64(int index, long expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, index, 8);
Assert.Equal(expected, BitConverter.ToInt64(byteArray, index));
}

public override void ToUInt16(int index, ushort expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, index, 2);
Assert.Equal(expected, BitConverter.ToUInt16(byteArray, index));
}

public override void ToUInt32(int index, uint expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, index, 4);
Assert.Equal(expected, BitConverter.ToUInt32(byteArray, index));
}

public override void ToUInt64(int index, ulong expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, index, 8);
Assert.Equal(expected, BitConverter.ToUInt64(byteArray, index));
}

public override void ToHalf(int index, Half expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, index, 2);
Assert.Equal(expected, BitConverter.ToHalf(byteArray, index));
}

public override void ToSingle(int index, float expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, index, 4);
Assert.Equal(expected, BitConverter.ToSingle(byteArray, index));
}

public override void ToDouble(int index, double expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, index, 8);
Assert.Equal(expected, BitConverter.ToDouble(byteArray, index));
}

Expand Down
30 changes: 30 additions & 0 deletions src/libraries/System.Runtime.Extensions/tests/System/BitConverterSpan.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,16 @@ public void ToMethods_DestinationSpanNotLargeEnough()
Assert.Throws<ArgumentOutOfRangeException>(() => { BitConverter.ToBoolean(Span<byte>.Empty); });
}

private byte[] RangeToLittleEndian(byte[] array, int index, int length)
{
if (!BitConverter.IsLittleEndian)
{
array = (byte[]) array.Clone();
Array.Reverse(array, index, length);
}
return array;
}

public override void ConvertFromBool(bool boolean, byte[] expected)
{
Span<byte> span = new Span<byte>(new byte[1]);
Expand All @@ -46,131 +56,151 @@ public override void ConvertFromBool(bool boolean, byte[] expected)

public override void ConvertFromShort(short num, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 2);
Span<byte> span = new Span<byte>(new byte[2]);
Assert.True(BitConverter.TryWriteBytes(span, num));
Assert.Equal(expected, span.ToArray());
}

public override void ConvertFromChar(char character, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 2);
Span<byte> span = new Span<byte>(new byte[2]);
Assert.True(BitConverter.TryWriteBytes(span, character));
Assert.Equal(expected, span.ToArray());
}

public override void ConvertFromInt(int num, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 4);
Span<byte> span = new Span<byte>(new byte[4]);
Assert.True(BitConverter.TryWriteBytes(span, num));
Assert.Equal(expected, span.ToArray());
}

public override void ConvertFromLong(long num, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 8);
Span<byte> span = new Span<byte>(new byte[8]);
Assert.True(BitConverter.TryWriteBytes(span, num));
Assert.Equal(expected, span.ToArray());
}

public override void ConvertFromUShort(ushort num, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 2);
Span<byte> span = new Span<byte>(new byte[2]);
Assert.True(BitConverter.TryWriteBytes(span, num));
Assert.Equal(expected, span.ToArray());
}

public override void ConvertFromUInt(uint num, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 4);
Span<byte> span = new Span<byte>(new byte[4]);
Assert.True(BitConverter.TryWriteBytes(span, num));
Assert.Equal(expected, span.ToArray());
}

public override void ConvertFromULong(ulong num, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 8);
Span<byte> span = new Span<byte>(new byte[8]);
Assert.True(BitConverter.TryWriteBytes(span, num));
Assert.Equal(expected, span.ToArray());
}

public override void ConvertFromHalf(Half num, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 2);
Span<byte> span = new Span<byte>(new byte[2]);
Assert.True(BitConverter.TryWriteBytes(span, num));
Assert.Equal(expected, span.ToArray());
}

public override void ConvertFromFloat(float num, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 4);
Span<byte> span = new Span<byte>(new byte[4]);
Assert.True(BitConverter.TryWriteBytes(span, num));
Assert.Equal(expected, span.ToArray());
}

public override void ConvertFromDouble(double num, byte[] expected)
{
expected = RangeToLittleEndian(expected, 0, 8);
Span<byte> span = new Span<byte>(new byte[8]);
Assert.True(BitConverter.TryWriteBytes(span, num));
Assert.Equal(expected, span.ToArray());
}

public override void ToChar(int index, char expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, index, 2);
ReadOnlySpan<byte> span = new ReadOnlySpan<byte>(byteArray);
BitConverter.ToChar(span);
Assert.Equal(expected, BitConverter.ToChar(span.Slice(index)));
}

public override void ToInt16(int index, short expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, index, 2);
ReadOnlySpan<byte> span = new ReadOnlySpan<byte>(byteArray);
Assert.Equal(expected, BitConverter.ToInt16(span.Slice(index)));
}

public override void ToInt32(int expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, 0, 4);
ReadOnlySpan<byte> span = new ReadOnlySpan<byte>(byteArray);
Assert.Equal(expected, BitConverter.ToInt32(byteArray));
}

public override void ToInt64(int index, long expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, index, 8);
ReadOnlySpan<byte> span = new ReadOnlySpan<byte>(byteArray);
Assert.Equal(expected, BitConverter.ToInt64(span.Slice(index)));
}

public override void ToUInt16(int index, ushort expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, index, 2);
ReadOnlySpan<byte> span = new ReadOnlySpan<byte>(byteArray);
Assert.Equal(expected, BitConverter.ToUInt16(span.Slice(index)));
}

public override void ToUInt32(int index, uint expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, index, 4);
ReadOnlySpan<byte> span = new ReadOnlySpan<byte>(byteArray);
Assert.Equal(expected, BitConverter.ToUInt32(span.Slice(index)));
}

public override void ToUInt64(int index, ulong expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, index, 8);
ReadOnlySpan<byte> span = new ReadOnlySpan<byte>(byteArray);
Assert.Equal(expected, BitConverter.ToUInt64(span.Slice(index)));
}

public override void ToHalf(int index, Half expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, index, 2);
ReadOnlySpan<byte> span = new ReadOnlySpan<byte>(byteArray);
Assert.Equal(expected, BitConverter.ToHalf(span.Slice(index)));
}

public override void ToSingle(int index, float expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, index, 4);
ReadOnlySpan<byte> span = new ReadOnlySpan<byte>(byteArray);
Assert.Equal(expected, BitConverter.ToSingle(span.Slice(index)));
}

public override void ToDouble(int index, double expected, byte[] byteArray)
{
byteArray = RangeToLittleEndian(byteArray, index, 8);
ReadOnlySpan<byte> span = new ReadOnlySpan<byte>(byteArray);
Assert.Equal(expected, BitConverter.ToDouble(span.Slice(index)));
}
Expand Down
8 changes: 8 additions & 0 deletions src/libraries/System.Runtime/tests/System/BufferTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ public static void ByteLength_Invalid()
[InlineData(new uint[] { 0x01234567, 0x89abcdef }, 7, 0x89)]
public static void GetByte(Array array, int index, int expected)
{
if (!BitConverter.IsLittleEndian)
{
index = index ^ 3;
}
Assert.Equal(expected, Buffer.GetByte(array, index));
}

Expand Down Expand Up @@ -211,6 +215,10 @@ public static unsafe void MemoryCopy_Invalid()
[InlineData(new uint[] { 0x01234542, 0x89abcdef }, 7, 0xa2, new uint[] { 0x01234542, 0xa2abcdef })]
public static void SetByte(Array array, int index, byte value, Array expected)
{
if (!BitConverter.IsLittleEndian)
{
index = index ^ 3;
}
Buffer.SetByte(array, index, value);
Assert.Equal(expected, array);
}
Expand Down