Enable MessagePackString.Equals test for all platforms.

This commit also fix ticks to microseconds conversion bug of display message.

Author: yfakariya

test/MsgPack.UnitTest/MessagePackStringTest.cs

@@ -1,4 +1,4 @@
-#region -- License Terms --
+#region -- License Terms --
 //
 // MessagePack for CLI
 //
@@ -139,12 +139,17 @@ public void TestToString_EmptyString()
 			Assert.AreEqual( String.Empty, target.ToString() );
 		}
 
-#if !UNITY && !SILVERLIGHT && !AOT && !NETFX_CORE && !NETSTANDARD1_3
 		[Test]
 		public void TestEqualsFullTrust()
 		{
 			var result = TestEqualsCore();
+#if !UNITY && !WINDOWS_PHONE && !NETFX_CORE
+#if SILVERLIGHT && !SILVERLIGHT_PRIVILEGED
+			Assert.That( MessagePackString.IsFastEqualsDisabled, Is.True );
+#else // SILVERLIGHT && !SILVERLIGHT_PRIVILEGED
 			Assert.That( MessagePackString.IsFastEqualsDisabled, Is.False );
+#endif // SILVERLIGHT && !SILVERLIGHT_PRIVILEGED
+#endif // !UNITY && !WINDOWS_PHONE && !NETFX_CORE
 			Debug.WriteLine( "TestEqualsFullTrust" );
 			ShowResult( result );
 		}
@@ -157,8 +162,6 @@ private void ShowResult( Tuple<double, double, double, double> result )
 			Debug.WriteLine( "Large(100,000 chars) : {0:#,0.0} usec", result.Item4 );
 		}
 
-#endif // !UNITY && !SILVERLIGHT && !AOT && !NETFX_CORE && !NETSTANDARD1_3
-
 #if !SILVERLIGHT && !AOT && !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETFX_CORE && !NETSTANDARD2_0
 		private static StrongName GetStrongName( Type type )
 		{
@@ -243,6 +246,8 @@ public static void TestEqualsWorker()
 			AppDomain.CurrentDomain.SetData( "MessagePackString.IsFastEqualsDisabled", MessagePackString.IsFastEqualsDisabled );
 		}
 
+#endif // !SILVERLIGHT && !AOT && !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETFX_CORE && !NETSTANDARD2_0
+
 		private static Tuple<double, double, double, double> TestEqualsCore()
 		{
 			Assert.IsTrue(
@@ -320,7 +325,8 @@ private static Tuple<double, double, double, double> TestEqualsCore()
 			var sw = new Stopwatch();
 			for ( int i = 0; i < iteration; i++ )
 			{
-				sw.Restart();
+				sw.Reset();
+				sw.Start();
 				for ( int x = 0; x < values.Length; x++ )
 				{
 					Assert.That( values[ x ].Equals( null ), Is.False );
@@ -331,44 +337,62 @@ private static Tuple<double, double, double, double> TestEqualsCore()
 					}
 				}
 				sw.Stop();
-				tinyAvg = Math.Min( tinyAvg, sw.Elapsed.Ticks * 10.0 / ( values.Length * values.Length ) );
+#if SILVERLIGHT && !WINDOWS_PHONE
+				tinyAvg = Math.Min( tinyAvg, sw.ElapsedMilliseconds * 1000.0 / ( values.Length * values.Length ) );
+#else
+				tinyAvg = Math.Min( tinyAvg, sw.Elapsed.Ticks / 10.0 / ( values.Length * values.Length ) );
+#endif
 			}
 
 			var smallX = new MessagePackString( new String( 'A', 16 ) );
 			var smallY = new MessagePackString( MessagePackConvert.EncodeString( new String( 'A', 16 ) ), false );
 
 			for ( int i = 0; i < iteration; i++ )
 			{
-				sw.Restart();
+				sw.Reset();
+				sw.Start();
 				Assert.That( smallX.Equals( smallY ), Is.True );
 				sw.Stop();
-				smallAvg = Math.Min( smallAvg, sw.Elapsed.Ticks * 10.0 );
+#if SILVERLIGHT && !WINDOWS_PHONE
+				smallAvg = Math.Min( smallAvg, sw.ElapsedMilliseconds * 1000.0 );
+#else
+				smallAvg = Math.Min( smallAvg, sw.Elapsed.Ticks / 10.0 );
+#endif
 			}
 
 			var mediumX = new MessagePackString( new String( 'A', 1000 ) );
 			var mediumY = new MessagePackString( MessagePackConvert.EncodeString( new String( 'A', 1000 ) ), false );
 
 			for ( int i = 0; i < iteration; i++ )
 			{
-				sw.Restart();
+				sw.Reset();
+				sw.Start();
 				Assert.That( mediumX.Equals( mediumY ), Is.True );
 				sw.Stop();
-				mediumAvg = Math.Min( mediumAvg, sw.Elapsed.Ticks * 10.0 );
+#if SILVERLIGHT && !WINDOWS_PHONE
+				mediumAvg = Math.Min( mediumAvg, sw.ElapsedMilliseconds * 1000.0 );
+#else
+				mediumAvg = Math.Min( mediumAvg, sw.Elapsed.Ticks / 10.0 );
+#endif
 			}
 
 			var largeX = new MessagePackString( new String( 'A', 100000 ) );
 			var largeY = new MessagePackString( MessagePackConvert.EncodeString( new String( 'A', 100000 ) ), false );
 
 			for ( int i = 0; i < iteration; i++ )
 			{
-				sw.Restart();
+				sw.Reset();
+				sw.Start();
 				Assert.That( largeX.Equals( largeY ), Is.True );
 				sw.Stop();
-				largeAvg = Math.Min( largeAvg, sw.Elapsed.Ticks * 10.0 );
+#if SILVERLIGHT && !WINDOWS_PHONE
+				largeAvg = Math.Min( largeAvg, sw.ElapsedMilliseconds * 1000.0 );
+#else
+				largeAvg = Math.Min( largeAvg, sw.Elapsed.Ticks / 10.0 );
+#endif
 			}
 
 			return Tuple.Create( tinyAvg, smallAvg, mediumAvg, largeAvg );
 		}
-#endif // !SILVERLIGHT && !AOT && !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETFX_CORE && !NETSTANDRD2_0
 	}
 }