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
16 changes: 8 additions & 8 deletions SerializerBenchmarks.UnitTests/AsyncBenchmarkTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ private static int GetNextPort()
WhiteHolePort = GetNextPort()
};

[Theory(Timeout = 1000)]
[Theory(Timeout = 10000)]
[InlineData(typeof(Ceras<DataItem>))]
[InlineData(typeof(Utf8JsonSerializer<DataItem>))]
[InlineData(typeof(MessagePack<DataItem>))]
Expand All @@ -41,7 +41,7 @@ private static int GetNextPort()
[InlineData(typeof(MsgPackCli<DataItem>))]
[InlineData(typeof(SystemTextJson<DataItem>))]
#if (NET6_0_OR_GREATER)
[InlineData(typeof(MemoryPack<DataItem>))]
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
[InlineData(typeof(BinaryPack<DataItem>))]
[InlineData(typeof(SpanJson<DataItem>))]
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]
Expand All @@ -56,7 +56,7 @@ public async Task SerializeAsyncTest(Type serializerType)
await _benchmark.SerializeAsync();
}

[Theory(Timeout = 1000)]
[Theory(Timeout = 10000)]
[InlineData(typeof(Ceras<DataItem>))]
[InlineData(typeof(Utf8JsonSerializer<DataItem>))]
[InlineData(typeof(MessagePack<DataItem>))]
Expand All @@ -75,7 +75,7 @@ public async Task SerializeAsyncTest(Type serializerType)
[InlineData(typeof(MsgPackCli<DataItem>))]
[InlineData(typeof(SystemTextJson<DataItem>))]
#if (NET6_0_OR_GREATER)
[InlineData(typeof(MemoryPack<DataItem>))]
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
[InlineData(typeof(BinaryPack<DataItem>))]
[InlineData(typeof(SpanJson<DataItem>))]
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]
Expand All @@ -91,7 +91,7 @@ public async Task BufferedSerializeAsyncTest(Type serializerType)
await _benchmark.SerializeAsync();
}

[Theory(Timeout = 1000)]
[Theory(Timeout = 10000)]
[InlineData(typeof(Ceras<DataItem>))]
[InlineData(typeof(Utf8JsonSerializer<DataItem>))]
[InlineData(typeof(MessagePack<DataItem>))]
Expand All @@ -110,7 +110,7 @@ public async Task BufferedSerializeAsyncTest(Type serializerType)
[InlineData(typeof(MsgPackCli<DataItem>))]
[InlineData(typeof(SystemTextJson<DataItem>))]
#if (NET6_0_OR_GREATER)
[InlineData(typeof(MemoryPack<DataItem>))]
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
[InlineData(typeof(BinaryPack<DataItem>))]
[InlineData(typeof(SpanJson<DataItem>))]
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]
Expand All @@ -125,7 +125,7 @@ public async Task DeserializeAsyncTest(Type serializerType)
await _benchmark.DeserializeAsync();
}

[Theory(Timeout = 1000)]
[Theory(Timeout = 10000)]
[InlineData(typeof(Ceras<DataItem>))]
[InlineData(typeof(Utf8JsonSerializer<DataItem>))]
[InlineData(typeof(MessagePack<DataItem>))]
Expand All @@ -144,7 +144,7 @@ public async Task DeserializeAsyncTest(Type serializerType)
[InlineData(typeof(MsgPackCli<DataItem>))]
[InlineData(typeof(SystemTextJson<DataItem>))]
#if (NET6_0_OR_GREATER)
[InlineData(typeof(MemoryPack<DataItem>))]
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
[InlineData(typeof(BinaryPack<DataItem>))]
[InlineData(typeof(SpanJson<DataItem>))]
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]
Expand Down
30 changes: 5 additions & 25 deletions SerializerBenchmarks.UnitTests/AsyncSerializerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class AsyncSerializerTests
[InlineData(typeof(MsgPackCliDefaultAsync<DataItem>))]
[InlineData(typeof(SystemTextJson<DataItem>))]
#if (NET6_0_OR_GREATER)
[InlineData(typeof(MemoryPack<DataItem>))]
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
[InlineData(typeof(BinaryPack<DataItem>))]
[InlineData(typeof(SpanJson<DataItem>))]
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]
Expand All @@ -38,25 +38,15 @@ public class AsyncSerializerTests
#endif
public async Task SerializeAsyncTest(Type serializerType)
{
ISerializerTestAsync serializer;
if (serializerType != typeof(GoogleProtobuf<ProtobufDataItem>))
{
serializer = (ISerializerTestAsync) Activator.CreateInstance(serializerType,
(Func<int, DataItem>) CreateDataExtensions.Data);
}
else
{
serializer = (ISerializerTestAsync) Activator.CreateInstance(serializerType,
(Func<int, ProtobufDataItem>) CreateDataExtensions.ProtobufData);
}
var serializer = serializerType.CreateSerializerInstance();

Assert.NotNull(serializer);
serializer.Setup(1);
var memory = new MemoryStream();
await serializer.SerializeAsync(serializer.TestDataObject, memory);
Assert.NotEqual(0, memory.Length);
}

