Skip to content

Commit be5cf53

Browse files
yfakariyayfakariya
committed
Fix (pastly disabled) WinRT unit tests bug.
This commit fixes following bug: * They do not support [NonSerializable], so they never appears in the result. * GetRuntimeXxx (singular) methods never returns non-public members.
1 parent f7744b7 commit be5cf53

13 files changed

+195
-13
lines changed

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// MessagePack for CLI
66
//
7-
// Copyright (C) 2010-2014 FUJIWARA, Yusuke
7+
// Copyright (C) 2010-2015 FUJIWARA, Yusuke
88
//
99
// Licensed under the Apache License, Version 2.0 (the "License");
1010
// you may not use this file except in compliance with the License.
@@ -1103,12 +1103,14 @@ public void TestIssue25_SelfComposite()
11031103
private const string PublicFieldPlain = "PublicFieldPlain";
11041104
private const string PublicReadOnlyFieldPlain = "PublicReadOnlyFieldPlain";
11051105
private const string NonPublicFieldPlain = "NonPublicFieldPlain";
1106+
#if !NETFX_CORE && !SILVERLIGHT
11061107
private const string NonSerializedPublicField = "NonSerializedPublicField";
11071108
private const string NonSerializedPublicReadOnlyField = "NonSerializedPublicReadOnlyField";
11081109
private const string NonSerializedNonPublicField = "NonSerializedNonPublicField";
11091110
private const string NonSerializedPublicFieldPlain = "NonSerializedPublicFieldPlain";
11101111
private const string NonSerializedPublicReadOnlyFieldPlain = "NonSerializedPublicReadOnlyFieldPlain";
11111112
private const string NonSerializedNonPublicFieldPlain = "NonSerializedNonPublicFieldPlain";
1113+
#endif // !NETFX_CORE && !SILVERLIGHT
11121114
// ReSharper restore UnusedMember.Local
11131115

11141116
[Test]
@@ -1124,7 +1126,11 @@ public void TestNonPublicWritableMember_MessagePackMember()
11241126
{
11251127
var target = new AnnotatedClass();
11261128
target.CollectionReadOnlyProperty.Add( 10 );
1129+
#if !NETFX_CORE && !SILVERLIGHT
11271130
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, NonSerializedPublicField, NonSerializedNonPublicField, CollectionReadOnlyProperty );
1131+
#else
1132+
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, CollectionReadOnlyProperty );
1133+
#endif // !NETFX_CORE && !SILVERLIGHT
11281134
}
11291135

11301136
[Test]
@@ -1133,7 +1139,11 @@ public void TestNonPublicWritableMember_DataContract()
11331139
// includes issue33
11341140
var target = new DataMamberClass();
11351141
target.CollectionReadOnlyProperty.Add( 10 );
1142+
#if !NETFX_CORE && !SILVERLIGHT
11361143
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, NonSerializedPublicField, NonSerializedNonPublicField, CollectionReadOnlyProperty );
1144+
#else
1145+
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, CollectionReadOnlyProperty );
1146+
#endif // !NETFX_CORE && !SILVERLIGHT
11371147
}
11381148

