unit test bug fix: culture info

This commit is contained in:
rmcrackan
2026-05-25 10:46:34 -04:00
parent 6bd1ea7ca4
commit 3cf5d0b3fa
2 changed files with 10 additions and 2 deletions

View File

@@ -14,12 +14,14 @@ public record CultureInfoDto : IFormattable
public static CultureInfoDto OfCurrentUi()
{
return new CultureInfoDto(CultureInfo.DefaultThreadCurrentUICulture ?? CultureInfo.CurrentUICulture, CultureInfo.CurrentUICulture.Name, "{N}");
var culture = CultureInfo.CurrentUICulture;
return new CultureInfoDto(culture, culture.Name, "{N}");
}
public static CultureInfoDto OfCurrentOs()
{
return new CultureInfoDto(CultureInfo.DefaultThreadCurrentCulture ?? CultureInfo.CurrentCulture, CultureInfo.CurrentCulture.Name, "{N}");
var culture = CultureInfo.CurrentCulture;
return new CultureInfoDto(culture, culture.Name, "{N}");
}
public CultureInfoDto(string hint) : this(hint, "{O}")

View File

@@ -954,8 +954,12 @@ namespace TemplatesTests
var old = Thread.CurrentThread.CurrentCulture;
var oldUi = Thread.CurrentThread.CurrentUICulture;
var oldDefault = CultureInfo.DefaultThreadCurrentCulture;
var oldDefaultUi = CultureInfo.DefaultThreadCurrentUICulture;
try
{
CultureInfo.DefaultThreadCurrentCulture = null;
CultureInfo.DefaultThreadCurrentUICulture = null;
Thread.CurrentThread.CurrentCulture = new CultureInfo("sv-SE");
Thread.CurrentThread.CurrentUICulture = new CultureInfo("es-ES");
Templates.TryGetTemplate<Templates.FileTemplate>(template, out var fileTemplate).Should().BeTrue();
@@ -966,6 +970,8 @@ namespace TemplatesTests
{
Thread.CurrentThread.CurrentCulture = old;
Thread.CurrentThread.CurrentUICulture = oldUi;
CultureInfo.DefaultThreadCurrentCulture = oldDefault;
CultureInfo.DefaultThreadCurrentUICulture = oldDefaultUi;
}
result.Should().Be(expected);