Browse Source
Merge pull request #9728 from AvaloniaUI/fixes/flaky-tests
A few small fixes for flaky tests
pull/9737/head
Max Katz
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
17 additions and
0 deletions
-
tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs
-
tests/Avalonia.Markup.Xaml.UnitTests/Xaml/MergeResourceIncludeTests.cs
-
tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleIncludeTests.cs
|
|
|
@ -166,6 +166,8 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data |
|
|
|
[Fact] |
|
|
|
public void Binding_Method_To_Command_Collected() |
|
|
|
{ |
|
|
|
using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface); |
|
|
|
|
|
|
|
WeakReference<ViewModel> MakeRef() |
|
|
|
{ |
|
|
|
var weakVm = new WeakReference<ViewModel>(null); |
|
|
|
|
|
|
|
@ -1,6 +1,8 @@ |
|
|
|
using System; |
|
|
|
using System.Runtime.CompilerServices; |
|
|
|
using System.Xml; |
|
|
|
using Avalonia.Controls; |
|
|
|
using Avalonia.Data; |
|
|
|
using Avalonia.Media; |
|
|
|
using Avalonia.Styling; |
|
|
|
using Xunit; |
|
|
|
@ -9,6 +11,11 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml; |
|
|
|
|
|
|
|
public class MergeResourceIncludeTests |
|
|
|
{ |
|
|
|
static MergeResourceIncludeTests() |
|
|
|
{ |
|
|
|
RuntimeHelpers.RunClassConstructor(typeof(RelativeSource).TypeHandle); |
|
|
|
} |
|
|
|
|
|
|
|
[Fact] |
|
|
|
public void MergeResourceInclude_Works_With_Single_Resource() |
|
|
|
{ |
|
|
|
|
|
|
|
@ -1,7 +1,9 @@ |
|
|
|
using System; |
|
|
|
using System.Collections.Generic; |
|
|
|
using System.Linq; |
|
|
|
using System.Runtime.CompilerServices; |
|
|
|
using Avalonia.Controls; |
|
|
|
using Avalonia.Data; |
|
|
|
using Avalonia.Markup.Xaml.Styling; |
|
|
|
using Avalonia.Markup.Xaml.XamlIl.Runtime; |
|
|
|
using Avalonia.Media; |
|
|
|
@ -15,6 +17,12 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml; |
|
|
|
|
|
|
|
public class StyleIncludeTests |
|
|
|
{ |
|
|
|
static StyleIncludeTests() |
|
|
|
{ |
|
|
|
RuntimeHelpers.RunClassConstructor(typeof(RelativeSource).TypeHandle); |
|
|
|
AssetLoader.RegisterResUriParsers(); |
|
|
|
} |
|
|
|
|
|
|
|
[Fact] |
|
|
|
public void StyleInclude_Is_Built() |
|
|
|
{ |
|
|
|
|