Browse Source

Merge branch 'fixes/1035-reenable-skipped-tests' into fixes/787-contentpresenter-updatechild

pull/1032/head
Steven Kirk 9 years ago
parent
commit
d3dac57297
  1. 2
      src/Avalonia.Base/Data/BindingNotification.cs
  2. 4
      tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs

2
src/Avalonia.Base/Data/BindingNotification.cs

@ -226,7 +226,7 @@ namespace Avalonia.Data
/// </summary>
public void ClearValue()
{
_value = null;
_value = AvaloniaProperty.UnsetValue;
}
/// <summary>

4
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" };

Loading…
Cancel
Save