Skip to content

Commit

Permalink
Merge pull request #1766 from MessagePack-CSharp/dependabot/nuget/dev…
Browse files Browse the repository at this point in the history 
…elop/MsgPack.Cli-1.0.1

Bump MsgPack.Cli from 0.9.0-beta2 to 1.0.1
  • Loading branch information
@AArnott
AArnott committed Mar 31, 2024
2 parents bdb6862 + 9bd9601 commit 03dfded
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 28 deletions.
72 changes: 46 additions & 26 deletions src/MessagePack.UnityClient/Assets/Scripts/Tests/ShareTests/MessagePackBinaryTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ public void NilTest()
writer.Flush();
sequence.Length.Is(1);

packer.PackNull().Position.Is(sequence.Length);
packer.PackNull();
stream.Position.Is(sequence.Length);
stream.ToArray().SequenceEqual(sequence.AsReadOnlySequence.ToArray()).IsTrue();

var sequenceReader = new MessagePackReader(sequence.AsReadOnlySequence);
Expand All @@ -68,7 +69,8 @@ public void BoolTest(bool target, int length)
writer.Flush();
sequence.Length.Is(length);

packer.Pack(target).Position.Is(sequence.Length);
packer.Pack(target);
stream.Position.Is(sequence.Length);
stream.ToArray().SequenceEqual(sequence.AsReadOnlySequence.ToArray()).IsTrue();

var sequenceReader = new MessagePackReader(sequence.AsReadOnlySequence);
Expand All @@ -95,7 +97,8 @@ public void ByteTest(byte target, int length)
writer.Flush();
sequence.Length.Is(length);

packer.Pack(target).Position.Is(sequence.Length);
packer.Pack(target);
stream.Position.Is(sequence.Length);
stream.ToArray().SequenceEqual(sequence.AsReadOnlySequence.ToArray()).IsTrue();

var sequenceReader = new MessagePackReader(sequence.AsReadOnlySequence);
Expand Down Expand Up @@ -126,7 +129,8 @@ public void BytesTest(byte[] target, int length)
writer.Flush();
sequence.Length.Is(length);

packer.PackBinary(target).Position.Is(sequence.Length);
packer.PackBinary(target);
stream.Position.Is(sequence.Length);
stream.ToArray().SequenceEqual(sequence.AsReadOnlySequence.ToArray()).IsTrue();

var sequenceReader = new MessagePackReader(sequence.AsReadOnlySequence);
Expand Down Expand Up @@ -160,7 +164,8 @@ public void SByteTest(sbyte target, int length)
writer.Flush();
sequence.Length.Is(length);

packer.Pack(target).Position.Is(sequence.Length);
packer.Pack(target);
stream.Position.Is(sequence.Length);
stream.ToArray().SequenceEqual(sequence.AsReadOnlySequence.ToArray()).IsTrue();

var sequenceReader = new MessagePackReader(sequence.AsReadOnlySequence);
Expand Down Expand Up @@ -190,7 +195,8 @@ public void SingleTest(Single target, int length)
writer.Flush();
sequence.Length.Is(length);

packer.Pack(target).Position.Is(sequence.Length);
packer.Pack(target);
stream.Position.Is(sequence.Length);
stream.ToArray().SequenceEqual(sequence.AsReadOnlySequence.ToArray()).IsTrue();

var sequenceReader = new MessagePackReader(sequence.AsReadOnlySequence);
Expand Down Expand Up @@ -220,7 +226,8 @@ public void DoubleTest(Double target, int length)
writer.Flush();
sequence.Length.Is(length);

packer.Pack(target).Position.Is(sequence.Length);
packer.Pack(target);
stream.Position.Is(sequence.Length);
stream.ToArray().SequenceEqual(sequence.AsReadOnlySequence.ToArray()).IsTrue();

var sequenceReader = new MessagePackReader(sequence.AsReadOnlySequence);
Expand Down Expand Up @@ -259,7 +266,8 @@ public void Int16Test(short target, int length)

sequence.Length.Is(length);

packer.Pack(target).Position.Is(sequence.Length);
packer.Pack(target);
stream.Position.Is(sequence.Length);
//// stream.ToArray().SequenceEqual(sequence.AsReadOnlySequence.ToArray()).IsTrue();

var sequenceReader = new MessagePackReader(sequence.AsReadOnlySequence);
Expand Down Expand Up @@ -305,15 +313,18 @@ public void Int32Test(int target, int length)
// bug of msgpack-cli
if (target == 255)
{
packer.Pack((byte)255).Position.Is(sequence.Length);
packer.Pack((byte)255);
stream.Position.Is(sequence.Length);
}
else if (target == 50000)
{
packer.Pack((ushort)50000).Position.Is(sequence.Length);
packer.Pack((ushort)50000);
stream.Position.Is(sequence.Length);
}
else
{
packer.Pack(target).Position.Is(sequence.Length);
packer.Pack(target);
stream.Position.Is(sequence.Length);
}

//// stream.ToArray().SequenceEqual(sequence.AsReadOnlySequence.ToArray()).IsTrue();
Expand Down Expand Up @@ -368,19 +379,23 @@ public void Int64Test(long target, int length)
// bug of msgpack-cli
if (target == 255)
{
packer.Pack((byte)255).Position.Is(sequence.Length);
packer.Pack((byte)255);
stream.Position.Is(sequence.Length);
}
else if (target == 50000)
{
packer.Pack((ushort)50000).Position.Is(sequence.Length);
packer.Pack((ushort)50000);
stream.Position.Is(sequence.Length);
}
else if (target == uint.MaxValue)
{
packer.Pack(uint.MaxValue).Position.Is(sequence.Length);
packer.Pack(uint.MaxValue);
stream.Position.Is(sequence.Length);
}
else
{
packer.Pack(target).Position.Is(sequence.Length);
packer.Pack(target);
stream.Position.Is(sequence.Length);
}

