Skip to content

Commit 25689ea

Browse files
committed
Update generated serializers for testing.
1 parent 9825834 commit 25689ea

9 files changed

Lines changed: 16 additions & 14 deletions

test/MsgPack.UnitTest/MsgPack.UnitTest.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,12 @@
252252
<DesignTime>True</DesignTime>
253253
<DependentUpon>EnumSerializationTest.EnumDefinitions.tt</DependentUpon>
254254
</Compile>
255+
<Compile Include="Serialization\GeneratedSerializers\ArrayBased\System_Collections_Generic_Dictionary_2_MsgPack_MessagePackObject_MsgPack_MessagePackObject_Serializer.cs">
256+
<SubType>Code</SubType>
257+
</Compile>
258+
<Compile Include="Serialization\GeneratedSerializers\MapBased\System_Collections_Generic_Dictionary_2_MsgPack_MessagePackObject_MsgPack_MessagePackObject_Serializer.cs">
259+
<SubType>Code</SubType>
260+
</Compile>
255261
<Compile Include="Serialization\PerformanceTest.cs" />
256262
<Compile Include="Serialization\ReflectionBasedNilImplicationTest.cs">
257263
<DependentUpon>ReflectionBasedNilImplicationTest.tt</DependentUpon>
@@ -468,9 +474,6 @@
468474
<Compile Include="Serialization\GeneratedSerializers\ArrayBased\MsgPack_Serialization_WithAbstractStringCollectionSerializer.cs">
469475
<SubType>Code</SubType>
470476
</Compile>
471-
<Compile Include="Serialization\GeneratedSerializers\ArrayBased\System_Collections_Generic_Dictionary_2_MsgPack_MessagePackObject_MsgPack_MessagePackObject_Serializer.cs">
472-
<SubType>Code</SubType>
473-
</Compile>
474477
<Compile Include="Serialization\GeneratedSerializers\ArrayBased\System_Collections_Generic_Dictionary_2_System_Object_System_Object_Serializer.cs">
475478
<SubType>Code</SubType>
476479
</Compile>
@@ -780,9 +783,6 @@
780783
<Compile Include="Serialization\GeneratedSerializers\MapBased\MsgPack_Serialization_WithAbstractStringCollectionSerializer.cs">
781784
<SubType>Code</SubType>
782785
</Compile>
783-
<Compile Include="Serialization\GeneratedSerializers\MapBased\System_Collections_Generic_Dictionary_2_MsgPack_MessagePackObject_MsgPack_MessagePackObject_Serializer.cs">
784-
<SubType>Code</SubType>
785-
</Compile>
786786
<Compile Include="Serialization\GeneratedSerializers\MapBased\System_Collections_Generic_Dictionary_2_System_Object_System_Object_Serializer.cs">
787787
<SubType>Code</SubType>
788788
</Compile>

