Merge pull request #275 from msgpack/fix/stabilize-tests

yfakariya · web-flow · commit ed451b8b558f · 2017-12-17T19:19:12.000+09:00
diff --git a/appveyor-debug35.yml b/appveyor-debug35.yml
@@ -0,0 +1,39 @@
+version: '{branch}-{build}'
+image: Visual Studio 2017
+skip_tags: true
+configuration: Debug
+assembly_info:
+  patch: true
+  file: '**\*AssemblyInfo.cs'
+  assembly_version: $(AssemblyBaseVersion).0
+  assembly_file_version: $(AssemblyBaseVersion).{build}
+  assembly_informational_version: $(PackageVersion)
+environment:
+  XamarinMSBuildExtensionsPath: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild
+install:
+- cmd: >-
+    cd .\build
+- ps: >-
+    ./SetBuildEnv.ps1
+
+    cd ..
+build_script:
+- ps: >-
+    Write-Host "Configuration=${env:CONFIGURATION}"
+
+    cd ./build
+
+    ./Build.ps1
+
+    if ( $LastExitCode -ne 0 )
+    {
+        Write-Error "Failed to build."
+        exit 1
+    }
+
+    cd ..
+test_script:
+- cmd: >-
+    cd ./build
+
+    ./RunUnitTests35.cmd
diff --git a/build/RunUnitTests.cmd b/build/RunUnitTests.cmd
@@ -4,10 +4,6 @@ dotnet test %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.BclExtensions/MsgPack.
 if not %errorlevel% == 0 exit /b 1
 dotnet test %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.CodeDom/MsgPack.UnitTest.CodeDom.csproj
 if not %errorlevel% == 0 exit /b 1
-nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.Net35/bin/Debug/net35/MsgPack.UnitTest.Net35.dll --framework:net-3.5 --result=test-result-net35.xml;format=AppVeyor
-if not %errorlevel% == 0 exit /b 1
-nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.CodeDom.Net35/bin/Debug/net35/MsgPack.UnitTest.CodeDom.Net35.dll --framework:net-3.5 --result=test-result-net35-codedom.xml;format=AppVeyor
-if not %errorlevel% == 0 exit /b 1
 @rem WinRT related tests require developer license...
 @rem vstest.console /logger:Appveyor /InIsolation %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.WinRT/AppPackages/MsgPack.UnitTest.WinRT_1.1.0.0_AnyCPU_Debug_Test/MsgPack.UnitTest.WinRT_1.1.0.0_AnyCPU_Debug.appx 
 @rem vstest.console /logger:Appveyor /InIsolation %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.BclExtensions.WinRT/AppPackages/MsgPack.UnitTest.BclExtensions.WinRT_1.1.0.0_AnyCPU_Debug_Test/MsgPack.UnitTest.BclExtensions.WinRT_1.1.0.0_AnyCPU_Debug.appx
diff --git a/build/RunUnitTests35.cmd b/build/RunUnitTests35.cmd
@@ -0,0 +1,4 @@
+nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.Net35/bin/Debug/net35/MsgPack.UnitTest.Net35.dll --framework:net-3.5 --result=test-result-net35.xml;format=AppVeyor
+if not %errorlevel% == 0 exit /b 1
+nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.CodeDom.Net35/bin/Debug/net35/MsgPack.UnitTest.CodeDom.Net35.dll --framework:net-3.5 --result=test-result-net35-codedom.xml;format=AppVeyor
+if not %errorlevel% == 0 exit /b 1
diff --git a/test/MsgPack.UnitTest.CodeDom/Serialization/ArrayCodeDomBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest.CodeDom/Serialization/ArrayCodeDomBasedAutoMessagePackSerializerTest.cs
@@ -2536,13 +2536,13 @@ public void TestHasPrivateSetterPropertyWithBothConstructor_DeserializeWithMissi
 				stream.Write( new byte[]{ 0x90 } );
 				stream.Position = 0;
 				var result = serializer.Unpack( stream );
-#if !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
+#if !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
 				// Default constructor was called and was nothing to be set.
 				Assert.That( result.Member, Is.EqualTo( "ABC" ) );
 #else
 				// Set null via deserialization constructor.
 				Assert.That( result.Member, Is.Null );
-#endif // !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
+#endif // !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
 			}
 		}
 