11391149
private void TestNonPublicWritableMemberCore<T>( T original, params string[] expectedMemberNames )
@@ -1150,6 +1160,8 @@ private void TestNonPublicWritableMemberCore<T>( T original, params string[] exp
11501160
Func<T, Object> getter = null;
11511161
#if !NETFX_CORE && !SILVERLIGHT
11521162
var property = typeof( T ).GetProperty( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1163+
#elif NETFX_CORE
1164+
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11531165
#else
11541166
var property = typeof( T ).GetProperty( memberName );
11551167
#endif
@@ -1161,6 +1173,8 @@ private void TestNonPublicWritableMemberCore<T>( T original, params string[] exp
11611173
{
11621174
#if !NETFX_CORE && !SILVERLIGHT
11631175
var field = typeof( T ).GetField( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1176+
#elif NETFX_CORE
1177+
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11641178
#else
11651179
var field = typeof( T ).GetField( memberName );
11661180
#endif

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// MessagePack for CLI
66
//
7-
// Copyright (C) 2010-2014 FUJIWARA, Yusuke
7+
// Copyright (C) 2010-2015 FUJIWARA, Yusuke
88
//
99
// Licensed under the Apache License, Version 2.0 (the "License");
1010
// you may not use this file except in compliance with the License.
@@ -1103,12 +1103,14 @@ public void TestIssue25_SelfComposite()
11031103
private const string PublicFieldPlain = "PublicFieldPlain";
11041104
private const string PublicReadOnlyFieldPlain = "PublicReadOnlyFieldPlain";
11051105
private const string NonPublicFieldPlain = "NonPublicFieldPlain";
1106+
#if !NETFX_CORE && !SILVERLIGHT
11061107
private const string NonSerializedPublicField = "NonSerializedPublicField";
11071108
private const string NonSerializedPublicReadOnlyField = "NonSerializedPublicReadOnlyField";
11081109
private const string NonSerializedNonPublicField = "NonSerializedNonPublicField";
11091110
private const string NonSerializedPublicFieldPlain = "NonSerializedPublicFieldPlain";
11101111
private const string NonSerializedPublicReadOnlyFieldPlain = "NonSerializedPublicReadOnlyFieldPlain";
11111112
private const string NonSerializedNonPublicFieldPlain = "NonSerializedNonPublicFieldPlain";
1113+
#endif // !NETFX_CORE && !SILVERLIGHT
11121114
// ReSharper restore UnusedMember.Local
11131115

11141116
[Test]
@@ -1124,7 +1126,11 @@ public void TestNonPublicWritableMember_MessagePackMember()
11241126
{
11251127
var target = new AnnotatedClass();
11261128
target.CollectionReadOnlyProperty.Add( 10 );
1129+
#if !NETFX_CORE && !SILVERLIGHT
11271130
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, NonSerializedPublicField, NonSerializedNonPublicField, CollectionReadOnlyProperty );
1131+
#else
1132+
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, CollectionReadOnlyProperty );
1133+
#endif // !NETFX_CORE && !SILVERLIGHT
11281134
}
11291135

11301136
[Test]
@@ -1133,7 +1139,11 @@ public void TestNonPublicWritableMember_DataContract()
11331139
// includes issue33
11341140
var target = new DataMamberClass();
11351141
target.CollectionReadOnlyProperty.Add( 10 );
1142+
#if !NETFX_CORE && !SILVERLIGHT
11361143
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, NonSerializedPublicField, NonSerializedNonPublicField, CollectionReadOnlyProperty );
1144+
#else
1145+
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, CollectionReadOnlyProperty );
1146+
#endif // !NETFX_CORE && !SILVERLIGHT
11371147
}
11381148

