From 590f9f8d830d605e10e24cbb1d6b0ac30dcbf328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Wed, 7 Jun 2017 23:38:14 +0200 Subject: [PATCH 01/21] Enable all Net-Core unit tests --- build.cake | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/build.cake b/build.cake index 6518431959..4794a370a0 100644 --- a/build.cake +++ b/build.cake @@ -11,7 +11,7 @@ // TOOLS /////////////////////////////////////////////////////////////////////////////// -#tool "nuget:?package=xunit.runner.console&version=2.1.0" +#tool "nuget:?package=xunit.runner.console&version=2.2.0" #tool "nuget:?package=OpenCover" /////////////////////////////////////////////////////////////////////////////// @@ -98,7 +98,6 @@ Task("Clean") CleanDirectory(parameters.TestsRoot); }); - Task("Restore-NuGet-Packages") .IsDependentOn("Clean") .WithCriteria(parameters.IsRunningOnWindows) @@ -175,19 +174,18 @@ void RunCoreTest(string dir, Parameters parameters, bool net461Only) } } - Task("Run-Net-Core-Unit-Tests") .IsDependentOn("Clean") .Does(() => { RunCoreTest("./tests/Avalonia.Base.UnitTests", parameters, false); - RunCoreTest("./tests/Avalonia.Controls.UnitTests", parameters, true); - RunCoreTest("./tests/Avalonia.Input.UnitTests", parameters, true); - RunCoreTest("./tests/Avalonia.Interactivity.UnitTests", parameters, true); - RunCoreTest("./tests/Avalonia.Layout.UnitTests", parameters, true); - //RunCoreTest("./tests/Avalonia.Markup.UnitTests", parameters, true); - //RunCoreTest("./tests/Avalonia.Markup.Xaml.UnitTests", parameters, true); - RunCoreTest("./tests/Avalonia.Styling.UnitTests", parameters, true); - RunCoreTest("./tests/Avalonia.Visuals.UnitTests", parameters, true); + RunCoreTest("./tests/Avalonia.Controls.UnitTests", parameters, false); + RunCoreTest("./tests/Avalonia.Input.UnitTests", parameters, false); + RunCoreTest("./tests/Avalonia.Interactivity.UnitTests", parameters, false); + RunCoreTest("./tests/Avalonia.Layout.UnitTests", parameters, false); + RunCoreTest("./tests/Avalonia.Markup.UnitTests", parameters, false); + RunCoreTest("./tests/Avalonia.Markup.Xaml.UnitTests", parameters, false); + RunCoreTest("./tests/Avalonia.Styling.UnitTests", parameters, false); + RunCoreTest("./tests/Avalonia.Visuals.UnitTests", parameters, false); }); Task("Run-Unit-Tests") From 872575b9b7f3663f5b3cb77d664640a3c0a3737e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 00:23:34 +0200 Subject: [PATCH 02/21] Set project OutputType --- tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj | 1 + .../Avalonia.Controls.UnitTests.csproj | 1 + tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj | 1 + .../Avalonia.Interactivity.UnitTests.csproj | 1 + tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj | 1 + tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj | 1 + .../Avalonia.Markup.Xaml.UnitTests.csproj | 1 + .../Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj | 1 + tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj | 1 + 9 files changed, 9 insertions(+) diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj index d55dc8d544..c656801d90 100644 --- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj +++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj @@ -1,6 +1,7 @@  net461;netcoreapp1.1 + Library diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj index f8235f7d68..f7b63cdb75 100644 --- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj +++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj @@ -1,6 +1,7 @@  net461;netcoreapp1.1 + Library diff --git a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj index d35542b51f..8dd8faf9db 100644 --- a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj +++ b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj @@ -1,6 +1,7 @@  net461;netcoreapp1.1 + Library diff --git a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj index 8f9607fe67..86c9cf0617 100644 --- a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj +++ b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj @@ -1,6 +1,7 @@  net461;netcoreapp1.1 + Library diff --git a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj index af33c80352..0950856dca 100644 --- a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj +++ b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj @@ -1,6 +1,7 @@  net461;netcoreapp1.1 + Library diff --git a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj index b7c4811495..3ccd3da044 100644 --- a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj +++ b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj @@ -1,6 +1,7 @@  net461;netcoreapp1.1 + Library diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj index 0cbdc142eb..f6f8f6bcb0 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj @@ -1,6 +1,7 @@  net461;netcoreapp1.1 + Library diff --git a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj index d35542b51f..8dd8faf9db 100644 --- a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj +++ b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj @@ -1,6 +1,7 @@  net461;netcoreapp1.1 + Library diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj index 628ccb2a1f..c3957a71b9 100644 --- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj +++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj @@ -2,6 +2,7 @@ net461;netcoreapp1.1 false + Library true From 1304c54a640970110411b14a7f39bc8901eeb6b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 00:23:44 +0200 Subject: [PATCH 03/21] Set tests Configuration --- build.cake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.cake b/build.cake index 4794a370a0..b3822271d4 100644 --- a/build.cake +++ b/build.cake @@ -170,7 +170,10 @@ void RunCoreTest(string dir, Parameters parameters, bool net461Only) continue; Information("Running for " + fw); DotNetCoreTest(System.IO.Path.Combine(dir, System.IO.Path.GetFileName(dir)+".csproj"), - new DotNetCoreTestSettings{Framework = fw}); + new DotNetCoreTestSettings { + Configuration = parameters.Configuration, + Framework = fw + }); } } From 30ddf2c82206e72051c8eba63a08235a82b0b41e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 00:24:00 +0200 Subject: [PATCH 04/21] Reference Microsoft.NET.Test.Sdk --- build/UnitTests.NetCore.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/UnitTests.NetCore.targets b/build/UnitTests.NetCore.targets index a8886fe028..2e97740341 100644 --- a/build/UnitTests.NetCore.targets +++ b/build/UnitTests.NetCore.targets @@ -25,5 +25,8 @@ + + + \ No newline at end of file From 9247a82ea811ca820e99b771d93488c1719b520c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 00:34:03 +0200 Subject: [PATCH 05/21] Updated XUnit props --- build/UnitTests.NetCore.targets | 3 --- build/XUnit.props | 6 ++++-- tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj | 3 --- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/build/UnitTests.NetCore.targets b/build/UnitTests.NetCore.targets index 2e97740341..a8886fe028 100644 --- a/build/UnitTests.NetCore.targets +++ b/build/UnitTests.NetCore.targets @@ -25,8 +25,5 @@ - - - \ No newline at end of file diff --git a/build/XUnit.props b/build/XUnit.props index 58df7e8d3c..27e0afc987 100644 --- a/build/XUnit.props +++ b/build/XUnit.props @@ -7,7 +7,9 @@ - - + + + + diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj index c3957a71b9..938fca8b4a 100644 --- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj +++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj @@ -52,8 +52,5 @@ - - - \ No newline at end of file From 39fe06c983301e29012392ae79c7d286b3252dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 00:50:09 +0200 Subject: [PATCH 06/21] Disable Markup tests --- build.cake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.cake b/build.cake index b3822271d4..706ce29b44 100644 --- a/build.cake +++ b/build.cake @@ -185,8 +185,8 @@ Task("Run-Net-Core-Unit-Tests") RunCoreTest("./tests/Avalonia.Input.UnitTests", parameters, false); RunCoreTest("./tests/Avalonia.Interactivity.UnitTests", parameters, false); RunCoreTest("./tests/Avalonia.Layout.UnitTests", parameters, false); - RunCoreTest("./tests/Avalonia.Markup.UnitTests", parameters, false); - RunCoreTest("./tests/Avalonia.Markup.Xaml.UnitTests", parameters, false); + //RunCoreTest("./tests/Avalonia.Markup.UnitTests", parameters, false); + //RunCoreTest("./tests/Avalonia.Markup.Xaml.UnitTests", parameters, false); RunCoreTest("./tests/Avalonia.Styling.UnitTests", parameters, false); RunCoreTest("./tests/Avalonia.Visuals.UnitTests", parameters, false); }); From 66d5d70784f05d2a1d656a1bc2fe46ca4ec00a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 11:50:39 +0200 Subject: [PATCH 07/21] Use InvariantCulture same as for other tests [skip ci] --- .../Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs index 062402d465..4831d32c80 100644 --- a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs +++ b/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs @@ -296,7 +296,7 @@ namespace Avalonia.Markup.UnitTests.Data target.Subscribe(_ => { }); - converter.Verify(x => x.Convert(5.6, typeof(string), "foo", CultureInfo.CurrentUICulture)); + converter.Verify(x => x.Convert(5.6, typeof(string), "foo", CultureInfo.InvariantCulture)); } [Fact] @@ -312,7 +312,7 @@ namespace Avalonia.Markup.UnitTests.Data target.OnNext("bar"); - converter.Verify(x => x.ConvertBack("bar", typeof(double), "foo", CultureInfo.CurrentUICulture)); + converter.Verify(x => x.ConvertBack("bar", typeof(double), "foo", CultureInfo.InvariantCulture)); } [Fact] From aac49c8a6dc098c7c31b9d74e5d9b6ae9bf46bbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 11:51:27 +0200 Subject: [PATCH 08/21] Enable Avalonia.Markup.UnitTests .Net Core tests --- build.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cake b/build.cake index 706ce29b44..fe9342e3ce 100644 --- a/build.cake +++ b/build.cake @@ -185,7 +185,7 @@ Task("Run-Net-Core-Unit-Tests") RunCoreTest("./tests/Avalonia.Input.UnitTests", parameters, false); RunCoreTest("./tests/Avalonia.Interactivity.UnitTests", parameters, false); RunCoreTest("./tests/Avalonia.Layout.UnitTests", parameters, false); - //RunCoreTest("./tests/Avalonia.Markup.UnitTests", parameters, false); + RunCoreTest("./tests/Avalonia.Markup.UnitTests", parameters, false); //RunCoreTest("./tests/Avalonia.Markup.Xaml.UnitTests", parameters, false); RunCoreTest("./tests/Avalonia.Styling.UnitTests", parameters, false); RunCoreTest("./tests/Avalonia.Visuals.UnitTests", parameters, false); From bb117a795280c91e5d68f9aa12f4c7fe7fc4cd0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 12:26:56 +0200 Subject: [PATCH 09/21] Set CurrentUICulture for tests --- .../Data/BindingExpressionTests.cs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs index 4831d32c80..6a3e8231f6 100644 --- a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs +++ b/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs @@ -286,6 +286,12 @@ namespace Avalonia.Markup.UnitTests.Data [Fact] public void Should_Pass_ConverterParameter_To_Convert() { +#if NET461 + Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture; +#else + CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture; +#endif + var data = new Class1 { DoubleValue = 5.6 }; var converter = new Mock(); var target = new BindingExpression( @@ -302,6 +308,12 @@ namespace Avalonia.Markup.UnitTests.Data [Fact] public void Should_Pass_ConverterParameter_To_ConvertBack() { +#if NET461 + Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture; +#else + CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture; +#endif + var data = new Class1 { DoubleValue = 5.6 }; var converter = new Mock(); var target = new BindingExpression( @@ -318,6 +330,12 @@ namespace Avalonia.Markup.UnitTests.Data [Fact] public void Should_Handle_DataValidation() { +#if NET461 + Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture; +#else + CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture; +#endif + var data = new Class1 { DoubleValue = 5.6 }; var converter = new Mock(); var target = new BindingExpression(new ExpressionObserver(data, "DoubleValue", true), typeof(string)); From 3ee2d9425f4be148ceba797b0bfe6d3bda6adf5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 12:46:02 +0200 Subject: [PATCH 10/21] Fix expected exception message --- .../Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs index 6a3e8231f6..894f184d60 100644 --- a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs +++ b/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs @@ -203,7 +203,7 @@ namespace Avalonia.Markup.UnitTests.Data Assert.Equal( new BindingNotification( new AggregateException( - new InvalidCastException("Could not convert 'foo' to 'System.Int32'"), + new InvalidCastException("'foo' is not a valid number."), new InvalidCastException("Could not convert FallbackValue 'bar' to 'System.Int32'")), BindingErrorType.Error), result); @@ -229,7 +229,7 @@ namespace Avalonia.Markup.UnitTests.Data Assert.Equal( new BindingNotification( new AggregateException( - new InvalidCastException("Could not convert 'foo' to 'System.Int32'"), + new InvalidCastException("'foo' is not a valid number."), new InvalidCastException("Could not convert FallbackValue 'bar' to 'System.Int32'")), BindingErrorType.Error), result); From dc92cd95ace156ab0163b18cc1d55211a424d0bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 12:59:03 +0200 Subject: [PATCH 11/21] Fix NET461 tests --- .../Data/BindingExpressionTests.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs index 894f184d60..5959599cbf 100644 --- a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs +++ b/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs @@ -200,6 +200,13 @@ namespace Avalonia.Markup.UnitTests.Data DefaultValueConverter.Instance); var result = await target.Take(1); +#if NET461 + Assert.Equal( + new BindingNotification( + new InvalidCastException("Could not convert FallbackValue 'bar' to 'System.Int32'"), + BindingErrorType.Error), + result); +#else Assert.Equal( new BindingNotification( new AggregateException( @@ -207,6 +214,7 @@ namespace Avalonia.Markup.UnitTests.Data new InvalidCastException("Could not convert FallbackValue 'bar' to 'System.Int32'")), BindingErrorType.Error), result); + #endif } [Fact] @@ -226,6 +234,13 @@ namespace Avalonia.Markup.UnitTests.Data DefaultValueConverter.Instance); var result = await target.Take(1); +#if NET461 + Assert.Equal( + new BindingNotification( + new InvalidCastException("Could not convert FallbackValue 'bar' to 'System.Int32'"), + BindingErrorType.Error), + result); +#else Assert.Equal( new BindingNotification( new AggregateException( @@ -233,6 +248,7 @@ namespace Avalonia.Markup.UnitTests.Data new InvalidCastException("Could not convert FallbackValue 'bar' to 'System.Int32'")), BindingErrorType.Error), result); +#endif } [Fact] From 91aaf87a36e12b08228ee097670d2ea8791ddca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 13:24:57 +0200 Subject: [PATCH 12/21] Remove NET461 specific assert --- .../Data/BindingExpressionTests.cs | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs index 5959599cbf..894f184d60 100644 --- a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs +++ b/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs @@ -200,13 +200,6 @@ namespace Avalonia.Markup.UnitTests.Data DefaultValueConverter.Instance); var result = await target.Take(1); -#if NET461 - Assert.Equal( - new BindingNotification( - new InvalidCastException("Could not convert FallbackValue 'bar' to 'System.Int32'"), - BindingErrorType.Error), - result); -#else Assert.Equal( new BindingNotification( new AggregateException( @@ -214,7 +207,6 @@ namespace Avalonia.Markup.UnitTests.Data new InvalidCastException("Could not convert FallbackValue 'bar' to 'System.Int32'")), BindingErrorType.Error), result); - #endif } [Fact] @@ -234,13 +226,6 @@ namespace Avalonia.Markup.UnitTests.Data DefaultValueConverter.Instance); var result = await target.Take(1); -#if NET461 - Assert.Equal( - new BindingNotification( - new InvalidCastException("Could not convert FallbackValue 'bar' to 'System.Int32'"), - BindingErrorType.Error), - result); -#else Assert.Equal( new BindingNotification( new AggregateException( @@ -248,7 +233,6 @@ namespace Avalonia.Markup.UnitTests.Data new InvalidCastException("Could not convert FallbackValue 'bar' to 'System.Int32'")), BindingErrorType.Error), result); -#endif } [Fact] From bd3b34c0c83d1d809ddc404e8ee772140fa5431e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 13:37:05 +0200 Subject: [PATCH 13/21] Fix .NETCoreApp,Version=v1.1 tests --- .../Data/BindingExpressionTests.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs index 894f184d60..76d6b2f75d 100644 --- a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs +++ b/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs @@ -200,6 +200,7 @@ namespace Avalonia.Markup.UnitTests.Data DefaultValueConverter.Instance); var result = await target.Take(1); +#if NET461 Assert.Equal( new BindingNotification( new AggregateException( @@ -207,6 +208,13 @@ namespace Avalonia.Markup.UnitTests.Data new InvalidCastException("Could not convert FallbackValue 'bar' to 'System.Int32'")), BindingErrorType.Error), result); +#else + Assert.Equal( + new BindingNotification( + new InvalidCastException("Could not convert FallbackValue 'bar' to 'System.Int32'"), + BindingErrorType.Error), + result); +#endif } [Fact] @@ -226,6 +234,7 @@ namespace Avalonia.Markup.UnitTests.Data DefaultValueConverter.Instance); var result = await target.Take(1); +#if NET461 Assert.Equal( new BindingNotification( new AggregateException( @@ -233,6 +242,13 @@ namespace Avalonia.Markup.UnitTests.Data new InvalidCastException("Could not convert FallbackValue 'bar' to 'System.Int32'")), BindingErrorType.Error), result); +#else + Assert.Equal( + new BindingNotification( + new InvalidCastException("Could not convert FallbackValue 'bar' to 'System.Int32'"), + BindingErrorType.Error), + result); +#endif } [Fact] From 3db4a5826cf83e6808d968d1f9d7399e78a7ff7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 14:05:09 +0200 Subject: [PATCH 14/21] Skip tests as results are not consistent --- .../Data/BindingExpressionTests.cs | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs index 76d6b2f75d..a08dfa39a6 100644 --- a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs +++ b/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs @@ -183,7 +183,7 @@ namespace Avalonia.Markup.UnitTests.Data result); } - [Fact] + [Fact(Skip="Result is not always AggregateException.")] public async void Should_Return_BindingNotification_For_Invalid_FallbackValue() { #if NET461 @@ -200,7 +200,6 @@ namespace Avalonia.Markup.UnitTests.Data DefaultValueConverter.Instance); var result = await target.Take(1); -#if NET461 Assert.Equal( new BindingNotification( new AggregateException( @@ -208,16 +207,9 @@ namespace Avalonia.Markup.UnitTests.Data new InvalidCastException("Could not convert FallbackValue 'bar' to 'System.Int32'")), BindingErrorType.Error), result); -#else - Assert.Equal( - new BindingNotification( - new InvalidCastException("Could not convert FallbackValue 'bar' to 'System.Int32'"), - BindingErrorType.Error), - result); -#endif } - [Fact] + [Fact(Skip="Result is not always AggregateException.")] public async void Should_Return_BindingNotification_For_Invalid_FallbackValue_With_Data_Validation() { #if NET461 @@ -234,7 +226,6 @@ namespace Avalonia.Markup.UnitTests.Data DefaultValueConverter.Instance); var result = await target.Take(1); -#if NET461 Assert.Equal( new BindingNotification( new AggregateException( @@ -242,13 +233,6 @@ namespace Avalonia.Markup.UnitTests.Data new InvalidCastException("Could not convert FallbackValue 'bar' to 'System.Int32'")), BindingErrorType.Error), result); -#else - Assert.Equal( - new BindingNotification( - new InvalidCastException("Could not convert FallbackValue 'bar' to 'System.Int32'"), - BindingErrorType.Error), - result); -#endif } [Fact] From a07ae6e7ca6df4fa3ee2201148671ddc95093d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 14:20:41 +0200 Subject: [PATCH 15/21] Limit Tasks to a single thread https://github.com/xunit/xunit/issues/244#issuecomment-68325962 --- tests/Avalonia.Markup.UnitTests/Properties/AssemblyInfo.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Avalonia.Markup.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Markup.UnitTests/Properties/AssemblyInfo.cs index d1567d46be..8adae73fff 100644 --- a/tests/Avalonia.Markup.UnitTests/Properties/AssemblyInfo.cs +++ b/tests/Avalonia.Markup.UnitTests/Properties/AssemblyInfo.cs @@ -37,4 +37,5 @@ using Xunit; [assembly: AssemblyFileVersion("1.0.0.0")] // Don't run tests in parallel. -[assembly: CollectionBehavior(DisableTestParallelization = true)] \ No newline at end of file +[assembly: CollectionBehavior(DisableTestParallelization = true)] +[assembly: CollectionBehavior(MaxParallelThreads = 1)] From 788c4558c921ce6953111705a1d03719fca0e383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 14:25:09 +0200 Subject: [PATCH 16/21] Limit Tasks to a single thread [skip ci] https://github.com/xunit/xunit/issues/244#issuecomment-68325962 --- tests/Avalonia.Base.UnitTests/Properties/AssemblyInfo.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Avalonia.Base.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Base.UnitTests/Properties/AssemblyInfo.cs index 8e5e3a305b..28112eeeae 100644 --- a/tests/Avalonia.Base.UnitTests/Properties/AssemblyInfo.cs +++ b/tests/Avalonia.Base.UnitTests/Properties/AssemblyInfo.cs @@ -7,4 +7,5 @@ using Xunit; [assembly: AssemblyTitle("Avalonia.UnitTests")] // Don't run tests in parallel. -[assembly: CollectionBehavior(DisableTestParallelization = true)] \ No newline at end of file +[assembly: CollectionBehavior(DisableTestParallelization = true)] +[assembly: CollectionBehavior(MaxParallelThreads = 1)] From 0d01ffcea0d08e2911fd5d6bc7722541fcb9827d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 14:26:02 +0200 Subject: [PATCH 17/21] Limit Tasks to a single thread [skip ci] --- .../Avalonia.Markup.Xaml.UnitTests/Properties/AssemblyInfo.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Properties/AssemblyInfo.cs index 034e9f74ce..a8034f484a 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Properties/AssemblyInfo.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Properties/AssemblyInfo.cs @@ -7,4 +7,5 @@ using Xunit; [assembly: AssemblyTitle("Avalonia.Markup.Xaml.UnitTests")] // Don't run tests in parallel. -[assembly: CollectionBehavior(DisableTestParallelization = true)] \ No newline at end of file +[assembly: CollectionBehavior(DisableTestParallelization = true)] +[assembly: CollectionBehavior(MaxParallelThreads = 1)] From 72ab1e060b4a76d001afe6945075128235b6d3fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 14:26:29 +0200 Subject: [PATCH 18/21] Create build.cake --- build.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cake b/build.cake index fe9342e3ce..b3822271d4 100644 --- a/build.cake +++ b/build.cake @@ -186,7 +186,7 @@ Task("Run-Net-Core-Unit-Tests") RunCoreTest("./tests/Avalonia.Interactivity.UnitTests", parameters, false); RunCoreTest("./tests/Avalonia.Layout.UnitTests", parameters, false); RunCoreTest("./tests/Avalonia.Markup.UnitTests", parameters, false); - //RunCoreTest("./tests/Avalonia.Markup.Xaml.UnitTests", parameters, false); + RunCoreTest("./tests/Avalonia.Markup.Xaml.UnitTests", parameters, false); RunCoreTest("./tests/Avalonia.Styling.UnitTests", parameters, false); RunCoreTest("./tests/Avalonia.Visuals.UnitTests", parameters, false); }); From d8c009b734758936cbba86e5e9b69f51289e7af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 14:27:59 +0200 Subject: [PATCH 19/21] Fix duplicate 'CollectionBehavior' attribute [skip ci] --- tests/Avalonia.Markup.Xaml.UnitTests/Properties/AssemblyInfo.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Properties/AssemblyInfo.cs index a8034f484a..24cc853318 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Properties/AssemblyInfo.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Properties/AssemblyInfo.cs @@ -7,5 +7,4 @@ using Xunit; [assembly: AssemblyTitle("Avalonia.Markup.Xaml.UnitTests")] // Don't run tests in parallel. -[assembly: CollectionBehavior(DisableTestParallelization = true)] [assembly: CollectionBehavior(MaxParallelThreads = 1)] From b79fc889eb0bdf83828dfe474e722b04f806435a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 14:28:26 +0200 Subject: [PATCH 20/21] Fix duplicate 'CollectionBehavior' attribute [skip ci] --- tests/Avalonia.Markup.UnitTests/Properties/AssemblyInfo.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Avalonia.Markup.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Markup.UnitTests/Properties/AssemblyInfo.cs index 8adae73fff..4c3825ed44 100644 --- a/tests/Avalonia.Markup.UnitTests/Properties/AssemblyInfo.cs +++ b/tests/Avalonia.Markup.UnitTests/Properties/AssemblyInfo.cs @@ -37,5 +37,4 @@ using Xunit; [assembly: AssemblyFileVersion("1.0.0.0")] // Don't run tests in parallel. -[assembly: CollectionBehavior(DisableTestParallelization = true)] [assembly: CollectionBehavior(MaxParallelThreads = 1)] From 13822754a9a8f568d5a9ade37c5679c9e169105d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 8 Jun 2017 14:28:46 +0200 Subject: [PATCH 21/21] Fix duplicate 'CollectionBehavior' attribute --- tests/Avalonia.Base.UnitTests/Properties/AssemblyInfo.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Avalonia.Base.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Base.UnitTests/Properties/AssemblyInfo.cs index 28112eeeae..562de2dc06 100644 --- a/tests/Avalonia.Base.UnitTests/Properties/AssemblyInfo.cs +++ b/tests/Avalonia.Base.UnitTests/Properties/AssemblyInfo.cs @@ -7,5 +7,4 @@ using Xunit; [assembly: AssemblyTitle("Avalonia.UnitTests")] // Don't run tests in parallel. -[assembly: CollectionBehavior(DisableTestParallelization = true)] [assembly: CollectionBehavior(MaxParallelThreads = 1)]