diff --git a/test/MsgPack.UnitTest.CodeDom/Serialization/MapCodeDomBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest.CodeDom/Serialization/MapCodeDomBasedAutoMessagePackSerializerTest.cs
@@ -2561,13 +2561,13 @@ public void TestHasPrivateSetterPropertyWithBothConstructor_DeserializeWithMissi
 				stream.Write( new byte[]{ 0x80 } );
 				stream.Position = 0;
 				var result = serializer.Unpack( stream );
-#if !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
+#if !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
 				// Default constructor was called and was nothing to be set.
 				Assert.That( result.Member, Is.EqualTo( "ABC" ) );
 #else
 				// Set null via deserialization constructor.
 				Assert.That( result.Member, Is.Null );
-#endif // !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
+#endif // !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
 			}
 		}
 
diff --git a/test/MsgPack.UnitTest.Silverlight.5.FullTrust/Properties/OutOfBrowserSettings.xml b/test/MsgPack.UnitTest.Silverlight.5.FullTrust/Properties/OutOfBrowserSettings.xml
@@ -3,5 +3,8 @@
   <OutOfBrowserSettings.WindowSettings>
     <WindowSettings Title="MsgPack.UnitTest.Silverlight.5.FullTrust アプリケーション" />
   </OutOfBrowserSettings.WindowSettings>
+  <OutOfBrowserSettings.SecuritySettings>
+    <SecuritySettings ElevatedPermissions="Required" />
+  </OutOfBrowserSettings.SecuritySettings>
   <OutOfBrowserSettings.Icons />
 </OutOfBrowserSettings>
diff --git a/test/MsgPack.UnitTest/ByteArrayPackerTest.cs b/test/MsgPack.UnitTest/ByteArrayPackerTest.cs
@@ -1,4 +1,4 @@
-﻿#region -- License Terms --
+#region -- License Terms --
 //
 // MessagePack for CLI
 //
@@ -34,7 +34,7 @@
 namespace MsgPack
 {
 	[TestFixture]
-	[Timeout( 500 )]
+	[Timeout( 1000 )]
 	public partial class ByteArrayPackerTest : PackerTest
 	{
 		protected override Packer CreatePacker( MemoryStream stream )
diff --git a/test/MsgPack.UnitTest/MessagePackConvertTest.cs b/test/MsgPack.UnitTest/MessagePackConvertTest.cs
@@ -1,4 +1,4 @@
-﻿#region -- License Terms --
+#region -- License Terms --
 //
 // MessagePack for CLI
 //
@@ -317,19 +317,21 @@ public void TestToDateTime_MinimumMinusOne_IsUtcEpoc()
 		[Test]
 		public void TestFromDateTimeOffset_UtcNow_AsUnixEpoc()
 		{
+			var utcNow = DateTimeOffset.UtcNow;
 			Assert.AreEqual(
-				checked( DateTime.UtcNow.Subtract( UtcEpoc ).Ticks / TicksToMilliseconds ),
-				MessagePackConvert.FromDateTimeOffset( DateTimeOffset.UtcNow )
+				checked( utcNow.DateTime.Subtract( UtcEpoc ).Ticks / TicksToMilliseconds ),
+				MessagePackConvert.FromDateTimeOffset( utcNow )
 			);
 		}
 
 		[Test]
 		public void TestFromDateTimeOffset_Now_AsUtcUnixEpoc()
 		{
+			var utcNow = DateTimeOffset.UtcNow;
 			// LocalTime will be converted to UtcTime
 			Assert.AreEqual(
-				checked( DateTime.UtcNow.Subtract( UtcEpoc ).Ticks / TicksToMilliseconds ),
-				MessagePackConvert.FromDateTimeOffset( DateTimeOffset.Now )
+				checked( utcNow.DateTime.Subtract( UtcEpoc ).Ticks / TicksToMilliseconds ),
+				MessagePackConvert.FromDateTimeOffset( utcNow.ToLocalTime() )
 			);
 		}
 
diff --git a/test/MsgPack.UnitTest/Serialization/ArrayFieldBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/ArrayFieldBasedAutoMessagePackSerializerTest.cs
@@ -2536,13 +2536,13 @@ public void TestHasPrivateSetterPropertyWithBothConstructor_DeserializeWithMissi
 				stream.Write( new byte[]{ 0x90 } );
 				stream.Position = 0;
 				var result = serializer.Unpack( stream );
-#if !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
+#if !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
 				// Default constructor was called and was nothing to be set.
 				Assert.That( result.Member, Is.EqualTo( "ABC" ) );
 #else
 				// Set null via deserialization constructor.
 				Assert.That( result.Member, Is.Null );
-#endif // !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
+#endif // !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
 			}
 		}
 
