From 538f972dfa5018992bc9b865d9a25ff1685828a8 Mon Sep 17 00:00:00 2001 From: Andreas Gullberg Larsen Date: Tue, 8 May 2018 21:08:14 +0200 Subject: [PATCH] UnitSystemTests: Add try-finally --- UnitsNet.Tests/UnitSystemTests.cs | 35 ++++++++++++++++++------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/UnitsNet.Tests/UnitSystemTests.cs b/UnitsNet.Tests/UnitSystemTests.cs index ae4255f7c9..9068396212 100644 --- a/UnitsNet.Tests/UnitSystemTests.cs +++ b/UnitsNet.Tests/UnitSystemTests.cs @@ -409,27 +409,32 @@ public void GetDefaultAbbreviationFallsBackToDefaultStringIfNotSpecified() [Fact] public void GetDefaultAbbreviationFallsBackToUsEnglishCulture() { - // CurrentCulture affects number formatting, such as comma or dot as decimal separator. - // CurrentUICulture affects localization, in this case the abbreviation. - // Zulu (South Africa) CultureInfo oldCurrentCulture = CultureInfo.CurrentCulture; CultureInfo oldCurrentUICulture = CultureInfo.CurrentUICulture; - var zuluCulture = new CultureInfo("zu-ZA"); - UnitSystem zuluUnits = UnitSystem.GetCached(zuluCulture); - CultureInfo.CurrentCulture = CultureInfo.CurrentUICulture = zuluCulture; - - UnitSystem usUnits = UnitSystem.GetCached(AmericanCultureName); - usUnits.MapUnitToAbbreviation(CustomUnit.Unit1, "US english abbreviation for Unit1"); + try + { + // CurrentCulture affects number formatting, such as comma or dot as decimal separator. + // CurrentUICulture affects localization, in this case the abbreviation. + // Zulu (South Africa) + var zuluCulture = new CultureInfo("zu-ZA"); + UnitSystem zuluUnits = UnitSystem.GetCached(zuluCulture); + CultureInfo.CurrentCulture = CultureInfo.CurrentUICulture = zuluCulture; - // Act - string abbreviation = zuluUnits.GetDefaultAbbreviation(CustomUnit.Unit1); + UnitSystem usUnits = UnitSystem.GetCached(AmericanCultureName); + usUnits.MapUnitToAbbreviation(CustomUnit.Unit1, "US english abbreviation for Unit1"); - // Assert - Assert.Equal("US english abbreviation for Unit1", abbreviation); + // Act + string abbreviation = zuluUnits.GetDefaultAbbreviation(CustomUnit.Unit1); - CultureInfo.CurrentCulture = oldCurrentCulture; - CultureInfo.CurrentUICulture = oldCurrentUICulture; + // Assert + Assert.Equal("US english abbreviation for Unit1", abbreviation); + } + finally + { + CultureInfo.CurrentCulture = oldCurrentCulture; + CultureInfo.CurrentUICulture = oldCurrentUICulture; + } } [Fact]