From 0440794d79a6677ec8c84d380d75daa15cbdc231 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 25 Oct 2017 23:27:13 -0500 Subject: [PATCH] Clean up tests and fix PR feedback. --- .../Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs | 1 - .../Xaml/BindingTests_RelativeSource.cs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs index 58637d26c9..ee8ce03288 100644 --- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs +++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs @@ -128,7 +128,6 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions else if (relativeSourceMode == "parent") { relativeSource.Mode = RelativeSourceMode.FindAncestor; - relativeSource.AncestorType = typeof(IControl); relativeSource.AncestorLevel = 1; } else if (relativeSourceMode.StartsWith("parent[")) diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs index 8bd042e98a..8ff802f96b 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs @@ -152,7 +152,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml // This isn't needed in `Binding_To_First_Ancestor_Without_AncestorType_Uses_LogicalTree` - // why is it needed to get non-null value here? - contentControl.ApplyTemplate(); + //contentControl.ApplyTemplate(); Assert.Equal("contentControl", button.Content); }