11391149
private void TestNonPublicWritableMemberCore<T>( T original, params string[] expectedMemberNames )
@@ -1150,6 +1160,8 @@ private void TestNonPublicWritableMemberCore<T>( T original, params string[] exp
11501160
Func<T, Object> getter = null;
11511161
#if !NETFX_CORE && !SILVERLIGHT
11521162
var property = typeof( T ).GetProperty( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1163+
#elif NETFX_CORE
1164+
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11531165
#else
11541166
var property = typeof( T ).GetProperty( memberName );
11551167
#endif
@@ -1161,6 +1173,8 @@ private void TestNonPublicWritableMemberCore<T>( T original, params string[] exp
11611173
{
11621174
#if !NETFX_CORE && !SILVERLIGHT
11631175
var field = typeof( T ).GetField( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1176+
#elif NETFX_CORE
1177+
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11641178
#else
11651179
var field = typeof( T ).GetField( memberName );
11661180
#endif

‎test/MsgPack.UnitTest/Serialization/ArrayContextBasedAutoMessagePackSerializerTest.cs‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// MessagePack for CLI
66
//
7-
// Copyright (C) 2010-2014 FUJIWARA, Yusuke
7+
// Copyright (C) 2010-2015 FUJIWARA, Yusuke
88
//
99
// Licensed under the Apache License, Version 2.0 (the "License");
1010
// you may not use this file except in compliance with the License.
@@ -1103,12 +1103,14 @@ public void TestIssue25_SelfComposite()
11031103
private const string PublicFieldPlain = "PublicFieldPlain";
11041104
private const string PublicReadOnlyFieldPlain = "PublicReadOnlyFieldPlain";
11051105
private const string NonPublicFieldPlain = "NonPublicFieldPlain";
1106+
#if !NETFX_CORE && !SILVERLIGHT
11061107
private const string NonSerializedPublicField = "NonSerializedPublicField";
11071108
private const string NonSerializedPublicReadOnlyField = "NonSerializedPublicReadOnlyField";
11081109
private const string NonSerializedNonPublicField = "NonSerializedNonPublicField";
11091110
private const string NonSerializedPublicFieldPlain = "NonSerializedPublicFieldPlain";
11101111
private const string NonSerializedPublicReadOnlyFieldPlain = "NonSerializedPublicReadOnlyFieldPlain";
11111112
private const string NonSerializedNonPublicFieldPlain = "NonSerializedNonPublicFieldPlain";
1113+
#endif // !NETFX_CORE && !SILVERLIGHT
11121114
// ReSharper restore UnusedMember.Local
11131115

11141116
[Test]
@@ -1124,7 +1126,11 @@ public void TestNonPublicWritableMember_MessagePackMember()
11241126
{
11251127
var target = new AnnotatedClass();
11261128
target.CollectionReadOnlyProperty.Add( 10 );
1129+
#if !NETFX_CORE && !SILVERLIGHT
11271130
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, NonSerializedPublicField, NonSerializedNonPublicField, CollectionReadOnlyProperty );
1131+
#else
1132+
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, CollectionReadOnlyProperty );
1133+
#endif // !NETFX_CORE && !SILVERLIGHT
11281134
}
11291135

11301136
[Test]
@@ -1133,7 +1139,11 @@ public void TestNonPublicWritableMember_DataContract()
11331139
// includes issue33
11341140
var target = new DataMamberClass();
11351141
target.CollectionReadOnlyProperty.Add( 10 );
1142+
#if !NETFX_CORE && !SILVERLIGHT
11361143
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, NonSerializedPublicField, NonSerializedNonPublicField, CollectionReadOnlyProperty );
1144+
#else
1145+
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, CollectionReadOnlyProperty );
1146+
#endif // !NETFX_CORE && !SILVERLIGHT
11371147
}
11381148