diff --git a/test/MsgPack.UnitTest/Serialization/ArrayReflectionBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/ArrayReflectionBasedAutoMessagePackSerializerTest.cs
@@ -2536,13 +2536,13 @@ public void TestHasPrivateSetterPropertyWithBothConstructor_DeserializeWithMissi
 				stream.Write( new byte[]{ 0x90 } );
 				stream.Position = 0;
 				var result = serializer.Unpack( stream );
-#if !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
+#if !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
 				// Default constructor was called and was nothing to be set.
 				Assert.That( result.Member, Is.EqualTo( "ABC" ) );
 #else
 				// Set null via deserialization constructor.
 				Assert.That( result.Member, Is.Null );
-#endif // !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
+#endif // !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
 			}
 		}
 
diff --git a/test/MsgPack.UnitTest/Serialization/AutoMessagePackSerializerTest.ttinclude b/test/MsgPack.UnitTest/Serialization/AutoMessagePackSerializerTest.ttinclude
@@ -2147,13 +2147,13 @@ namespace MsgPack.Serialization
 											goto case "PublicSetter";
 										}
 #>
-#if !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
+#if !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
 				// Default constructor was called and was nothing to be set.
 				Assert.That( result.Member, Is.EqualTo( <#= type.DefaultValue #> ) );
 #else
 				// Set null via deserialization constructor.
 				Assert.That( result.Member, Is.Null );
-#endif // !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
+#endif // !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
 <#+
 										break;
 									}
diff --git a/test/MsgPack.UnitTest/Serialization/MapFieldBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/MapFieldBasedAutoMessagePackSerializerTest.cs
@@ -2561,13 +2561,13 @@ public void TestHasPrivateSetterPropertyWithBothConstructor_DeserializeWithMissi
 				stream.Write( new byte[]{ 0x80 } );
 				stream.Position = 0;
 				var result = serializer.Unpack( stream );
-#if !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
+#if !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
 				// Default constructor was called and was nothing to be set.
 				Assert.That( result.Member, Is.EqualTo( "ABC" ) );
 #else
 				// Set null via deserialization constructor.
 				Assert.That( result.Member, Is.Null );
-#endif // !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
+#endif // !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
 			}
 		}
 
diff --git a/test/MsgPack.UnitTest/Serialization/MapReflectionBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/MapReflectionBasedAutoMessagePackSerializerTest.cs
@@ -2561,13 +2561,13 @@ public void TestHasPrivateSetterPropertyWithBothConstructor_DeserializeWithMissi
 				stream.Write( new byte[]{ 0x80 } );
 				stream.Position = 0;
 				var result = serializer.Unpack( stream );
-#if !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
+#if !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
 				// Default constructor was called and was nothing to be set.
 				Assert.That( result.Member, Is.EqualTo( "ABC" ) );
 #else
 				// Set null via deserialization constructor.
 				Assert.That( result.Member, Is.Null );
-#endif // !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
+#endif // !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
 			}
 		}
 
diff --git a/test/MsgPack.UnitTest/StreamPackerTest.cs b/test/MsgPack.UnitTest/StreamPackerTest.cs
@@ -1,4 +1,4 @@
-﻿#region -- License Terms --
+#region -- License Terms --
 //
 // MessagePack for CLI
 //
@@ -36,7 +36,7 @@
 namespace MsgPack
 {
 	[TestFixture]
-	[Timeout( 500 )]
+	[Timeout( 1000 )]
 	public partial class StreamPackerTest : PackerTest
 	{
 		protected override Packer CreatePacker( MemoryStream stream )

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#region -- License Terms --`
	`1`	`+#region -- License Terms --`
`2`	`2`	`//`
`3`	`3`	`// MessagePack for CLI`
`4`	`4`	`//`
`@@ -34,7 +34,7 @@`
`34`	`34`	`namespace MsgPack`
`35`	`35`	`{`
`36`	`36`	`[TestFixture]`
`37`		`- [Timeout( 500 )]`
	`37`	`+ [Timeout( 1000 )]`
`38`	`38`	`public partial class ByteArrayPackerTest : PackerTest`
`39`	`39`	`{`
`40`	`40`	`protected override Packer CreatePacker( MemoryStream stream )`