diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs index c53dc417b0..f93caa4adf 100644 --- a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs +++ b/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs @@ -14,7 +14,7 @@ using Xunit; namespace Avalonia.Markup.UnitTests.Data { - public class BindingExpressionTests + public class BindingExpressionTests : IClassFixture { [Fact] public async void Should_Get_Simple_Property_Value() diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_DataValidation.cs b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_DataValidation.cs index fb98144647..546cfe015f 100644 --- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_DataValidation.cs +++ b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_DataValidation.cs @@ -13,7 +13,7 @@ using Xunit; namespace Avalonia.Markup.UnitTests.Data { - public class ExpressionObserverTests_DataValidation + public class ExpressionObserverTests_DataValidation : IClassFixture { [Fact] public void Doesnt_Send_DataValidationError_When_DataValidatation_Not_Enabled() diff --git a/tests/Avalonia.Markup.UnitTests/Data/Plugins/DataAnnotationsValidationPluginTests.cs b/tests/Avalonia.Markup.UnitTests/Data/Plugins/DataAnnotationsValidationPluginTests.cs index b873971e7f..3002dc516f 100644 --- a/tests/Avalonia.Markup.UnitTests/Data/Plugins/DataAnnotationsValidationPluginTests.cs +++ b/tests/Avalonia.Markup.UnitTests/Data/Plugins/DataAnnotationsValidationPluginTests.cs @@ -6,11 +6,12 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using Avalonia.Data; using Avalonia.Markup.Data.Plugins; +using Avalonia.UnitTests; using Xunit; namespace Avalonia.Markup.UnitTests.Data.Plugins { - public class DataAnnotationsValidationPluginTests + public class DataAnnotationsValidationPluginTests : IClassFixture { [Fact] public void Should_Match_Property_With_ValidatorAttribute() diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj index e5c5fe68b7..56b2dc6850 100644 --- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj +++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj @@ -54,6 +54,7 @@ + diff --git a/tests/Avalonia.UnitTests/InvariantCultureFixture.cs b/tests/Avalonia.UnitTests/InvariantCultureFixture.cs new file mode 100644 index 0000000000..f82afa5397 --- /dev/null +++ b/tests/Avalonia.UnitTests/InvariantCultureFixture.cs @@ -0,0 +1,33 @@ +// Copyright (c) The Avalonia Project. All rights reserved. +// Licensed under the MIT license. See licence.md file in the project root for full license information. + +using System; +using System.Globalization; +using System.Threading; + +namespace Avalonia.UnitTests +{ + /// + /// Runs tests in the invariant culture. + /// + /// + /// Some tests check exception messages, and those from the .NET framework will be translated. + /// Use this fixture to set the current culture to the invariant culture. + /// + public class InvariantCultureFixture : IDisposable + { + private CultureInfo _restore; + + public InvariantCultureFixture() + { + _restore = Thread.CurrentThread.CurrentUICulture; + Thread.CurrentThread.CurrentUICulture = + Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; + } + + public void Dispose() + { + Thread.CurrentThread.CurrentUICulture = Thread.CurrentThread.CurrentCulture = _restore; + } + } +}