Skip to content

Commit 74e54cf

Browse files
committed
Use instance of UnitAbbrevationsCache in test
It broke other tests depending on sequence of running tests.
1 parent f914132 commit 74e54cf

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

UnitsNet.Tests/UnitAbbreviationsCacheTests.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,10 +283,11 @@ public void GetDefaultAbbreviationFallsBackToUsEnglishCulture()
283283
var zuluCulture = new CultureInfo("zu-ZA");
284284
CultureInfo.CurrentCulture = CultureInfo.CurrentUICulture = zuluCulture;
285285

286-
UnitAbbreviationsCache.Default.MapUnitToAbbreviation(CustomUnit.Unit1, AmericanCulture, "US english abbreviation for Unit1");
286+
var abbreviationsCache = new UnitAbbreviationsCache();
287+
abbreviationsCache.MapUnitToAbbreviation(CustomUnit.Unit1, AmericanCulture, "US english abbreviation for Unit1");
287288

288289
// Act
289-
string abbreviation = UnitAbbreviationsCache.Default.GetDefaultAbbreviation(CustomUnit.Unit1, zuluCulture);
290+
string abbreviation = abbreviationsCache.GetDefaultAbbreviation(CustomUnit.Unit1, zuluCulture);
290291

291292
// Assert
292293
Assert.Equal("US english abbreviation for Unit1", abbreviation);
@@ -301,9 +302,10 @@ public void GetDefaultAbbreviationFallsBackToUsEnglishCulture()
301302
[Fact]
302303
public void MapUnitToAbbreviation_AddCustomUnit_DoesNotOverrideDefaultAbbreviationForAlreadyMappedUnits()
303304
{
304-
UnitAbbreviationsCache.Default.MapUnitToAbbreviation(AreaUnit.SquareMeter, AmericanCulture, "m^2");
305+
var cache = new UnitAbbreviationsCache();
306+
cache.MapUnitToAbbreviation(AreaUnit.SquareMeter, AmericanCulture, "m^2");
305307

306-
Assert.Equal("m²", UnitAbbreviationsCache.Default.GetDefaultAbbreviation(AreaUnit.SquareMeter));
308+
Assert.Equal("m²", cache.GetDefaultAbbreviation(AreaUnit.SquareMeter));
307309
}
308310

309311
/// <summary>

UnitsNet.Tests/UnitParserTests.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,12 @@ public class UnitParserTests
3232
[InlineData("cm^^2", AreaUnit.SquareCentimeter)]
3333
public void Parse_ReturnsUnitMappedByCustomAbbreviation(string customAbbreviation, AreaUnit expected)
3434
{
35-
UnitAbbreviationsCache.Default.MapUnitToAbbreviation(expected, customAbbreviation);
35+
var abbrevCache = new UnitAbbreviationsCache();
36+
abbrevCache.MapUnitToAbbreviation(expected, customAbbreviation);
37+
var parser = new UnitParser(abbrevCache);
38+
39+
var actual = parser.Parse<AreaUnit>(customAbbreviation);
3640

37-
var actual = UnitParser.Default.Parse<AreaUnit>(customAbbreviation);
3841
Assert.Equal(expected, actual);
3942
}
4043

0 commit comments

Comments
 (0)