From 48f0c055228a59b30d0935eeb5b9066573bda7e0 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sun, 25 Jun 2017 19:05:21 +0200 Subject: [PATCH] Fix BindingNotification.ClearValue. It should have been setting it to `UnsetValue` not null. This allows two skipped tests to pass. --- src/Avalonia.Base/Data/BindingNotification.cs | 2 +- .../Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Avalonia.Base/Data/BindingNotification.cs b/src/Avalonia.Base/Data/BindingNotification.cs index 4cae0e6afa..125c29b21b 100644 --- a/src/Avalonia.Base/Data/BindingNotification.cs +++ b/src/Avalonia.Base/Data/BindingNotification.cs @@ -226,7 +226,7 @@ namespace Avalonia.Data /// public void ClearValue() { - _value = null; + _value = AvaloniaProperty.UnsetValue; } /// diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs index 370e3b51e6..f5c0c6ec15 100644 --- a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs +++ b/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs @@ -171,7 +171,7 @@ namespace Avalonia.Markup.UnitTests.Data GC.KeepAlive(data); } - [Fact(Skip="Result is not always AggregateException.")] + [Fact] public async Task Should_Return_BindingNotification_For_Invalid_FallbackValue() { var data = new Class1 { StringValue = "foo" }; @@ -193,7 +193,7 @@ namespace Avalonia.Markup.UnitTests.Data GC.KeepAlive(data); } - [Fact(Skip="Result is not always AggregateException.")] + [Fact] public async Task Should_Return_BindingNotification_For_Invalid_FallbackValue_With_Data_Validation() { var data = new Class1 { StringValue = "foo" };