aecw/osu-framework
1
0
Fork 0
mirror of https://github.com/SK-la/osu-framework.git synced 2026-03-13 11:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make LocalisationManager IDisposable to allow reuse in tests

Browse Source
This commit is contained in:
Susko3
2022-08-08 15:23:43 +02:00
parent fb3ce9c572
commit 44f5d1251a
7 changed files with 45 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Framework.Benchmarks/BenchmarkLocalisedBindableString.cs
View File

@@ -25,6 +25,7 @@ namespace osu.Framework.Benchmarks
[GlobalCleanup]
public void GlobalCleanup()
{
manager.Dispose();
storage.Dispose();
}

8
osu.Framework.Tests/Localisation/LocalisationTest.cs
View File

@@ -31,10 +31,18 @@ namespace osu.Framework.Tests.Localisation
manager.AddLanguage("en", new FakeStorage("en"));
}
[TearDown]
public void Teardown()
{
manager?.Dispose();
config?.Dispose();
}
[Test]
public void TestNoLanguagesAdded()
{
// reinitialise without the default language
manager.Dispose();
manager = new LocalisationManager(config);
var localisedText = manager.GetLocalisedBindableString(new TranslatableString(FakeStorage.LOCALISABLE_STRING_EN, FakeStorage.LOCALISABLE_STRING_EN));

6
osu.Framework.Tests/Visual/Localisation/TestSceneTextFlowContainerLocalisation.cs
View File

@@ -74,6 +74,12 @@ namespace osu.Framework.Tests.Visual.Localisation
}));
}
protected override void Dispose(bool isDisposing)
{
manager?.Dispose();
base.Dispose(isDisposing);
}
[Test]
public void TestTextFlowLocalisation()
{

6
osu.Framework.Tests/Visual/Sprites/TestSceneSpriteTextScenarios.cs
View File

@@ -259,6 +259,12 @@ namespace osu.Framework.Tests.Visual.Sprites
config.SetValue(FrameworkSetting.Locale, "ja");
}
protected override void Dispose(bool isDisposing)
{
localisation?.Dispose();
base.Dispose(isDisposing);
}
}
private class FakeFrameworkConfigManager : FrameworkConfigManager

6
osu.Framework.Tests/Visual/UserInterface/TestSceneSearchContainer.cs
View File

@@ -56,6 +56,12 @@ namespace osu.Framework.Tests.Visual.UserInterface
return dependencies;
}
protected override void Dispose(bool isDisposing)
{
manager?.Dispose();
base.Dispose(isDisposing);
}
private const string goodbye = "goodbye";
[SetUp]

3
osu.Framework/Game.cs
View File

@@ -447,6 +447,9 @@ namespace osu.Framework
localFonts?.Dispose();
localFonts = null;
Localisation?.Dispose();
Localisation = null;
}
}
}

16
osu.Framework/Localisation/LocalisationManager.cs
View File

@@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Generic;
using System.Globalization;
using osu.Framework.Bindables;
@@ -8,7 +9,7 @@ using osu.Framework.Configuration;
namespace osu.Framework.Localisation
{
public partial class LocalisationManager
public partial class LocalisationManager : IDisposable
{
public IBindable<LocalisationParameters> CurrentParameters => currentParameters;
@@ -119,5 +120,18 @@ namespace osu.Framework.Localisation
/// </remarks>
/// <returns>The resultant <see cref="LocalisationParameters"/>.</returns>
protected virtual LocalisationParameters CreateLocalisationParameters() => new LocalisationParameters(currentLocale?.Storage, configPreferUnicode.Value);
protected virtual void Dispose(bool disposing)
{
currentParameters.UnbindAll();
configLocale.UnbindAll();
configPreferUnicode.UnbindAll();
}
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
}
}