Skip to content

Commit eb06dbb

Browse files
multiarcmultiarc
authored
Upgrade serializer packages (#8)
* Upgrade serializer packages * Windows runner sporadically times out for 1 second async test runs (shared runner?)
1 parent 0410047 commit eb06dbb

14 files changed

+1009
-1071
lines changed

‎SerializerBenchmarks.UnitTests/AsyncBenchmarkTests.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ private static int GetNextPort()
2222
WhiteHolePort = GetNextPort()
2323
};
2424

25-
[Theory(Timeout = 1000)]
25+
[Theory(Timeout = 10000)]
2626
[InlineData(typeof(Ceras<DataItem>))]
2727
[InlineData(typeof(Utf8JsonSerializer<DataItem>))]
2828
[InlineData(typeof(MessagePack<DataItem>))]
@@ -41,7 +41,7 @@ private static int GetNextPort()
4141
[InlineData(typeof(MsgPackCli<DataItem>))]
4242
[InlineData(typeof(SystemTextJson<DataItem>))]
4343
#if (NET6_0_OR_GREATER)
44-
[InlineData(typeof(MemoryPack<DataItem>))]
44+
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
4545
[InlineData(typeof(BinaryPack<DataItem>))]
4646
[InlineData(typeof(SpanJson<DataItem>))]
4747
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]
@@ -56,7 +56,7 @@ public async Task SerializeAsyncTest(Type serializerType)
5656
await _benchmark.SerializeAsync();
5757
}
5858

59-
[Theory(Timeout = 1000)]
59+
[Theory(Timeout = 10000)]
6060
[InlineData(typeof(Ceras<DataItem>))]
6161
[InlineData(typeof(Utf8JsonSerializer<DataItem>))]
6262
[InlineData(typeof(MessagePack<DataItem>))]
@@ -75,7 +75,7 @@ public async Task SerializeAsyncTest(Type serializerType)
7575
[InlineData(typeof(MsgPackCli<DataItem>))]
7676
[InlineData(typeof(SystemTextJson<DataItem>))]
7777
#if (NET6_0_OR_GREATER)
78-
[InlineData(typeof(MemoryPack<DataItem>))]
78+
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
7979
[InlineData(typeof(BinaryPack<DataItem>))]
8080
[InlineData(typeof(SpanJson<DataItem>))]
8181
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]
@@ -91,7 +91,7 @@ public async Task BufferedSerializeAsyncTest(Type serializerType)
9191
await _benchmark.SerializeAsync();
9292
}
9393

94-
[Theory(Timeout = 1000)]
94+
[Theory(Timeout = 10000)]
9595
[InlineData(typeof(Ceras<DataItem>))]
9696
[InlineData(typeof(Utf8JsonSerializer<DataItem>))]
9797
[InlineData(typeof(MessagePack<DataItem>))]
@@ -110,7 +110,7 @@ public async Task BufferedSerializeAsyncTest(Type serializerType)
110110
[InlineData(typeof(MsgPackCli<DataItem>))]
111111
[InlineData(typeof(SystemTextJson<DataItem>))]
112112
#if (NET6_0_OR_GREATER)
113-
[InlineData(typeof(MemoryPack<DataItem>))]
113+
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
114114
[InlineData(typeof(BinaryPack<DataItem>))]
115115
[InlineData(typeof(SpanJson<DataItem>))]
116116
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]
@@ -125,7 +125,7 @@ public async Task DeserializeAsyncTest(Type serializerType)
125125
await _benchmark.DeserializeAsync();
126126
}
127127

128-
[Theory(Timeout = 1000)]
128+
[Theory(Timeout = 10000)]
129129
[InlineData(typeof(Ceras<DataItem>))]
130130
[InlineData(typeof(Utf8JsonSerializer<DataItem>))]
131131
[InlineData(typeof(MessagePack<DataItem>))]
@@ -144,7 +144,7 @@ public async Task DeserializeAsyncTest(Type serializerType)
144144
[InlineData(typeof(MsgPackCli<DataItem>))]
145145
[InlineData(typeof(SystemTextJson<DataItem>))]
146146
#if (NET6_0_OR_GREATER)
147-
[InlineData(typeof(MemoryPack<DataItem>))]
147+
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
148148
[InlineData(typeof(BinaryPack<DataItem>))]
149149
[InlineData(typeof(SpanJson<DataItem>))]
150150
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]

