Skip to content

Commit ae6ef8c

Browse files
committed
Merge branch '0.5-reflective' of github.com:msgpack/msgpack-cli into 0.5-reflective
2 parents e5830a1 + 54bad3e commit ae6ef8c

5 files changed

Lines changed: 17 additions & 16 deletions

File tree

MsgPack.Xamarin.iOS.sln

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ Global
4747
{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
4848
{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
4949
{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C}.Release|iPhone.ActiveCfg = Release|iPhone
50-
{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C}.Release|iPhone.Build.0 = Release|iPhone
5150
{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
52-
{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
5351
{346B55F0-94FA-4B90-9C11-06031043B685}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
5452
{346B55F0-94FA-4B90-9C11-06031043B685}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
5553
{346B55F0-94FA-4B90-9C11-06031043B685}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
@@ -79,7 +77,6 @@ Global
7977
$1.inheritsSet = null
8078
$1.scope = text/x-csharp
8179
$0.CSharpFormattingPolicy = $2
82-
$2.AlignEmbeddedIfStatements = False
8380
$2.IndentPreprocessorDirectives = False
8481
$2.AnonymousMethodBraceStyle = NextLine
8582
$2.PropertyBraceStyle = NextLine

test/MsgPack.UnitTest/MessagePackObjectTest.Miscs.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,10 @@ public void TestToString_ExtendedTypeObject_AsIs()
122122
[Test]
123123
public void TestToString_AllPossibleTypes_Success()
124124
{
125-
#if MONO
125+
#if MONO || XAMDROID
126126
Assert.Inconclusive( "Mono Regex causes StackOverflow... ");
127127
#endif
128+
try{
128129
TestToStringCore(
129130
MessagePackObject.Nil,
130131
true,
@@ -176,6 +177,9 @@ public void TestToString_AllPossibleTypes_Success()
176177
new MessagePackObject( new MessagePackObjectDictionary( Enumerable.Range( 1, 0xFFFF ).ToDictionary( i => new MessagePackObject( i ), i => new MessagePackObject( i ) ) ) ),
177178
new MessagePackObject( new MessagePackObjectDictionary( Enumerable.Range( 1, 0x10000 ).ToDictionary( i => new MessagePackObject( i ), i => new MessagePackObject( i ) ) ) )
178179
);
180+
}catch(StackOverflowException){
181+
Assert.Fail ("SOF!!");
182+
}
179183
}
180184

181185
private static void TestToStringCore( params MessagePackObject[] targets )

test/MsgPack.UnitTest/MessagePackObjectTest.Strings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void TestAsString1_EncodingIsUtf32_SpecifyNotUtf32_Fail()
9999
[Test]
100100
public void TestAsString1_EncodingIsNotUtf32_SpecifyUtf32_Fail()
101101
{
102-
#if MONO
102+
#if MONO || XAMDROID
103103
Assert.Inconclusive( "UTF32Encoding does not throw exception on Mono FCL." );
104104
#endif
105105
var target = new MessagePackObject( new byte[] { 0xFF } );

test/MsgPack.UnitTest/Serialization/MessagePackSerializerTest.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void TearDown()
4343
}
4444

4545
#pragma warning disable 618
46-
#if !XAMIOS && !UNITY_IPHONE
46+
#if !XAMIOS && !XAMDROID && !UNITY_IPHONE && !UNITY_ANDROID
4747
[Test]
4848
public void TestCreate1_WithoutContext_NewInstance()
4949
{
@@ -64,7 +64,7 @@ public void TestCreate1_WithContext_NewInstance()
6464
Assert.That( second, Is.Not.Null );
6565
Assert.That( first, Is.Not.SameAs( second ) );
6666
}
67-
#endif // !XAMIOS && !UNITY_IPHONE
67+
#endif // !XAMIOS && !XAMDROID && !UNITY_IPHONE && !UNITY_ANDROID
6868

6969

7070
[Test]
@@ -73,7 +73,7 @@ public void TestCreate1_WithContext_Null_Fail()
7373
Assert.Throws<ArgumentNullException>( () => MessagePackSerializer.Create<int>( null ) );
7474
}
7575

76-
#if !XAMIOS && !UNITY_IPHONE
76+
#if !XAMIOS && !XAMDROID && !UNITY_IPHONE && !UNITY_ANDROID
7777
[Test]
7878
public void TestCreate_WithoutContext_NewInstance()
7979
{
@@ -83,7 +83,7 @@ public void TestCreate_WithoutContext_NewInstance()
8383
Assert.That( second, Is.Not.Null );
8484
Assert.That( first, Is.Not.SameAs( second ) );
8585
}
86-
#endif // !XAMIOS && !UNITY_IPHONE
86+
#endif // !XAMIOS && !XAMDROID && !UNITY_IPHONE && !UNITY_ANDROID
8787

8888
[Test]
8989
public void TestCreate_WithoutContext_SameTypeAsCreate1()
@@ -95,7 +95,7 @@ public void TestCreate_WithoutContext_SameTypeAsCreate1()
9595
Assert.That( first.GetType(), Is.EqualTo( second.GetType() ) );
9696
}
9797

98-
#if !XAMIOS && !UNITY_IPHONE
98+
#if !XAMIOS && !XAMDROID && !UNITY_IPHONE && !UNITY_ANDROID
9999
[Test]
100100
public void TestCreate_WithContext_NewInstance()
101101
{
@@ -106,7 +106,7 @@ public void TestCreate_WithContext_NewInstance()
106106
Assert.That( second, Is.Not.Null );
107107
Assert.That( first, Is.Not.SameAs( second ) );
108108
}
109-
#endif // !XAMIOS && !UNITY_IPHONE
109+
#endif // !XAMIOS && !XAMDROID && !UNITY_IPHONE && !UNITY_ANDROID
110110

111111
[Test]
112112
public void TestCreate_WithContext_SameTypeAsCreate1()

test/MsgPack.UnitTest/UnpackingTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public void TestUnpackString_ByteArray_Encoding_1Byte_AsIsAndBounded()
140140
[Test]
141141
public void TestUnpackString_ByteArray_Encoding_1ByteNonSpecifiedString()
142142
{
143-
#if MONO
143+
#if MONO || XAMDROID
144144
Assert.Inconclusive( "UTF32Encoding does not throw exception on Mono FCL." );
145145
#elif !NETFX_CORE
146146
Assert.Throws<MessageTypeException>( () => Unpacking.UnpackString( new byte[] { 0xA4, 0x7F, 0x7F, 0x7F, 0x7F }, new UTF32Encoding( bigEndian: true, byteOrderMark: false, throwOnInvalidCharacters: true ) ) );
@@ -292,7 +292,7 @@ public void TestUnpackString_Stream_Encoding_1Byte_AsIsAndBounded()
292292
[Test]
293293
public void TestUnpackString_Stream_Encoding_1ByteNonSpecifiedString()
294294
{
295-
#if MONO
295+
#if MONO || XAMDROID
296296
Assert.Inconclusive( "UTF32Encoding does not throw exception on Mono FCL." );
297297
#endif
298298

@@ -340,7 +340,7 @@ private static void AssertRawStream( Stream target, int length )
340340
Assert.That( readCountExtra, Is.EqualTo( 0 ) );
341341
}
342342

343-
#if !NETFX_CORE && !SILVERLIGHT
343+
#if !NETFX_CORE && !SILVERLIGHT && !XAMDROID
344344
[Test]
345345
public void TestUnpackByteStream_Stream_LengthIsGreaterThanInt32MaxValue_CanReadToEnd()
346346
{
@@ -379,7 +379,7 @@ public void TestUnpackByteStream_Stream_LengthIsGreaterThanInt32MaxValue_CanRead
379379
File.Delete( filePath );
380380
}
381381
}
382-
#endif
382+
#endif // !NETFX_CORE && !SILVERLIGHT && !XAMDROID
383383

384384
[Test]
385385
public void TestUnpackByteStream_Stream_Empty_AsIsAndBounded()
@@ -584,7 +584,7 @@ public void TestUnpackCharStream_Stream_Encoding_1Byte_AsIsAndBounded()
584584
[Test]
585585
public void TestUnpackCharStream_Stream_Encoding_1ByteNonSpecifiedString_ExceptionInReaderOperation()
586586
{
587-
#if MONO
587+
#if MONO || XAMDROID
588588
Assert.Inconclusive( "UTF32Encoding does not throw exception on Mono FCL." );
589589
#endif
590590
#if !NETFX_CORE

0 commit comments

Comments
 (0)