test/MsgPack.UnitTest/Serialization/GeneratedSerializers/ArrayBased/MsgPack_Serialization_AnnotatedClassSerializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ protected internal override MsgPack.Serialization.AnnotatedClass UnpackFromCore(
419419
}
420420
}
421421
else {
422-
if ((key == "PublicProperty")) {
422+
if ((key == "Alias")) {
423423
System.Nullable<int> nullable7 = default(System.Nullable<int>);
424424
nullable7 = MsgPack.Serialization.UnpackHelpers.UnpackNullableInt32Value(unpacker, typeof(MsgPack.Serialization.AnnotatedClass), "Int32 PublicProperty");
425425
if (nullable7.HasValue) {

test/MsgPack.UnitTest/Serialization/GeneratedSerializers/ArrayBased/MsgPack_Serialization_DataMamberClassSerializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ protected internal override MsgPack.Serialization.DataMamberClass UnpackFromCore
440440
}
441441
}
442442
else {
443-
if ((key == "PublicProperty")) {
443+
if ((key == "Alias")) {
444444
System.Nullable<int> nullable7 = default(System.Nullable<int>);
445445
nullable7 = MsgPack.Serialization.UnpackHelpers.UnpackNullableInt32Value(unpacker, typeof(MsgPack.Serialization.DataMamberClass), "Int32 PublicProperty");
446446
if (nullable7.HasValue) {

test/MsgPack.UnitTest/Serialization/GeneratedSerializers/ArrayBased/System_Collections_Generic_Dictionary_2_MsgPack_MessagePackObject_MsgPack_MessagePackObject_Serializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// このコードはツールによって生成されました。
4-
// ランタイム バージョン:4.0.30319.34011
4+
// ランタイム バージョン:4.0.30319.34014
55
//
66
// このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
77
// コードが再生成されるときに損失したりします。

test/MsgPack.UnitTest/Serialization/GeneratedSerializers/MapBased/MsgPack_Serialization_AnnotatedClassSerializer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ public MsgPack_Serialization_AnnotatedClassSerializer(MsgPack.Serialization.Seri
215215

216216
protected internal override void PackToCore(MsgPack.Packer packer, MsgPack.Serialization.AnnotatedClass objectTree) {
217217
packer.PackMapHeader(7);
218-
this._serializer0.PackTo(packer, "PublicProperty");
218+
this._serializer0.PackTo(packer, "Alias");
219219
this._serializer1.PackTo(packer, objectTree.PublicProperty);
220220
this._serializer0.PackTo(packer, "PublicField");
221221
this._serializer1.PackTo(packer, objectTree.PublicField);
@@ -426,7 +426,7 @@ protected internal override MsgPack.Serialization.AnnotatedClass UnpackFromCore(
426426
}
427427
}
428428
else {
429-
if ((key == "PublicProperty")) {
429+
if ((key == "Alias")) {
430430
System.Nullable<int> nullable7 = default(System.Nullable<int>);
431431
nullable7 = MsgPack.Serialization.UnpackHelpers.UnpackNullableInt32Value(unpacker, typeof(MsgPack.Serialization.AnnotatedClass), "Int32 PublicProperty");
432432
if (nullable7.HasValue) {

test/MsgPack.UnitTest/Serialization/GeneratedSerializers/MapBased/MsgPack_Serialization_DataMamberClassSerializer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ public MsgPack_Serialization_DataMamberClassSerializer(MsgPack.Serialization.Ser
236236

237237
protected internal override void PackToCore(MsgPack.Packer packer, MsgPack.Serialization.DataMamberClass objectTree) {
238238
packer.PackMapHeader(7);
239-
this._serializer0.PackTo(packer, "PublicProperty");
239+
this._serializer0.PackTo(packer, "Alias");
240240
this._serializer1.PackTo(packer, objectTree.PublicProperty);
241241
this._serializer0.PackTo(packer, "PublicField");
242242
this._serializer1.PackTo(packer, objectTree.PublicField);
@@ -447,7 +447,7 @@ protected internal override MsgPack.Serialization.DataMamberClass UnpackFromCore
447447
}
448448
}
449449
else {
450-
if ((key == "PublicProperty")) {
450+
if ((key == "Alias")) {
451451
System.Nullable<int> nullable7 = default(System.Nullable<int>);
452452
nullable7 = MsgPack.Serialization.UnpackHelpers.UnpackNullableInt32Value(unpacker, typeof(MsgPack.Serialization.DataMamberClass), "Int32 PublicProperty");
453453
if (nullable7.HasValue) {

test/MsgPack.UnitTest/Serialization/GeneratedSerializers/MapBased/System_Collections_Generic_Dictionary_2_MsgPack_MessagePackObject_MsgPack_MessagePackObject_Serializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// このコードはツールによって生成されました。
4-
// ランタイム バージョン:4.0.30319.34011
4+
// ランタイム バージョン:4.0.30319.34014
55
//
66
// このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
77
// コードが再生成されるときに損失したりします。

test/MsgPack.UnitTest/Serialization/PreGeneratedSerializerActivator.Types.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ private static IList<Type> InitializeKnownTypes()
8888
result.Add( typeof( ObservableCollection<System.Int32[]> ) );
8989
result.Add( typeof( StringKeyedCollection<System.Int32> ) );
9090
result.Add( typeof( StringKeyedCollection<System.Int32[]> ) );
91+
result.Add( typeof( Dictionary<MessagePackObject, MessagePackObject> ) );
9192
result.Add( typeof( Dictionary<object, object> ) );
9293
result.Add( typeof( Dictionary<String, DateTime> ) );
9394
result.Add( typeof( Dictionary<String, int> ) );

test/MsgPack.UnitTest/Serialization/PreGeneratedSerializerActivator.Types.tt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ namespace MsgPack.Serialization
118118
<#
119119
}
120120
#>
121+
result.Add( typeof( Dictionary<MessagePackObject, MessagePackObject> ) );
121122
result.Add( typeof( Dictionary<object, object> ) );
122123
result.Add( typeof( Dictionary<String, DateTime> ) );
123124
result.Add( typeof( Dictionary<String, int> ) );

0 commit comments

Comments
 (0)