Merge branch '0.5-reflective' of github.com:msgpack/msgpack-cli into 0.5-reflective

yfakariya · yfakariya · commit ae6ef8ce661b · 2014-08-09T14:37:31.000+09:00
diff --git a/MsgPack.Xamarin.iOS.sln b/MsgPack.Xamarin.iOS.sln
@@ -47,9 +47,7 @@ Global
 		{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
 		{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
 		{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C}.Release|iPhone.ActiveCfg = Release|iPhone
-		{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C}.Release|iPhone.Build.0 = Release|iPhone
 		{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 		{346B55F0-94FA-4B90-9C11-06031043B685}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
 		{346B55F0-94FA-4B90-9C11-06031043B685}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
 		{346B55F0-94FA-4B90-9C11-06031043B685}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
@@ -79,7 +77,6 @@ Global
 		$1.inheritsSet = null
 		$1.scope = text/x-csharp
 		$0.CSharpFormattingPolicy = $2
-		$2.AlignEmbeddedIfStatements = False
 		$2.IndentPreprocessorDirectives = False
 		$2.AnonymousMethodBraceStyle = NextLine
 		$2.PropertyBraceStyle = NextLine
diff --git a/test/MsgPack.UnitTest/MessagePackObjectTest.Miscs.cs b/test/MsgPack.UnitTest/MessagePackObjectTest.Miscs.cs
@@ -122,9 +122,10 @@ public void TestToString_ExtendedTypeObject_AsIs()
 		[Test]
 		public void TestToString_AllPossibleTypes_Success()
 		{
-#if MONO
+#if MONO || XAMDROID
 			Assert.Inconclusive( "Mono Regex causes StackOverflow... ");
 #endif
+			try{
 			TestToStringCore(
 				MessagePackObject.Nil,
 				true,
@@ -176,6 +177,9 @@ public void TestToString_AllPossibleTypes_Success()
 				new MessagePackObject( new MessagePackObjectDictionary( Enumerable.Range( 1, 0xFFFF ).ToDictionary( i => new MessagePackObject( i ), i => new MessagePackObject( i ) ) ) ),
 				new MessagePackObject( new MessagePackObjectDictionary( Enumerable.Range( 1, 0x10000 ).ToDictionary( i => new MessagePackObject( i ), i => new MessagePackObject( i ) ) ) )
 			);
+			}catch(StackOverflowException){
+				Assert.Fail ("SOF!!");
+			}
 		}
 
 		private static void TestToStringCore( params MessagePackObject[] targets )
diff --git a/test/MsgPack.UnitTest/MessagePackObjectTest.Strings.cs b/test/MsgPack.UnitTest/MessagePackObjectTest.Strings.cs
@@ -99,7 +99,7 @@ public void TestAsString1_EncodingIsUtf32_SpecifyNotUtf32_Fail()
 		[Test]
 		public void TestAsString1_EncodingIsNotUtf32_SpecifyUtf32_Fail()
 		{
-#if MONO
+#if MONO || XAMDROID
 			Assert.Inconclusive( "UTF32Encoding does not throw exception on Mono FCL." );
 #endif
 			var target = new MessagePackObject( new byte[] { 0xFF } );
diff --git a/test/MsgPack.UnitTest/Serialization/MessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/MessagePackSerializerTest.cs
@@ -43,7 +43,7 @@ public void TearDown()
 		}
 
 #pragma warning disable 618
-#if !XAMIOS && !UNITY_IPHONE
+#if !XAMIOS && !XAMDROID && !UNITY_IPHONE && !UNITY_ANDROID
 		[Test]
 		public void TestCreate1_WithoutContext_NewInstance()
 		{
@@ -64,7 +64,7 @@ public void TestCreate1_WithContext_NewInstance()
 			Assert.That( second, Is.Not.Null );
 			Assert.That( first, Is.Not.SameAs( second ) );
 		}
-#endif // !XAMIOS && !UNITY_IPHONE
+#endif // !XAMIOS && !XAMDROID && !UNITY_IPHONE && !UNITY_ANDROID
 
 
 		[Test]
@@ -73,7 +73,7 @@ public void TestCreate1_WithContext_Null_Fail()
 			Assert.Throws<ArgumentNullException>( () => MessagePackSerializer.Create<int>( null ) );
 		}
 
-#if !XAMIOS && !UNITY_IPHONE
+#if !XAMIOS && !XAMDROID && !UNITY_IPHONE && !UNITY_ANDROID
 		[Test]
 		public void TestCreate_WithoutContext_NewInstance()
 		{
@@ -83,7 +83,7 @@ public void TestCreate_WithoutContext_NewInstance()
 			Assert.That( second, Is.Not.Null );
 			Assert.That( first, Is.Not.SameAs( second ) );
 		}
-#endif // !XAMIOS && !UNITY_IPHONE
+#endif // !XAMIOS && !XAMDROID && !UNITY_IPHONE && !UNITY_ANDROID
 
 		[Test]
 		public void TestCreate_WithoutContext_SameTypeAsCreate1()
@@ -95,7 +95,7 @@ public void TestCreate_WithoutContext_SameTypeAsCreate1()
 			Assert.That( first.GetType(), Is.EqualTo( second.GetType() ) );
 		}
 
-#if !XAMIOS && !UNITY_IPHONE
+#if !XAMIOS && !XAMDROID && !UNITY_IPHONE && !UNITY_ANDROID
 		[Test]
 		public void TestCreate_WithContext_NewInstance()
 		{
@@ -106,7 +106,7 @@ public void TestCreate_WithContext_NewInstance()
 			Assert.That( second, Is.Not.Null );
 			Assert.That( first, Is.Not.SameAs( second ) );
 		}
-#endif // !XAMIOS && !UNITY_IPHONE
+#endif // !XAMIOS && !XAMDROID && !UNITY_IPHONE && !UNITY_ANDROID
 
 		[Test]
 		public void TestCreate_WithContext_SameTypeAsCreate1()
diff --git a/test/MsgPack.UnitTest/UnpackingTest.cs b/test/MsgPack.UnitTest/UnpackingTest.cs
@@ -140,7 +140,7 @@ public void TestUnpackString_ByteArray_Encoding_1Byte_AsIsAndBounded()
 		[Test]
 		public void TestUnpackString_ByteArray_Encoding_1ByteNonSpecifiedString()
 		{
-#if MONO
+#if MONO || XAMDROID
 			Assert.Inconclusive( "UTF32Encoding does not throw exception on Mono FCL." );
 #elif !NETFX_CORE 
 			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()
 		[Test]
 		public void TestUnpackString_Stream_Encoding_1ByteNonSpecifiedString()
 		{
-#if MONO
+#if MONO || XAMDROID
 			Assert.Inconclusive( "UTF32Encoding does not throw exception on Mono FCL." );
 #endif
 
@@ -340,7 +340,7 @@ private static void AssertRawStream( Stream target, int length )
 			Assert.That( readCountExtra, Is.EqualTo( 0 ) );
 		}
 
-#if !NETFX_CORE && !SILVERLIGHT
+#if !NETFX_CORE && !SILVERLIGHT && !XAMDROID
 		[Test]
 		public void TestUnpackByteStream_Stream_LengthIsGreaterThanInt32MaxValue_CanReadToEnd()
 		{
@@ -379,7 +379,7 @@ public void TestUnpackByteStream_Stream_LengthIsGreaterThanInt32MaxValue_CanRead
 				File.Delete( filePath );
 			}
 		}
-#endif
+#endif // !NETFX_CORE && !SILVERLIGHT && !XAMDROID
 
 		[Test]
 		public void TestUnpackByteStream_Stream_Empty_AsIsAndBounded()
@@ -584,7 +584,7 @@ public void TestUnpackCharStream_Stream_Encoding_1Byte_AsIsAndBounded()
 		[Test]
 		public void TestUnpackCharStream_Stream_Encoding_1ByteNonSpecifiedString_ExceptionInReaderOperation()
 		{
-#if MONO
+#if MONO || XAMDROID
 			Assert.Inconclusive( "UTF32Encoding does not throw exception on Mono FCL." );
 #endif
 #if !NETFX_CORE

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public void TestAsString1_EncodingIsUtf32_SpecifyNotUtf32_Fail()`
`99`	`99`	`[Test]`
`100`	`100`	`public void TestAsString1_EncodingIsNotUtf32_SpecifyUtf32_Fail()`
`101`	`101`	`{`
`102`		`-#if MONO`
	`102`	`+#if MONO \|\| XAMDROID`
`103`	`103`	`Assert.Inconclusive( "UTF32Encoding does not throw exception on Mono FCL." );`
`104`	`104`	`#endif`
`105`	`105`	`var target = new MessagePackObject( new byte[] { 0xFF } );`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public void TearDown()`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`#pragma warning disable 618`
`46`		`-#if !XAMIOS && !UNITY_IPHONE`
	`46`	`+#if !XAMIOS && !XAMDROID && !UNITY_IPHONE && !UNITY_ANDROID`
`47`	`47`	`[Test]`
`48`	`48`	`public void TestCreate1_WithoutContext_NewInstance()`
`49`	`49`	`{`
`@@ -64,7 +64,7 @@ public void TestCreate1_WithContext_NewInstance()`
`64`	`64`	`Assert.That( second, Is.Not.Null );`
`65`	`65`	`Assert.That( first, Is.Not.SameAs( second ) );`
`66`	`66`	`}`
`67`		`-#endif // !XAMIOS && !UNITY_IPHONE`
	`67`	`+#endif // !XAMIOS && !XAMDROID && !UNITY_IPHONE && !UNITY_ANDROID`
`68`	`68`
`69`	`69`
`70`	`70`	`[Test]`
`@@ -73,7 +73,7 @@ public void TestCreate1_WithContext_Null_Fail()`
`73`	`73`	`Assert.Throws<ArgumentNullException>( () => MessagePackSerializer.Create<int>( null ) );`
`74`	`74`	`}`
`75`	`75`
`76`		`-#if !XAMIOS && !UNITY_IPHONE`
	`76`	`+#if !XAMIOS && !XAMDROID && !UNITY_IPHONE && !UNITY_ANDROID`
`77`	`77`	`[Test]`
`78`	`78`	`public void TestCreate_WithoutContext_NewInstance()`
`79`	`79`	`{`
`@@ -83,7 +83,7 @@ public void TestCreate_WithoutContext_NewInstance()`
`83`	`83`	`Assert.That( second, Is.Not.Null );`
`84`	`84`	`Assert.That( first, Is.Not.SameAs( second ) );`
`85`	`85`	`}`
`86`		`-#endif // !XAMIOS && !UNITY_IPHONE`
	`86`	`+#endif // !XAMIOS && !XAMDROID && !UNITY_IPHONE && !UNITY_ANDROID`
`87`	`87`
`88`	`88`	`[Test]`
`89`	`89`	`public void TestCreate_WithoutContext_SameTypeAsCreate1()`
`@@ -95,7 +95,7 @@ public void TestCreate_WithoutContext_SameTypeAsCreate1()`
`95`	`95`	`Assert.That( first.GetType(), Is.EqualTo( second.GetType() ) );`
`96`	`96`	`}`
`97`	`97`
`98`		`-#if !XAMIOS && !UNITY_IPHONE`
	`98`	`+#if !XAMIOS && !XAMDROID && !UNITY_IPHONE && !UNITY_ANDROID`
`99`	`99`	`[Test]`
`100`	`100`	`public void TestCreate_WithContext_NewInstance()`
`101`	`101`	`{`
`@@ -106,7 +106,7 @@ public void TestCreate_WithContext_NewInstance()`
`106`	`106`	`Assert.That( second, Is.Not.Null );`
`107`	`107`	`Assert.That( first, Is.Not.SameAs( second ) );`
`108`	`108`	`}`
`109`		`-#endif // !XAMIOS && !UNITY_IPHONE`
	`109`	`+#endif // !XAMIOS && !XAMDROID && !UNITY_IPHONE && !UNITY_ANDROID`
`110`	`110`
`111`	`111`	`[Test]`
`112`	`112`	`public void TestCreate_WithContext_SameTypeAsCreate1()`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public void TestUnpackString_ByteArray_Encoding_1Byte_AsIsAndBounded()`
`140`	`140`	`[Test]`
`141`	`141`	`public void TestUnpackString_ByteArray_Encoding_1ByteNonSpecifiedString()`
`142`	`142`	`{`
`143`		`-#if MONO`
	`143`	`+#if MONO \|\| XAMDROID`
`144`	`144`	`Assert.Inconclusive( "UTF32Encoding does not throw exception on Mono FCL." );`
`145`	`145`	`#elif !NETFX_CORE`
`146`	`146`	`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()`
`292`	`292`	`[Test]`
`293`	`293`	`public void TestUnpackString_Stream_Encoding_1ByteNonSpecifiedString()`
`294`	`294`	`{`
`295`		`-#if MONO`
	`295`	`+#if MONO \|\| XAMDROID`
`296`	`296`	`Assert.Inconclusive( "UTF32Encoding does not throw exception on Mono FCL." );`
`297`	`297`	`#endif`
`298`	`298`
`@@ -340,7 +340,7 @@ private static void AssertRawStream( Stream target, int length )`
`340`	`340`	`Assert.That( readCountExtra, Is.EqualTo( 0 ) );`
`341`	`341`	`}`
`342`	`342`
`343`		`-#if !NETFX_CORE && !SILVERLIGHT`
	`343`	`+#if !NETFX_CORE && !SILVERLIGHT && !XAMDROID`
`344`	`344`	`[Test]`
`345`	`345`	`public void TestUnpackByteStream_Stream_LengthIsGreaterThanInt32MaxValue_CanReadToEnd()`
`346`	`346`	`{`
`@@ -379,7 +379,7 @@ public void TestUnpackByteStream_Stream_LengthIsGreaterThanInt32MaxValue_CanRead`
`379`	`379`	`File.Delete( filePath );`
`380`	`380`	`}`
`381`	`381`	`}`
`382`		`-#endif`
	`382`	`+#endif // !NETFX_CORE && !SILVERLIGHT && !XAMDROID`
`383`	`383`
`384`	`384`	`[Test]`
`385`	`385`	`public void TestUnpackByteStream_Stream_Empty_AsIsAndBounded()`
`@@ -584,7 +584,7 @@ public void TestUnpackCharStream_Stream_Encoding_1Byte_AsIsAndBounded()`
`584`	`584`	`[Test]`
`585`	`585`	`public void TestUnpackCharStream_Stream_Encoding_1ByteNonSpecifiedString_ExceptionInReaderOperation()`
`586`	`586`	`{`
`587`		`-#if MONO`
	`587`	`+#if MONO \|\| XAMDROID`
`588`	`588`	`Assert.Inconclusive( "UTF32Encoding does not throw exception on Mono FCL." );`
`589`	`589`	`#endif`
`590`	`590`	`#if !NETFX_CORE`