11391149
private void TestNonPublicWritableMemberCore<T>( T original, params string[] expectedMemberNames )
@@ -1150,6 +1160,8 @@ private void TestNonPublicWritableMemberCore<T>( T original, params string[] exp
11501160
Func<T, Object> getter = null;
11511161
#if !NETFX_CORE && !SILVERLIGHT
11521162
var property = typeof( T ).GetProperty( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1163+
#elif NETFX_CORE
1164+
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11531165
#else
11541166
var property = typeof( T ).GetProperty( memberName );
11551167
#endif
@@ -1161,6 +1173,8 @@ private void TestNonPublicWritableMemberCore<T>( T original, params string[] exp
11611173
{
11621174
#if !NETFX_CORE && !SILVERLIGHT
11631175
var field = typeof( T ).GetField( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1176+
#elif NETFX_CORE
1177+
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11641178
#else
11651179
var field = typeof( T ).GetField( memberName );
11661180
#endif

‎test/MsgPack.UnitTest/Serialization/ArrayExpressionBasedAutoMessagePackSerializerTest.cs‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// MessagePack for CLI
66
//
7-
// Copyright (C) 2010-2014 FUJIWARA, Yusuke
7+
// Copyright (C) 2010-2015 FUJIWARA, Yusuke
88
//
99
// Licensed under the Apache License, Version 2.0 (the "License");
1010
// you may not use this file except in compliance with the License.
@@ -1103,12 +1103,14 @@ public void TestIssue25_SelfComposite()
11031103
private const string PublicFieldPlain = "PublicFieldPlain";
11041104
private const string PublicReadOnlyFieldPlain = "PublicReadOnlyFieldPlain";
11051105
private const string NonPublicFieldPlain = "NonPublicFieldPlain";
1106+
#if !NETFX_CORE && !SILVERLIGHT
11061107
private const string NonSerializedPublicField = "NonSerializedPublicField";
11071108
private const string NonSerializedPublicReadOnlyField = "NonSerializedPublicReadOnlyField";
11081109
private const string NonSerializedNonPublicField = "NonSerializedNonPublicField";
11091110
private const string NonSerializedPublicFieldPlain = "NonSerializedPublicFieldPlain";
11101111
private const string NonSerializedPublicReadOnlyFieldPlain = "NonSerializedPublicReadOnlyFieldPlain";
11111112
private const string NonSerializedNonPublicFieldPlain = "NonSerializedNonPublicFieldPlain";
1113+
#endif // !NETFX_CORE && !SILVERLIGHT
11121114
// ReSharper restore UnusedMember.Local
11131115

11141116
[Test]
@@ -1124,7 +1126,11 @@ public void TestNonPublicWritableMember_MessagePackMember()
11241126
{
11251127
var target = new AnnotatedClass();
11261128
target.CollectionReadOnlyProperty.Add( 10 );
1129+
#if !NETFX_CORE && !SILVERLIGHT
11271130
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, NonSerializedPublicField, NonSerializedNonPublicField, CollectionReadOnlyProperty );
1131+
#else
1132+
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, CollectionReadOnlyProperty );
1133+
#endif // !NETFX_CORE && !SILVERLIGHT
11281134
}
11291135

11301136
[Test]
@@ -1133,7 +1139,11 @@ public void TestNonPublicWritableMember_DataContract()
11331139
// includes issue33
11341140
var target = new DataMamberClass();
11351141
target.CollectionReadOnlyProperty.Add( 10 );
1142+
#if !NETFX_CORE && !SILVERLIGHT
11361143
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, NonSerializedPublicField, NonSerializedNonPublicField, CollectionReadOnlyProperty );
1144+
#else
1145+
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, CollectionReadOnlyProperty );
1146+
#endif // !NETFX_CORE && !SILVERLIGHT
11371147
}
11381148