//// stream.ToArray().SequenceEqual(sequence.AsReadOnlySequence.ToArray()).IsTrue();
Expand Down Expand Up @@ -417,7 +432,8 @@ public void MapHeaderTest(object targetArg, int length)
writer.Flush();
sequence.Length.Is(length);

packer.PackMapHeader((int)target).Position.Is(sequence.Length);
packer.PackMapHeader((int)target);
stream.Position.Is(sequence.Length);
stream.ToArray().SequenceEqual(sequence.AsReadOnlySequence.ToArray()).IsTrue();

// Expand sequence enough that ReadArrayHeader doesn't throw due to its security check.
Expand Down Expand Up @@ -461,7 +477,8 @@ public void ArrayHeaderTest(object targetArg, int length)
writer.Flush();
sequence.Length.Is(length);

packer.PackArrayHeader((int)target).Position.Is(sequence.Length);
packer.PackArrayHeader((int)target);
stream.Position.Is(sequence.Length);
stream.ToArray().SequenceEqual(sequence.AsReadOnlySequence.ToArray()).IsTrue();

// Expand sequence enough that ReadArrayHeader doesn't throw due to its security check.
Expand Down Expand Up @@ -503,7 +520,8 @@ public void UInt16Test(object targetArg, int length)
writer.Flush();
sequence.Length.Is(length);

packer.Pack(target).Position.Is(sequence.Length);
packer.Pack(target);
stream.Position.Is(sequence.Length);
stream.ToArray().SequenceEqual(sequence.AsReadOnlySequence.ToArray()).IsTrue();

var sequenceReader = new MessagePackReader(sequence.AsReadOnlySequence);
Expand Down Expand Up @@ -539,7 +557,8 @@ public void UInt32Test(object targetArg, int length)
writer.Flush();
sequence.Length.Is(length);

packer.Pack(target).Position.Is(sequence.Length);
packer.Pack(target);
stream.Position.Is(sequence.Length);
stream.ToArray().SequenceEqual(sequence.AsReadOnlySequence.ToArray()).IsTrue();

var sequenceReader = new MessagePackReader(sequence.AsReadOnlySequence);
Expand Down Expand Up @@ -579,7 +598,8 @@ public void UInt64Test(object targetArg, int length)
writer.Flush();
sequence.Length.Is(length);

packer.Pack(target).Position.Is(sequence.Length);
packer.Pack(target);
stream.Position.Is(sequence.Length);
stream.ToArray().SequenceEqual(sequence.AsReadOnlySequence.ToArray()).IsTrue();

var sequenceReader = new MessagePackReader(sequence.AsReadOnlySequence);
Expand Down Expand Up @@ -626,7 +646,7 @@ public void StringTest(string target)
var returnLength = sequence.Length;

MsgPack.Packer referencePacked = packer.PackString(target);
referencePacked.Position.Is(returnLength);
stream.Position.Is(returnLength);
stream.ToArray().SequenceEqual(sequence.AsReadOnlySequence.ToArray()).IsTrue();

var sequenceReader = new MessagePackReader(sequence.AsReadOnlySequence);
Expand All @@ -649,7 +669,7 @@ public void StringSegmentTest(string target)
var returnLength = sequence.Length;

MsgPack.Packer referencePacked = packer.PackString(target);
referencePacked.Position.Is(returnLength);
stream.Position.Is(returnLength);
stream.ToArray().SequenceEqual(sequence.AsReadOnlySequence.ToArray()).IsTrue();

var sequenceReader = new MessagePackReader(sequence.AsReadOnlySequence);
Expand Down Expand Up @@ -679,8 +699,8 @@ public void CharTest(char target)
var returnLength = sequence.Length;

MsgPack.Packer referencePacked = packer.Pack(target);
referencePacked.Position.Is(returnLength);
referencePacked.Position.Is(sequence.Length);
stream.Position.Is(returnLength);
stream.Position.Is(sequence.Length);
stream.ToArray().SequenceEqual(sequence.AsReadOnlySequence.ToArray()).IsTrue();

var sequenceReader = new MessagePackReader(sequence.AsReadOnlySequence);
Expand Down Expand Up @@ -738,8 +758,8 @@ public void ExtTest(object typeCodeArg, byte[] target)
var returnLength = sequence.Length;

MsgPack.Packer referencePacked = packer.PackExtendedTypeValue((byte)typeCode, target);
referencePacked.Position.Is(returnLength);
referencePacked.Position.Is(sequence.Length);
stream.Position.Is(returnLength);
stream.Position.Is(sequence.Length);
stream.ToArray().SequenceEqual(sequence.AsReadOnlySequence.ToArray()).IsTrue();

var sequenceReader = new MessagePackReader(sequence.AsReadOnlySequence);
Expand Down
2 changes: 1 addition & 1 deletion tests/MessagePack.Internal.Tests/MessagePack.Internal.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MsgPack.Cli" VersionOverride="0.9.0-beta2" />
<PackageReference Include="MsgPack.Cli" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
Expand Down
2 changes: 1 addition & 1 deletion tests/MessagePack.Tests/MessagePack.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<Reference Include="Microsoft.CSharp" Condition="'$(TargetFramework)'=='net472'" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MsgPack.Cli" VersionOverride="0.9.0-beta2" />
<PackageReference Include="MsgPack.Cli" />
<PackageReference Include="Nerdbank.Streams" />
<PackageReference Include="ReactiveProperty" />
<PackageReference Include="xunit" />
Expand Down

0 comments on commit 03dfded

Please sign in to comment.