Browse Source

Merge pull request #9728 from AvaloniaUI/fixes/flaky-tests

A few small fixes for flaky tests
pull/9737/head
Max Katz 4 years ago
committed by GitHub
parent
commit
145c4ae5f3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs
  2. 7
      tests/Avalonia.Markup.Xaml.UnitTests/Xaml/MergeResourceIncludeTests.cs
  3. 8
      tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleIncludeTests.cs

2
tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs

@ -166,6 +166,8 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
[Fact] [Fact]
public void Binding_Method_To_Command_Collected() public void Binding_Method_To_Command_Collected()
{ {
using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
WeakReference<ViewModel> MakeRef() WeakReference<ViewModel> MakeRef()
{ {
var weakVm = new WeakReference<ViewModel>(null); var weakVm = new WeakReference<ViewModel>(null);

7
tests/Avalonia.Markup.Xaml.UnitTests/Xaml/MergeResourceIncludeTests.cs

@ -1,6 +1,8 @@
using System; using System;
using System.Runtime.CompilerServices;
using System.Xml; using System.Xml;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Data;
using Avalonia.Media; using Avalonia.Media;
using Avalonia.Styling; using Avalonia.Styling;
using Xunit; using Xunit;
@ -9,6 +11,11 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml;
public class MergeResourceIncludeTests public class MergeResourceIncludeTests
{ {
static MergeResourceIncludeTests()
{
RuntimeHelpers.RunClassConstructor(typeof(RelativeSource).TypeHandle);
}
[Fact] [Fact]
public void MergeResourceInclude_Works_With_Single_Resource() public void MergeResourceInclude_Works_With_Single_Resource()
{ {

8
tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleIncludeTests.cs

@ -1,7 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.CompilerServices;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Data;
using Avalonia.Markup.Xaml.Styling; using Avalonia.Markup.Xaml.Styling;
using Avalonia.Markup.Xaml.XamlIl.Runtime; using Avalonia.Markup.Xaml.XamlIl.Runtime;
using Avalonia.Media; using Avalonia.Media;
@ -15,6 +17,12 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml;
public class StyleIncludeTests public class StyleIncludeTests
{ {
static StyleIncludeTests()
{
RuntimeHelpers.RunClassConstructor(typeof(RelativeSource).TypeHandle);
AssetLoader.RegisterResUriParsers();
}
[Fact] [Fact]
public void StyleInclude_Is_Built() public void StyleInclude_Is_Built()
{ {

Loading…
Cancel
Save