‎SerializerBenchmarks.UnitTests/AsyncSerializerTests.cs‎

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class AsyncSerializerTests
2828
[InlineData(typeof(MsgPackCliDefaultAsync<DataItem>))]
2929
[InlineData(typeof(SystemTextJson<DataItem>))]
3030
#if (NET6_0_OR_GREATER)
31-
[InlineData(typeof(MemoryPack<DataItem>))]
31+
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
3232
[InlineData(typeof(BinaryPack<DataItem>))]
3333
[InlineData(typeof(SpanJson<DataItem>))]
3434
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]
@@ -38,25 +38,15 @@ public class AsyncSerializerTests
3838
#endif
3939
public async Task SerializeAsyncTest(Type serializerType)
4040
{
41-
ISerializerTestAsync serializer;
42-
if (serializerType != typeof(GoogleProtobuf<ProtobufDataItem>))
43-
{
44-
serializer = (ISerializerTestAsync) Activator.CreateInstance(serializerType,
45-
(Func<int, DataItem>) CreateDataExtensions.Data);
46-
}
47-
else
48-
{
49-
serializer = (ISerializerTestAsync) Activator.CreateInstance(serializerType,
50-
(Func<int, ProtobufDataItem>) CreateDataExtensions.ProtobufData);
51-
}
41+
var serializer = serializerType.CreateSerializerInstance();
5242

5343
Assert.NotNull(serializer);
5444
serializer.Setup(1);
5545
var memory = new MemoryStream();
5646
await serializer.SerializeAsync(serializer.TestDataObject, memory);
5747
Assert.NotEqual(0, memory.Length);
5848
}
59-
49+
6050
[Theory]
6151
[InlineData(typeof(Ceras<DataItem>))]
6252
[InlineData(typeof(Utf8JsonSerializer<DataItem>))]
@@ -77,7 +67,7 @@ public async Task SerializeAsyncTest(Type serializerType)
7767
[InlineData(typeof(MsgPackCliDefaultAsync<DataItem>))]
7868
[InlineData(typeof(SystemTextJson<DataItem>))]
7969
#if (NET6_0_OR_GREATER)
80-
[InlineData(typeof(MemoryPack<DataItem>))]
70+
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
8171
[InlineData(typeof(BinaryPack<DataItem>))]
8272
[InlineData(typeof(SpanJson<DataItem>))]
8373
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]
@@ -87,17 +77,7 @@ public async Task SerializeAsyncTest(Type serializerType)
8777
#endif
8878
public async Task DeserializeAsyncTest(Type serializerType)
8979
{
90-
ISerializerTestAsync serializer;
91-
if (serializerType != typeof(GoogleProtobuf<ProtobufDataItem>))
92-
{
93-
serializer = (ISerializerTestAsync) Activator.CreateInstance(serializerType,
94-
(Func<int, DataItem>) CreateDataExtensions.Data);
95-
}
96-
else
97-
{
98-
serializer = (ISerializerTestAsync) Activator.CreateInstance(serializerType,
99-
(Func<int, ProtobufDataItem>) CreateDataExtensions.ProtobufData);
100-
}
80+
var serializer = serializerType.CreateSerializerInstance();
10181

10282
Assert.NotNull(serializer);
10383
serializer.Setup(1);

‎SerializerBenchmarks.UnitTests/BenchmarkTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void SetupTest()
4141
[InlineData(typeof(MsgPackCliDefaultAsync<DataItem>))]
4242
[InlineData(typeof(SystemTextJson<DataItem>))]
4343
#if (NET6_0_OR_GREATER)
44-
[InlineData(typeof(MemoryPack<DataItem>))]
44+
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
4545
[InlineData(typeof(BinaryPack<DataItem>))]
4646
[InlineData(typeof(SpanJson<DataItem>))]
4747
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]
@@ -82,7 +82,7 @@ public void SerializeTest(Type serializerType)
8282
[InlineData(typeof(MsgPackCliDefaultAsync<DataItem>))]
8383
[InlineData(typeof(SystemTextJson<DataItem>))]
8484
#if (NET6_0_OR_GREATER)
85-
[InlineData(typeof(MemoryPack<DataItem>))]
85+
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
8686
[InlineData(typeof(BinaryPack<DataItem>))]
8787
[InlineData(typeof(SpanJson<DataItem>))]
8888
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]