[Theory]
[InlineData(typeof(Ceras<DataItem>))]
[InlineData(typeof(Utf8JsonSerializer<DataItem>))]
Expand All @@ -77,7 +67,7 @@ public async Task SerializeAsyncTest(Type serializerType)
[InlineData(typeof(MsgPackCliDefaultAsync<DataItem>))]
[InlineData(typeof(SystemTextJson<DataItem>))]
#if (NET6_0_OR_GREATER)
[InlineData(typeof(MemoryPack<DataItem>))]
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
[InlineData(typeof(BinaryPack<DataItem>))]
[InlineData(typeof(SpanJson<DataItem>))]
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]
Expand All @@ -87,17 +77,7 @@ public async Task SerializeAsyncTest(Type serializerType)
#endif
public async Task DeserializeAsyncTest(Type serializerType)
{
ISerializerTestAsync serializer;
if (serializerType != typeof(GoogleProtobuf<ProtobufDataItem>))
{
serializer = (ISerializerTestAsync) Activator.CreateInstance(serializerType,
(Func<int, DataItem>) CreateDataExtensions.Data);
}
else
{
serializer = (ISerializerTestAsync) Activator.CreateInstance(serializerType,
(Func<int, ProtobufDataItem>) CreateDataExtensions.ProtobufData);
}
var serializer = serializerType.CreateSerializerInstance();

Assert.NotNull(serializer);
serializer.Setup(1);
Expand Down
4 changes: 2 additions & 2 deletions SerializerBenchmarks.UnitTests/BenchmarkTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void SetupTest()
[InlineData(typeof(MsgPackCliDefaultAsync<DataItem>))]
[InlineData(typeof(SystemTextJson<DataItem>))]
#if (NET6_0_OR_GREATER)
[InlineData(typeof(MemoryPack<DataItem>))]
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
[InlineData(typeof(BinaryPack<DataItem>))]
[InlineData(typeof(SpanJson<DataItem>))]
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]
Expand Down Expand Up @@ -82,7 +82,7 @@ public void SerializeTest(Type serializerType)
[InlineData(typeof(MsgPackCliDefaultAsync<DataItem>))]
[InlineData(typeof(SystemTextJson<DataItem>))]
#if (NET6_0_OR_GREATER)
[InlineData(typeof(MemoryPack<DataItem>))]
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
[InlineData(typeof(BinaryPack<DataItem>))]
[InlineData(typeof(SpanJson<DataItem>))]
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit" Version="2.8.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
28 changes: 4 additions & 24 deletions SerializerBenchmarks.UnitTests/SerializerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class SerializerTests
[InlineData(typeof(MsgPackCliDefaultAsync<DataItem>))]
[InlineData(typeof(SystemTextJson<DataItem>))]
#if (NET6_0_OR_GREATER)
[InlineData(typeof(MemoryPack<DataItem>))]
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
[InlineData(typeof(BinaryPack<DataItem>))]
[InlineData(typeof(SpanJson<DataItem>))]
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]
Expand All @@ -38,17 +38,7 @@ public class SerializerTests
#endif
public void SerializeTest(Type serializerType)
{
ISerializerTestAsync serializer;
if (serializerType != typeof(GoogleProtobuf<ProtobufDataItem>))
{
serializer = (ISerializerTestAsync) Activator.CreateInstance(serializerType,
(Func<int, DataItem>) CreateDataExtensions.Data);
}
else
{
serializer = (ISerializerTestAsync) Activator.CreateInstance(serializerType,
(Func<int, ProtobufDataItem>) CreateDataExtensions.ProtobufData);
}
var serializer = serializerType.CreateSerializerInstance();

Assert.NotNull(serializer);
serializer.Setup(1);
Expand Down Expand Up @@ -77,7 +67,7 @@ public void SerializeTest(Type serializerType)
[InlineData(typeof(MsgPackCliDefaultAsync<DataItem>))]
[InlineData(typeof(SystemTextJson<DataItem>))]
#if (NET6_0_OR_GREATER)
[InlineData(typeof(MemoryPack<DataItem>))]
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
[InlineData(typeof(BinaryPack<DataItem>))]
[InlineData(typeof(SpanJson<DataItem>))]
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]
Expand All @@ -87,17 +77,7 @@ public void SerializeTest(Type serializerType)
#endif
public void DeserializeTest(Type serializerType)
{
ISerializerTestAsync serializer;
if (serializerType != typeof(GoogleProtobuf<ProtobufDataItem>))
{
serializer = (ISerializerTestAsync) Activator.CreateInstance(serializerType,
(Func<int, DataItem>) CreateDataExtensions.Data);
}
else
{
serializer = (ISerializerTestAsync) Activator.CreateInstance(serializerType,
(Func<int, ProtobufDataItem>) CreateDataExtensions.ProtobufData);
}
var serializer = serializerType.CreateSerializerInstance();

Assert.NotNull(serializer);
serializer.Setup(1);
Expand Down
Loading