11391149
private void TestNonPublicWritableMemberCore<T>( T original, params string[] expectedMemberNames )
@@ -1150,6 +1160,8 @@ private void TestNonPublicWritableMemberCore<T>( T original, params string[] exp
11501160
Func<T, Object> getter = null;
11511161
#if !NETFX_CORE && !SILVERLIGHT
11521162
var property = typeof( T ).GetProperty( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1163+
#elif NETFX_CORE
1164+
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11531165
#else
11541166
var property = typeof( T ).GetProperty( memberName );
11551167
#endif
@@ -1161,6 +1173,8 @@ private void TestNonPublicWritableMemberCore<T>( T original, params string[] exp
11611173
{
11621174
#if !NETFX_CORE && !SILVERLIGHT
11631175
var field = typeof( T ).GetField( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1176+
#elif NETFX_CORE
1177+
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11641178
#else
11651179
var field = typeof( T ).GetField( memberName );
11661180
#endif

‎test/MsgPack.UnitTest/Serialization/ArrayFieldBasedAutoMessagePackSerializerTest.cs‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// MessagePack for CLI
66
//
7-
// Copyright (C) 2010-2014 FUJIWARA, Yusuke
7+
// Copyright (C) 2010-2015 FUJIWARA, Yusuke
88
//
99
// Licensed under the Apache License, Version 2.0 (the "License");
1010
// you may not use this file except in compliance with the License.
@@ -1103,12 +1103,14 @@ public void TestIssue25_SelfComposite()
11031103
private const string PublicFieldPlain = "PublicFieldPlain";
11041104
private const string PublicReadOnlyFieldPlain = "PublicReadOnlyFieldPlain";
11051105
private const string NonPublicFieldPlain = "NonPublicFieldPlain";
1106+
#if !NETFX_CORE && !SILVERLIGHT
11061107
private const string NonSerializedPublicField = "NonSerializedPublicField";
11071108
private const string NonSerializedPublicReadOnlyField = "NonSerializedPublicReadOnlyField";
11081109
private const string NonSerializedNonPublicField = "NonSerializedNonPublicField";
11091110
private const string NonSerializedPublicFieldPlain = "NonSerializedPublicFieldPlain";
11101111
private const string NonSerializedPublicReadOnlyFieldPlain = "NonSerializedPublicReadOnlyFieldPlain";
11111112
private const string NonSerializedNonPublicFieldPlain = "NonSerializedNonPublicFieldPlain";
1113+
#endif // !NETFX_CORE && !SILVERLIGHT
11121114
// ReSharper restore UnusedMember.Local
11131115

11141116
[Test]
@@ -1124,7 +1126,11 @@ public void TestNonPublicWritableMember_MessagePackMember()
11241126
{
11251127
var target = new AnnotatedClass();
11261128
target.CollectionReadOnlyProperty.Add( 10 );
1129+
#if !NETFX_CORE && !SILVERLIGHT
11271130
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, NonSerializedPublicField, NonSerializedNonPublicField, CollectionReadOnlyProperty );
1131+
#else
1132+
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, CollectionReadOnlyProperty );
1133+
#endif // !NETFX_CORE && !SILVERLIGHT
11281134
}
11291135

11301136
[Test]
@@ -1133,7 +1139,11 @@ public void TestNonPublicWritableMember_DataContract()
11331139
// includes issue33
11341140
var target = new DataMamberClass();
11351141
target.CollectionReadOnlyProperty.Add( 10 );
1142+
#if !NETFX_CORE && !SILVERLIGHT
11361143
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, NonSerializedPublicField, NonSerializedNonPublicField, CollectionReadOnlyProperty );
1144+
#else
1145+
TestNonPublicWritableMemberCore( target, PublicProperty, NonPublicProperty, PublicField, NonPublicField, CollectionReadOnlyProperty );
1146+
#endif // !NETFX_CORE && !SILVERLIGHT
11371147
}
11381148

11391149
private void TestNonPublicWritableMemberCore<T>( T original, params string[] expectedMemberNames )
@@ -1150,6 +1160,8 @@ private void TestNonPublicWritableMemberCore<T>( T original, params string[] exp
11501160
Func<T, Object> getter = null;
11511161
#if !NETFX_CORE && !SILVERLIGHT
11521162
var property = typeof( T ).GetProperty( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1163+
#elif NETFX_CORE
1164+
var property = typeof( T ).GetRuntimeProperties().SingleOrDefault( p => p.Name == memberName );
11531165
#else
11541166
var property = typeof( T ).GetProperty( memberName );
11551167
#endif
@@ -1161,6 +1173,8 @@ private void TestNonPublicWritableMemberCore<T>( T original, params string[] exp
11611173
{
11621174
#if !NETFX_CORE && !SILVERLIGHT
11631175
var field = typeof( T ).GetField( memberName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
1176+
#elif NETFX_CORE
1177+
var field = typeof( T ).GetRuntimeFields().SingleOrDefault( f => f.Name == memberName );
11641178
#else
11651179
var field = typeof( T ).GetField( memberName );
11661180
#endif

0 commit comments

Comments
 (0)