‎SerializerBenchmarks.UnitTests/SerializerBenchmarks.UnitTests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="FluentAssertions" Version="6.12.0" />
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
22-
<PackageReference Include="xunit" Version="2.8.0" />
23-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
22+
<PackageReference Include="xunit" Version="2.9.3" />
23+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
2424
<PrivateAssets>all</PrivateAssets>
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2626
</PackageReference>

‎SerializerBenchmarks.UnitTests/SerializerTests.cs‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class SerializerTests
2828
[InlineData(typeof(MsgPackCliDefaultAsync<DataItem>))]
2929
[InlineData(typeof(SystemTextJson<DataItem>))]
3030
#if (NET6_0_OR_GREATER)
31-
[InlineData(typeof(MemoryPack<DataItem>))]
31+
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
3232
[InlineData(typeof(BinaryPack<DataItem>))]
3333
[InlineData(typeof(SpanJson<DataItem>))]
3434
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]
@@ -38,17 +38,7 @@ public class SerializerTests
3838
#endif
3939
public void SerializeTest(Type serializerType)
4040
{
41-
ISerializerTestAsync serializer;
42-
if (serializerType != typeof(GoogleProtobuf<ProtobufDataItem>))
43-
{
44-
serializer = (ISerializerTestAsync) Activator.CreateInstance(serializerType,
45-
(Func<int, DataItem>) CreateDataExtensions.Data);
46-
}
47-
else
48-
{
49-
serializer = (ISerializerTestAsync) Activator.CreateInstance(serializerType,
50-
(Func<int, ProtobufDataItem>) CreateDataExtensions.ProtobufData);
51-
}
41+
var serializer = serializerType.CreateSerializerInstance();
5242

5343
Assert.NotNull(serializer);
5444
serializer.Setup(1);
@@ -77,7 +67,7 @@ public void SerializeTest(Type serializerType)
7767
[InlineData(typeof(MsgPackCliDefaultAsync<DataItem>))]
7868
[InlineData(typeof(SystemTextJson<DataItem>))]
7969
#if (NET6_0_OR_GREATER)
80-
[InlineData(typeof(MemoryPack<DataItem>))]
70+
[InlineData(typeof(MemoryPack<DataItemMemoryPack>))]
8171
[InlineData(typeof(BinaryPack<DataItem>))]
8272
[InlineData(typeof(SpanJson<DataItem>))]
8373
[InlineData(typeof(SystemTextJsonSourceGen<DataItem>))]
@@ -87,17 +77,7 @@ public void SerializeTest(Type serializerType)
8777
#endif
8878
public void DeserializeTest(Type serializerType)
8979
{
90-
ISerializerTestAsync serializer;
91-
if (serializerType != typeof(GoogleProtobuf<ProtobufDataItem>))
92-
{
93-
serializer = (ISerializerTestAsync) Activator.CreateInstance(serializerType,
94-
(Func<int, DataItem>) CreateDataExtensions.Data);
95-
}
96-
else
97-
{
98-
serializer = (ISerializerTestAsync) Activator.CreateInstance(serializerType,
99-
(Func<int, ProtobufDataItem>) CreateDataExtensions.ProtobufData);
100-
}
80+
var serializer = serializerType.CreateSerializerInstance();
10181

10282
Assert.NotNull(serializer);
10383
serializer.Setup(1);

0 commit comments

Comments
 (0)