Skip to content

Commit 4f844ba

Browse files
committed
Fix Windows Phone Silverlight testing failure.
Fixes reflection related issue.
1 parent 6d62928 commit 4f844ba

13 files changed

+63
-117
lines changed

test/MsgPack.UnitTest.CodeDom/Serialization/ArrayCodeDomBasedAutoMessagePackSerializerTest.cs

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,25 +1159,21 @@ private void TestNonPublicWritableMemberCore<T>( T original, params string[] exp
11591159
foreach ( var memberName in expectedMemberNames )
11601160
{
11611161
Func<T, Object> getter = null;
1162-
#if !NETFX_CORE && !SILVERLIGHT
1162+
#if !NETFX_CORE
11631163
var property = typeof( T ).GetProperty( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1164-
#elif NETFX_CORE
1165-
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11661164
#else
1167-
var property = typeof( T ).GetProperty( memberName );
1165+
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11681166
#endif
11691167
if ( property != null )
11701168
{
11711169
getter = obj => property.GetValue( obj, null );
11721170
}
11731171
else
11741172
{
1175-
#if !NETFX_CORE && !SILVERLIGHT
1173+
#if !NETFX_CORE
11761174
var field = typeof( T ).GetField( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1177-
#elif NETFX_CORE
1178-
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11791175
#else
1180-
var field = typeof( T ).GetField( memberName );
1176+
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11811177
#endif
11821178
if ( field == null )
11831179
{
@@ -1417,19 +1413,6 @@ protected internal override IEnumerable<Person> UnpackFromCore( Unpacker unpacke
14171413
}
14181414
}
14191415

1420-
internal class NonPublicWithMessagePackMember
1421-
{
1422-
[MessagePackMember( 0 )]
1423-
public int Value;
1424-
}
1425-
1426-
[DataContract]
1427-
internal class NonPublicWithDataContract
1428-
{
1429-
[DataMember]
1430-
public int Value;
1431-
}
1432-
#pragma warning restore 649
14331416

14341417
// issue #63
14351418
[Test]

test/MsgPack.UnitTest.CodeDom/Serialization/MapCodeDomBasedAutoMessagePackSerializerTest.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,25 +1159,21 @@ private void TestNonPublicWritableMemberCore<T>( T original, params string[] exp
11591159
foreach ( var memberName in expectedMemberNames )
11601160
{
11611161
Func<T, Object> getter = null;
1162-
#if !NETFX_CORE && !SILVERLIGHT
1162+
#if !NETFX_CORE
11631163
var property = typeof( T ).GetProperty( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1164-
#elif NETFX_CORE
1165-
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11661164
#else
1167-
var property = typeof( T ).GetProperty( memberName );
1165+
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11681166
#endif
11691167
if ( property != null )
11701168
{
11711169
getter = obj => property.GetValue( obj, null );
11721170
}
11731171
else
11741172
{
1175-
#if !NETFX_CORE && !SILVERLIGHT
1173+
#if !NETFX_CORE
11761174
var field = typeof( T ).GetField( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1177-
#elif NETFX_CORE
1178-
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11791175
#else
1180-
var field = typeof( T ).GetField( memberName );
1176+
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11811177
#endif
11821178
if ( field == null )
11831179
{
@@ -1417,6 +1413,7 @@ protected internal override IEnumerable<Person> UnpackFromCore( Unpacker unpacke
14171413
}
14181414
}
14191415

1416+
14201417
// issue #63
14211418
[Test]
14221419
public void TestManyMembers()

test/MsgPack.UnitTest/Serialization/ArrayContextBasedAutoMessagePackSerializerTest.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,25 +1159,21 @@ private void TestNonPublicWritableMemberCore<T>( T original, params string[] exp
11591159
foreach ( var memberName in expectedMemberNames )
11601160
{
11611161
Func<T, Object> getter = null;
1162-
#if !NETFX_CORE && !SILVERLIGHT
1162+
#if !NETFX_CORE
11631163
var property = typeof( T ).GetProperty( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1164-
#elif NETFX_CORE
1165-
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11661164
#else
1167-
var property = typeof( T ).GetProperty( memberName );
1165+
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11681166
#endif
11691167
if ( property != null )
11701168
{
11711169
getter = obj => property.GetValue( obj, null );
11721170
}
11731171
else
11741172
{
1175-
#if !NETFX_CORE && !SILVERLIGHT
1173+
#if !NETFX_CORE
11761174
var field = typeof( T ).GetField( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1177-
#elif NETFX_CORE
1178-
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11791175
#else
1180-
var field = typeof( T ).GetField( memberName );
1176+
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11811177
#endif
11821178
if ( field == null )
11831179
{
@@ -1417,6 +1413,7 @@ protected internal override IEnumerable<Person> UnpackFromCore( Unpacker unpacke
14171413
}
14181414
}
14191415

1416+
14201417
// issue #63
14211418
[Test]
14221419
public void TestManyMembers()

test/MsgPack.UnitTest/Serialization/ArrayExpressionBasedAutoMessagePackSerializerTest.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,25 +1159,21 @@ private void TestNonPublicWritableMemberCore<T>( T original, params string[] exp
11591159
foreach ( var memberName in expectedMemberNames )
11601160
{
11611161
Func<T, Object> getter = null;
1162-
#if !NETFX_CORE && !SILVERLIGHT
1162+
#if !NETFX_CORE
11631163
var property = typeof( T ).GetProperty( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1164-
#elif NETFX_CORE
1165-
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11661164
#else
1167-
var property = typeof( T ).GetProperty( memberName );
1165+
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11681166
#endif
11691167
if ( property != null )
11701168
{
11711169
getter = obj => property.GetValue( obj, null );
11721170
}
11731171
else
11741172
{
1175-
#if !NETFX_CORE && !SILVERLIGHT
1173+
#if !NETFX_CORE
11761174
var field = typeof( T ).GetField( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1177-
#elif NETFX_CORE
1178-
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11791175
#else
1180-
var field = typeof( T ).GetField( memberName );
1176+
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11811177
#endif
11821178
if ( field == null )
11831179
{
@@ -1417,6 +1413,7 @@ protected internal override IEnumerable<Person> UnpackFromCore( Unpacker unpacke
14171413
}
14181414
}
14191415

1416+
14201417
// issue #63
14211418
[Test]
14221419
public void TestManyMembers()

test/MsgPack.UnitTest/Serialization/ArrayFieldBasedAutoMessagePackSerializerTest.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,25 +1159,21 @@ private void TestNonPublicWritableMemberCore<T>( T original, params string[] exp
11591159
foreach ( var memberName in expectedMemberNames )
11601160
{
11611161
Func<T, Object> getter = null;
1162-
#if !NETFX_CORE && !SILVERLIGHT
1162+
#if !NETFX_CORE
11631163
var property = typeof( T ).GetProperty( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1164-
#elif NETFX_CORE
1165-
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11661164
#else
1167-
var property = typeof( T ).GetProperty( memberName );
1165+
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11681166
#endif
11691167
if ( property != null )
11701168
{
11711169
getter = obj => property.GetValue( obj, null );
11721170
}
11731171
else
11741172
{
1175-
#if !NETFX_CORE && !SILVERLIGHT
1173+
#if !NETFX_CORE
11761174
var field = typeof( T ).GetField( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1177-
#elif NETFX_CORE
1178-
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11791175
#else
1180-
var field = typeof( T ).GetField( memberName );
1176+
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11811177
#endif
11821178
if ( field == null )
11831179
{
@@ -1417,6 +1413,7 @@ protected internal override IEnumerable<Person> UnpackFromCore( Unpacker unpacke
14171413
}
14181414
}
14191415

1416+
14201417
// issue #63
14211418
[Test]
14221419
public void TestManyMembers()

test/MsgPack.UnitTest/Serialization/ArrayGenerationBasedAutoMessagePackSerializerTest.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -653,25 +653,21 @@ private void TestNonPublicWritableMemberCore<T>( T original, params string[] exp
653653
foreach ( var memberName in expectedMemberNames )
654654
{
655655
Func<T, Object> getter = null;
656-
#if !NETFX_CORE && !SILVERLIGHT
656+
#if !NETFX_CORE
657657
var property = typeof( T ).GetProperty( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
658-
#elif NETFX_CORE
659-
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
660658
#else
661-
var property = typeof( T ).GetProperty( memberName );
659+
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
662660
#endif
663661
if ( property != null )
664662
{
665663
getter = obj => property.GetValue( obj, null );
666664
}
667665
else
668666
{
669-
#if !NETFX_CORE && !SILVERLIGHT
667+
#if !NETFX_CORE
670668
var field = typeof( T ).GetField( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
671-
#elif NETFX_CORE
672-
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
673669
#else
674-
var field = typeof( T ).GetField( memberName );
670+
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
675671
#endif
676672
if ( field == null )
677673
{
@@ -911,6 +907,7 @@ protected internal override IEnumerable<Person> UnpackFromCore( Unpacker unpacke
911907
}
912908
}
913909

910+
914911
// issue #63
915912
[Test]
916913
public void TestManyMembers()

test/MsgPack.UnitTest/Serialization/ArrayReflectionBasedAutoMessagePackSerializerTest.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,25 +1159,21 @@ private void TestNonPublicWritableMemberCore<T>( T original, params string[] exp
11591159
foreach ( var memberName in expectedMemberNames )
11601160
{
11611161
Func<T, Object> getter = null;
1162-
#if !NETFX_CORE && !SILVERLIGHT
1162+
#if !NETFX_CORE
11631163
var property = typeof( T ).GetProperty( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1164-
#elif NETFX_CORE
1165-
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11661164
#else
1167-
var property = typeof( T ).GetProperty( memberName );
1165+
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11681166
#endif
11691167
if ( property != null )
11701168
{
11711169
getter = obj => property.GetValue( obj, null );
11721170
}
11731171
else
11741172
{
1175-
#if !NETFX_CORE && !SILVERLIGHT
1173+
#if !NETFX_CORE
11761174
var field = typeof( T ).GetField( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1177-
#elif NETFX_CORE
1178-
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11791175
#else
1180-
var field = typeof( T ).GetField( memberName );
1176+
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11811177
#endif
11821178
if ( field == null )
11831179
{
@@ -1417,6 +1413,7 @@ protected internal override IEnumerable<Person> UnpackFromCore( Unpacker unpacke
14171413
}
14181414
}
14191415

1416+
14201417
// issue #63
14211418
[Test]
14221419
public void TestManyMembers()

test/MsgPack.UnitTest/Serialization/AutoMessagePackSerializerTest.ttinclude

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,25 +1269,21 @@ namespace MsgPack.Serialization
12691269
foreach ( var memberName in expectedMemberNames )
12701270
{
12711271
Func<T, Object> getter = null;
1272-
#if !NETFX_CORE && !SILVERLIGHT
1272+
#if !NETFX_CORE
12731273
var property = typeof( T ).GetProperty( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1274-
#elif NETFX_CORE
1275-
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
12761274
#else
1277-
var property = typeof( T ).GetProperty( memberName );
1275+
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
12781276
#endif
12791277
if ( property != null )
12801278
{
12811279
getter = obj => property.GetValue( obj, null );
12821280
}
12831281
else
12841282
{
1285-
#if !NETFX_CORE && !SILVERLIGHT
1283+
#if !NETFX_CORE
12861284
var field = typeof( T ).GetField( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1287-
#elif NETFX_CORE
1288-
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
12891285
#else
1290-
var field = typeof( T ).GetField( memberName );
1286+
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
12911287
#endif
12921288
if ( field == null )
12931289
{

test/MsgPack.UnitTest/Serialization/MapContextBasedAutoMessagePackSerializerTest.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,25 +1159,21 @@ private void TestNonPublicWritableMemberCore<T>( T original, params string[] exp
11591159
foreach ( var memberName in expectedMemberNames )
11601160
{
11611161
Func<T, Object> getter = null;
1162-
#if !NETFX_CORE && !SILVERLIGHT
1162+
#if !NETFX_CORE
11631163
var property = typeof( T ).GetProperty( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1164-
#elif NETFX_CORE
1165-
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11661164
#else
1167-
var property = typeof( T ).GetProperty( memberName );
1165+
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11681166
#endif
11691167
if ( property != null )
11701168
{
11711169
getter = obj => property.GetValue( obj, null );
11721170
}
11731171
else
11741172
{
1175-
#if !NETFX_CORE && !SILVERLIGHT
1173+
#if !NETFX_CORE
11761174
var field = typeof( T ).GetField( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1177-
#elif NETFX_CORE
1178-
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11791175
#else
1180-
var field = typeof( T ).GetField( memberName );
1176+
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11811177
#endif
11821178
if ( field == null )
11831179
{
@@ -1417,6 +1413,7 @@ protected internal override IEnumerable<Person> UnpackFromCore( Unpacker unpacke
14171413
}
14181414
}
14191415

1416+
14201417
// issue #63
14211418
[Test]
14221419
public void TestManyMembers()

test/MsgPack.UnitTest/Serialization/MapExpressionBasedAutoMessagePackSerializerTest.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,25 +1159,21 @@ private void TestNonPublicWritableMemberCore<T>( T original, params string[] exp
11591159
foreach ( var memberName in expectedMemberNames )
11601160
{
11611161
Func<T, Object> getter = null;
1162-
#if !NETFX_CORE && !SILVERLIGHT
1162+
#if !NETFX_CORE
11631163
var property = typeof( T ).GetProperty( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1164-
#elif NETFX_CORE
1165-
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11661164
#else
1167-
var property = typeof( T ).GetProperty( memberName );
1165+
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11681166
#endif
11691167
if ( property != null )
11701168
{
11711169
getter = obj => property.GetValue( obj, null );
11721170
}
11731171
else
11741172
{
1175-
#if !NETFX_CORE && !SILVERLIGHT
1173+
#if !NETFX_CORE
11761174
var field = typeof( T ).GetField( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1177-
#elif NETFX_CORE
1178-
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11791175
#else
1180-
var field = typeof( T ).GetField( memberName );
1176+
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11811177
#endif
11821178
if ( field == null )
11831179
{
@@ -1417,6 +1413,7 @@ protected internal override IEnumerable<Person> UnpackFromCore( Unpacker unpacke
14171413
}
14181414
}
14191415

1416+
14201417
// issue #63
14211418
[Test]
14221419
public void TestManyMembers()

0 commit comments

Comments
 (0)