diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ConverterTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ConverterTests.cs index 6ffaaaee5c..b424003ed6 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ConverterTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ConverterTests.cs @@ -3,7 +3,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Converters { - public class ConverterTests + public class ConverterTests : XamlTestBase { [Fact] public void Bug_2228_Relative_Uris_Should_Be_Correctly_Parsed() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/NullableConverterTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/NullableConverterTests.cs index bb44d069b5..cdd40ed80f 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/NullableConverterTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/NullableConverterTests.cs @@ -11,7 +11,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Converters public Orientation? Orientation { get; set; } } - public class NullableConverterTests + public class NullableConverterTests : XamlTestBase { [Fact] public void Nullable_Types_Should_Still_Be_Converted_Properly() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ValueConverterTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ValueConverterTests.cs index 6f2c4363e2..5e698117c3 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ValueConverterTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ValueConverterTests.cs @@ -8,7 +8,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Converters { - public class ValueConverterTests + public class ValueConverterTests : XamlTestBase { [Fact] public void ValueConverter_Special_Values_Work() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs index e412657711..5972920af3 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs @@ -8,7 +8,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Data { - public class BindingTests + public class BindingTests : XamlTestBase { [Fact] public void Binding_With_Null_Path_Works() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs index 0d96df8eb8..db45f1989b 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs @@ -10,7 +10,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Data { - public class BindingTests_Method + public class BindingTests_Method : XamlTestBase { [Fact] public void Binding_Method_To_Command_Works() @@ -102,4 +102,4 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data public string Value { get; private set; } = "Not called"; } } -} \ No newline at end of file +} diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs index a9bea01fde..86ca351d67 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs @@ -10,7 +10,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Data { - public class BindingTests_TemplatedParent + public class BindingTests_TemplatedParent : XamlTestBase { [Fact] public void TemplateBinding_With_Null_Path_Works() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs index dcecfe3b22..93cad9a68e 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs @@ -10,7 +10,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions { - public class BindingExtensionTests + public class BindingExtensionTests : XamlTestBase { [Fact] diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs index ed70cd6fe8..96955539c1 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs @@ -15,7 +15,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions { - public class DynamicResourceExtensionTests + public class DynamicResourceExtensionTests : XamlTestBase { [Fact] public void DynamicResource_Can_Be_Assigned_To_Property() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs index a35c7bdd9b..7ab6c2de40 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs @@ -8,7 +8,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MakrupExtensions { public class ResourceIncludeTests { - public class StaticResourceExtensionTests + public class StaticResourceExtensionTests : XamlTestBase { [Fact] public void ResourceInclude_Loads_ResourceDictionary() @@ -52,4 +52,4 @@ namespace Avalonia.Markup.Xaml.UnitTests.MakrupExtensions } } } -} \ No newline at end of file +} diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs index 7a96b9f989..58985af0ad 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs @@ -14,7 +14,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions { - public class StaticResourceExtensionTests + public class StaticResourceExtensionTests : XamlTestBase { [Fact] public void StaticResource_Can_Be_Assigned_To_Property() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/StyleTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/StyleTests.cs index f4c3302d52..2dc6c4a7fb 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/StyleTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/StyleTests.cs @@ -12,7 +12,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests { - public class StyleTests + public class StyleTests : XamlTestBase { [Fact] public void Binding_Should_Be_Assigned_To_Setter_Value_Instead_Of_Bound() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs index d74eed992e..f4d4a9dd2a 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs @@ -22,7 +22,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Xaml { - public class BasicTests + public class BasicTests : XamlTestBase { [Fact] public void Simple_Property_Is_Set() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs index 3930608515..7281542bc1 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs @@ -8,7 +8,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Xaml { - public class BindingTests + public class BindingTests : XamlTestBase { [Fact] public void Binding_To_DataContext_Works() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs index c6fe79bc0c..86b874f75c 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs @@ -8,7 +8,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Xaml { - public class BindingTests_RelativeSource + public class BindingTests_RelativeSource : XamlTestBase { [Fact] public void Binding_To_DataContext_Works() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs index bd9d99ff23..0850f3fa78 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs @@ -4,14 +4,13 @@ using System.Collections.Generic; using Avalonia.Controls; using Avalonia.Controls.Primitives; -using Avalonia.Layout; using Avalonia.Logging; using Avalonia.UnitTests; using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Xaml { - public class ControlBindingTests + public class ControlBindingTests : XamlTestBase { [Fact] public void Binding_ProgressBar_Value_To_Invalid_Value_Uses_FallbackValue() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs index 6b67303b07..4f2886582d 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs @@ -8,7 +8,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Xaml { - public class DataTemplateTests + public class DataTemplateTests : XamlTestBase { [Fact] public void DataTemplate_Can_Contain_Name() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs index 44697f5937..dcb6533b5e 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs @@ -9,7 +9,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Xaml { - public class EventTests + public class EventTests : XamlTestBase { [Fact] public void Event_Is_Attached() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs index 8dd1d24dd6..b76022852c 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs @@ -12,7 +12,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Xaml { - public class StyleTests + public class StyleTests : XamlTestBase { [Fact] public void Color_Can_Be_Added_To_Style_Resources() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs index 4134f5be23..f5fed02899 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs @@ -4,14 +4,13 @@ using System.Linq; using Avalonia.Controls.Templates; using Avalonia.Data; -using Avalonia.Markup.Data; using Avalonia.Markup.Xaml.Templates; using Avalonia.UnitTests; using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Xaml { - public class TreeDataTemplateTests + public class TreeDataTemplateTests : XamlTestBase { [Fact] public void Binding_Should_Be_Assigned_To_ItemsSource_Instead_Of_Bound() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs index 1f135f8e76..4ff9e3db38 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs @@ -5,10 +5,7 @@ using System.Globalization; using System.Linq; using System.Runtime.CompilerServices; using Avalonia.Controls; -using Avalonia.Controls.Presenters; using Avalonia.Data.Converters; -using Avalonia.Input; -using Avalonia.Interactivity; using Avalonia.Media; using Avalonia.Threading; using Avalonia.UnitTests; @@ -18,7 +15,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests { - public class XamlIlTests + public class XamlIlTests : XamlTestBase { [Fact] public void Binding_Button_IsPressed_ShouldWork() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/XamlTestBase.cs b/tests/Avalonia.Markup.Xaml.UnitTests/XamlTestBase.cs new file mode 100644 index 0000000000..5172b2e830 --- /dev/null +++ b/tests/Avalonia.Markup.Xaml.UnitTests/XamlTestBase.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Text; +using Avalonia.Data; + +namespace Avalonia.Markup.Xaml.UnitTests +{ + public class XamlTestBase + { + public XamlTestBase() + { + // Ensure necessary assemblies are loaded. + var _ = typeof(TemplateBinding); + } + } +}