From ed375b578008586617ec5380e9fc5dd03d6f4b79 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 27 May 2020 18:53:49 -0300 Subject: [PATCH] Allow tests to pass as we expect a KeyNotFound exceptions. --- .../MarkupExtensions/ResourceIncludeTests.cs | 10 +++++++++- .../StyleIncludeTests.cs | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs index e827627938..1514d5bd95 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using Avalonia.Controls; using Avalonia.Media; using Avalonia.UnitTests; @@ -70,7 +71,14 @@ namespace Avalonia.Markup.Xaml.UnitTests.MakrupExtensions var loader = new AvaloniaXamlLoader(); var app = Application.Current; - loader.Load(xaml, null, app); + try + { + loader.Load(xaml, null, app); + } + catch (KeyNotFoundException) + { + + } } } diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/StyleIncludeTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/StyleIncludeTests.cs index f4e96942a3..dca936d229 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/StyleIncludeTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/StyleIncludeTests.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using Avalonia.UnitTests; using Xunit; @@ -30,7 +31,14 @@ namespace Avalonia.Markup.Xaml.UnitTests var loader = new AvaloniaXamlLoader(); var app = Application.Current; - loader.Load(xaml, null, app); + try + { + loader.Load(xaml, null, app); + } + catch (KeyNotFoundException) + { + + } } }