-
Notifications
You must be signed in to change notification settings - Fork 260
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[PROTOTYPE] Implement TestCultureAttribute #4055
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
// Copyright (c) Microsoft Corporation. All rights reserved. | ||
// Licensed under the MIT license. See LICENSE file in the project root for full license information. | ||
|
||
namespace Microsoft.VisualStudio.TestTools.UnitTesting; | ||
|
||
/// <summary> | ||
/// Attribute to specify the CultureInfo.CurrentCulture and CultureInfo.CurrentUICulture when running the test. | ||
/// </summary> | ||
[AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)] | ||
public sealed class TestCultureAttribute : Attribute | ||
{ | ||
/// <summary> | ||
/// Initializes a new instance of the <see cref="TestCultureAttribute"/> class. | ||
/// </summary> | ||
/// <param name="cultureName"> | ||
/// The culture to be used for the test. For example, "en-US". | ||
/// </param> | ||
public TestCultureAttribute(string cultureName) => CultureName = cultureName; | ||
|
||
/// <summary> | ||
/// Gets the owner. | ||
/// </summary> | ||
public string CultureName { get; } | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,8 @@ | ||
// Copyright (c) Microsoft Corporation. All rights reserved. | ||
// Licensed under the MIT license. See LICENSE file in the project root for full license information. | ||
|
||
using System.Globalization; | ||
|
||
namespace Microsoft.VisualStudio.TestTools.UnitTesting; | ||
|
||
/// <summary> | ||
|
@@ -9,6 +11,29 @@ | |
[AttributeUsage(AttributeTargets.Method)] | ||
public class TestMethodAttribute : Attribute | ||
{ | ||
private protected readonly struct ScopedCultureDisposable : IDisposable | ||
{ | ||
private readonly CultureInfo _previousCulture; | ||
private readonly CultureInfo _previousUICulture; | ||
|
||
public ScopedCultureDisposable(string cultureName) | ||
{ | ||
_previousCulture = CultureInfo.CurrentCulture; | ||
_previousUICulture = CultureInfo.CurrentUICulture; | ||
|
||
var newCulture = new CultureInfo(cultureName); | ||
// TODO: Should we set both? Should we have different attribute? Same attribute with two arguments? | ||
CultureInfo.CurrentCulture = newCulture; | ||
Youssef1313 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
CultureInfo.CurrentUICulture = newCulture; | ||
} | ||
|
||
public void Dispose() | ||
{ | ||
CultureInfo.CurrentCulture = _previousCulture; | ||
CultureInfo.CurrentUICulture = _previousUICulture; | ||
} | ||
} | ||
|
||
/// <summary> | ||
/// Initializes a new instance of the <see cref="TestMethodAttribute"/> class. | ||
/// </summary> | ||
|
@@ -36,5 +61,19 @@ | |
/// <param name="testMethod">The test method to execute.</param> | ||
/// <returns>An array of TestResult objects that represent the outcome(s) of the test.</returns> | ||
/// <remarks>Extensions can override this method to customize running a TestMethod.</remarks> | ||
public virtual TestResult[] Execute(ITestMethod testMethod) => [testMethod.Invoke(null)]; | ||
public virtual TestResult[] Execute(ITestMethod testMethod) | ||
{ | ||
using (SetCultureForTest(testMethod)) | ||
{ | ||
return [testMethod.Invoke(null)]; | ||
} | ||
} | ||
|
||
// TestMethodInfo isn't accessible here :/ | ||
// Can we add TestCultureName to the *public* interface? | ||
// Or should we introduce an internal interface ITestMethod2 : ITestMethod :/ | ||
Comment on lines
+72
to
+74
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. cc @Evangelink |
||
private protected static ScopedCultureDisposable? SetCultureForTest(ITestMethod testMethod) | ||
=> testMethod is TestMethodInfo testMethodInfo && testMethodInfo.TestCultureName is { } culture | ||
Check failure on line 76 in src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs Azure Pipelines / microsoft.testfx (Build Linux Release)src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs#L76
Check failure on line 76 in src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs Azure Pipelines / microsoft.testfx (Build Linux Release)src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs#L76
Check failure on line 76 in src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs Azure Pipelines / microsoft.testfx (Build Linux Release)src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs#L76
Check failure on line 76 in src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs Azure Pipelines / microsoft.testfx (Build Linux Release)src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs#L76
Check failure on line 76 in src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs Azure Pipelines / microsoft.testfx (Build Linux Release)src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs#L76
Check failure on line 76 in src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs Azure Pipelines / microsoft.testfx (Build Linux Debug)src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs#L76
Check failure on line 76 in src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs Azure Pipelines / microsoft.testfx (Build Linux Debug)src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs#L76
Check failure on line 76 in src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs Azure Pipelines / microsoft.testfx (Build Linux Debug)src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs#L76
Check failure on line 76 in src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs Azure Pipelines / microsoft.testfx (Build Linux Debug)src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs#L76
Check failure on line 76 in src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs Azure Pipelines / microsoft.testfx (Build Linux Debug)src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs#L76
Check failure on line 76 in src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs Azure Pipelines / microsoft.testfxsrc/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs#L76
Check failure on line 76 in src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs Azure Pipelines / microsoft.testfxsrc/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs#L76
Check failure on line 76 in src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs Azure Pipelines / microsoft.testfxsrc/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs#L76
Check failure on line 76 in src/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs Azure Pipelines / microsoft.testfxsrc/TestFramework/TestFramework/Attributes/TestMethod/TestMethodAttribute.cs#L76
|
||
? new ScopedCultureDisposable(culture) | ||
: (ScopedCultureDisposable?)null; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,4 @@ | ||
#nullable enable | ||
Microsoft.VisualStudio.TestTools.UnitTesting.TestCultureAttribute | ||
Microsoft.VisualStudio.TestTools.UnitTesting.TestCultureAttribute.CultureName.get -> string! | ||
Microsoft.VisualStudio.TestTools.UnitTesting.TestCultureAttribute.TestCultureAttribute(string! cultureName) -> void |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This needs to be discussed first.