Improve debuggability of tests.

yfakariya · yfakariya · commit ad6fb1f9e1d4 · 2015-04-19T01:14:02.000+09:00
diff --git a/test/MsgPack.UnitTest.CodeDom/Serialization/ArrayCodeDomBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest.CodeDom/Serialization/ArrayCodeDomBasedAutoMessagePackSerializerTest.cs
@@ -12616,12 +12616,12 @@ private void TestCoreWithVerifiable<T>( T[] value, SerializationContext context
 #if MSTEST
 					catch( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException ae )
 					{
-						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( i.ToString(), ae );
+						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #else
 					catch( AssertionException ae )
 					{
-						throw new AssertionException( i.ToString(), ae );
+						throw new AssertionException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #endif
 				}
diff --git a/test/MsgPack.UnitTest.CodeDom/Serialization/MapCodeDomBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest.CodeDom/Serialization/MapCodeDomBasedAutoMessagePackSerializerTest.cs
@@ -12622,12 +12622,12 @@ private void TestCoreWithVerifiable<T>( T[] value, SerializationContext context
 #if MSTEST
 					catch( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException ae )
 					{
-						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( i.ToString(), ae );
+						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #else
 					catch( AssertionException ae )
 					{
-						throw new AssertionException( i.ToString(), ae );
+						throw new AssertionException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #endif
 				}
diff --git a/test/MsgPack.UnitTest/Serialization/ArrayContextBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/ArrayContextBasedAutoMessagePackSerializerTest.cs
@@ -12616,12 +12616,12 @@ private void TestCoreWithVerifiable<T>( T[] value, SerializationContext context
 #if MSTEST
 					catch( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException ae )
 					{
-						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( i.ToString(), ae );
+						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #else
 					catch( AssertionException ae )
 					{
-						throw new AssertionException( i.ToString(), ae );
+						throw new AssertionException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #endif
 				}
diff --git a/test/MsgPack.UnitTest/Serialization/ArrayExpressionBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/ArrayExpressionBasedAutoMessagePackSerializerTest.cs
@@ -12616,12 +12616,12 @@ private void TestCoreWithVerifiable<T>( T[] value, SerializationContext context
 #if MSTEST
 					catch( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException ae )
 					{
-						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( i.ToString(), ae );
+						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #else
 					catch( AssertionException ae )
 					{
-						throw new AssertionException( i.ToString(), ae );
+						throw new AssertionException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #endif
 				}
diff --git a/test/MsgPack.UnitTest/Serialization/ArrayFieldBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/ArrayFieldBasedAutoMessagePackSerializerTest.cs
@@ -12616,12 +12616,12 @@ private void TestCoreWithVerifiable<T>( T[] value, SerializationContext context
 #if MSTEST
 					catch( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException ae )
 					{
-						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( i.ToString(), ae );
+						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #else
 					catch( AssertionException ae )
 					{
-						throw new AssertionException( i.ToString(), ae );
+						throw new AssertionException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #endif
 				}
diff --git a/test/MsgPack.UnitTest/Serialization/ArrayGenerationBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/ArrayGenerationBasedAutoMessagePackSerializerTest.cs
@@ -11437,12 +11437,12 @@ private void TestCoreWithVerifiable<T>( T[] value, SerializationContext context
 #if MSTEST
 					catch( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException ae )
 					{
-						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( i.ToString(), ae );
+						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #else
 					catch( AssertionException ae )
 					{
-						throw new AssertionException( i.ToString(), ae );
+						throw new AssertionException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #endif
 				}
diff --git a/test/MsgPack.UnitTest/Serialization/ArrayReflectionBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/ArrayReflectionBasedAutoMessagePackSerializerTest.cs
@@ -59,7 +59,7 @@
 namespace MsgPack.Serialization
 {
 	[TestFixture]
-	//[Timeout( 60000 )]
+	[Timeout( 60000 )]
 	public class ArrayReflectionBasedReflectionMessagePackSerializerTest
 	{
 		private static SerializationContext GetSerializationContext()
@@ -12616,12 +12616,12 @@ private void TestCoreWithVerifiable<T>( T[] value, SerializationContext context
 #if MSTEST
 					catch( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException ae )
 					{
-						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( i.ToString(), ae );
+						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #else
 					catch( AssertionException ae )
 					{
-						throw new AssertionException( i.ToString(), ae );
+						throw new AssertionException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #endif
 				}
diff --git a/test/MsgPack.UnitTest/Serialization/AutoMessagePackSerializerTest.Types.ttinclude b/test/MsgPack.UnitTest/Serialization/AutoMessagePackSerializerTest.Types.ttinclude
@@ -410,12 +410,12 @@ private void GenerateTypesCore( bool forIos )
 #if MSTEST
 					catch( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException ae )
 					{
-						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( i.ToString(), ae );
+						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #else
 					catch( AssertionException ae )
 					{
-						throw new AssertionException( i.ToString(), ae );
+						throw new AssertionException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #endif
 				}
diff --git a/test/MsgPack.UnitTest/Serialization/MapContextBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/MapContextBasedAutoMessagePackSerializerTest.cs
@@ -12622,12 +12622,12 @@ private void TestCoreWithVerifiable<T>( T[] value, SerializationContext context
 #if MSTEST
 					catch( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException ae )
 					{
-						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( i.ToString(), ae );
+						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #else
 					catch( AssertionException ae )
 					{
-						throw new AssertionException( i.ToString(), ae );
+						throw new AssertionException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #endif
 				}
diff --git a/test/MsgPack.UnitTest/Serialization/MapExpressionBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/MapExpressionBasedAutoMessagePackSerializerTest.cs
@@ -12622,12 +12622,12 @@ private void TestCoreWithVerifiable<T>( T[] value, SerializationContext context
 #if MSTEST
 					catch( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException ae )
 					{
-						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( i.ToString(), ae );
+						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #else
 					catch( AssertionException ae )
 					{
-						throw new AssertionException( i.ToString(), ae );
+						throw new AssertionException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #endif
 				}
diff --git a/test/MsgPack.UnitTest/Serialization/MapFieldBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/MapFieldBasedAutoMessagePackSerializerTest.cs
@@ -12622,12 +12622,12 @@ private void TestCoreWithVerifiable<T>( T[] value, SerializationContext context
 #if MSTEST
 					catch( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException ae )
 					{
-						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( i.ToString(), ae );
+						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #else
 					catch( AssertionException ae )
 					{
-						throw new AssertionException( i.ToString(), ae );
+						throw new AssertionException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #endif
 				}
diff --git a/test/MsgPack.UnitTest/Serialization/MapGenerationBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/MapGenerationBasedAutoMessagePackSerializerTest.cs
@@ -11437,12 +11437,12 @@ private void TestCoreWithVerifiable<T>( T[] value, SerializationContext context
 #if MSTEST
 					catch( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException ae )
 					{
-						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( i.ToString(), ae );
+						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #else
 					catch( AssertionException ae )
 					{
-						throw new AssertionException( i.ToString(), ae );
+						throw new AssertionException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #endif
 				}
diff --git a/test/MsgPack.UnitTest/Serialization/MapReflectionBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/MapReflectionBasedAutoMessagePackSerializerTest.cs
@@ -12622,12 +12622,12 @@ private void TestCoreWithVerifiable<T>( T[] value, SerializationContext context
 #if MSTEST
 					catch( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException ae )
 					{
-						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( i.ToString(), ae );
+						throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #else
 					catch( AssertionException ae )
 					{
-						throw new AssertionException( i.ToString(), ae );
+						throw new AssertionException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );
 					}
 #endif
 				}

Original file line number	Diff line number	Diff line change
`@@ -12616,12 +12616,12 @@ private void TestCoreWithVerifiable<T>( T[] value, SerializationContext context`
`12616`	`12616`	`#if MSTEST`
`12617`	`12617`	`catch( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException ae )`
`12618`	`12618`	`{`
`12619`		`- throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( i.ToString(), ae );`
	`12619`	`+ throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );`
`12620`	`12620`	`}`
`12621`	`12621`	`#else`
`12622`	`12622`	`catch( AssertionException ae )`
`12623`	`12623`	`{`
`12624`		`- throw new AssertionException( i.ToString(), ae );`
	`12624`	`+ throw new AssertionException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );`
`12625`	`12625`	`}`
`12626`	`12626`	`#endif`
`12627`	`12627`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12622,12 +12622,12 @@ private void TestCoreWithVerifiable<T>( T[] value, SerializationContext context`
`12622`	`12622`	`#if MSTEST`
`12623`	`12623`	`catch( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException ae )`
`12624`	`12624`	`{`
`12625`		`- throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( i.ToString(), ae );`
	`12625`	`+ throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );`
`12626`	`12626`	`}`
`12627`	`12627`	`#else`
`12628`	`12628`	`catch( AssertionException ae )`
`12629`	`12629`	`{`
`12630`		`- throw new AssertionException( i.ToString(), ae );`
	`12630`	`+ throw new AssertionException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );`
`12631`	`12631`	`}`
`12632`	`12632`	`#endif`
`12633`	`12633`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11437,12 +11437,12 @@ private void TestCoreWithVerifiable<T>( T[] value, SerializationContext context`
`11437`	`11437`	`#if MSTEST`
`11438`	`11438`	`catch( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException ae )`
`11439`	`11439`	`{`
`11440`		`- throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( i.ToString(), ae );`
	`11440`	`+ throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );`
`11441`	`11441`	`}`
`11442`	`11442`	`#else`
`11443`	`11443`	`catch( AssertionException ae )`
`11444`	`11444`	`{`
`11445`		`- throw new AssertionException( i.ToString(), ae );`
	`11445`	`+ throw new AssertionException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );`
`11446`	`11446`	`}`
`11447`	`11447`	`#endif`
`11448`	`11448`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@`
`59`	`59`	`namespace MsgPack.Serialization`
`60`	`60`	`{`
`61`	`61`	`[TestFixture]`
`62`		`- //[Timeout( 60000 )]`
	`62`	`+ [Timeout( 60000 )]`
`63`	`63`	`public class ArrayReflectionBasedReflectionMessagePackSerializerTest`
`64`	`64`	`{`
`65`	`65`	`private static SerializationContext GetSerializationContext()`
`@@ -12616,12 +12616,12 @@ private void TestCoreWithVerifiable<T>( T[] value, SerializationContext context`
`12616`	`12616`	`#if MSTEST`
`12617`	`12617`	`catch( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException ae )`
`12618`	`12618`	`{`
`12619`		`- throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( i.ToString(), ae );`
	`12619`	`+ throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );`
`12620`	`12620`	`}`
`12621`	`12621`	`#else`
`12622`	`12622`	`catch( AssertionException ae )`
`12623`	`12623`	`{`
`12624`		`- throw new AssertionException( i.ToString(), ae );`
	`12624`	`+ throw new AssertionException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );`
`12625`	`12625`	`}`
`12626`	`12626`	`#endif`
`12627`	`12627`	`}`
Original file line number	Diff line number	Diff line change
`@@ -410,12 +410,12 @@ private void GenerateTypesCore( bool forIos )`
`410`	`410`	`#if MSTEST`
`411`	`411`	`catch( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException ae )`
`412`	`412`	`{`
`413`		`- throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( i.ToString(), ae );`
	`413`	`+ throw new Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );`
`414`	`414`	`}`
`415`	`415`	`#else`
`416`	`416`	`catch( AssertionException ae )`
`417`	`417`	`{`
`418`		`- throw new AssertionException( i.ToString(), ae );`
	`418`	`+ throw new AssertionException( String.Format( "[{0}]:{1}", i, ae.Message ), ae );`
`419`	`419`	`}`
`420`	`420`	`#endif`
`421`	`421`	`}`