Revert local registrations in test scenes

This commit is contained in:
Dean Herbert 2022-02-18 16:52:14 +09:00
parent cf1dd1ebd3
commit 3abbf07fb3
8 changed files with 0 additions and 45 deletions

View File

@ -8,7 +8,6 @@
using osu.Game.Beatmaps.Formats; using osu.Game.Beatmaps.Formats;
using osu.Game.IO; using osu.Game.IO;
using osu.Game.IO.Archives; using osu.Game.IO.Archives;
using osu.Game.Rulesets;
using osu.Game.Tests.Resources; using osu.Game.Tests.Resources;
namespace osu.Game.Benchmarks namespace osu.Game.Benchmarks
@ -19,8 +18,6 @@ public class BenchmarkBeatmapParsing : BenchmarkTest
public override void SetUp() public override void SetUp()
{ {
Decoder.RegisterDependencies(new AssemblyRulesetStore());
using (var resources = new DllResourceStore(typeof(TestResources).Assembly)) using (var resources = new DllResourceStore(typeof(TestResources).Assembly))
using (var archive = resources.GetStream("Resources/Archives/241526 Soleily - Renatus.osz")) using (var archive = resources.GetStream("Resources/Archives/241526 Soleily - Renatus.osz"))
using (var reader = new ZipArchiveReader(archive)) using (var reader = new ZipArchiveReader(archive))

View File

@ -18,12 +18,6 @@ namespace osu.Game.Rulesets.Osu.Tests
[TestFixture] [TestFixture]
public class StackingTest public class StackingTest
{ {
[SetUp]
public void SetUp()
{
Decoder.RegisterDependencies(new AssemblyRulesetStore());
}
[Test] [Test]
public void TestStacking() public void TestStacking()
{ {

View File

@ -11,7 +11,6 @@
using osu.Game.Beatmaps.Legacy; using osu.Game.Beatmaps.Legacy;
using osu.Game.Beatmaps.Timing; using osu.Game.Beatmaps.Timing;
using osu.Game.IO; using osu.Game.IO;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Catch; using osu.Game.Rulesets.Catch;
using osu.Game.Rulesets.Catch.Beatmaps; using osu.Game.Rulesets.Catch.Beatmaps;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
@ -30,12 +29,6 @@ namespace osu.Game.Tests.Beatmaps.Formats
[TestFixture] [TestFixture]
public class LegacyBeatmapDecoderTest public class LegacyBeatmapDecoderTest
{ {
[SetUp]
public void SetUp()
{
Decoder.RegisterDependencies(new AssemblyRulesetStore());
}
[Test] [Test]
public void TestDecodeBeatmapVersion() public void TestDecodeBeatmapVersion()
{ {

View File

@ -10,7 +10,6 @@
using osu.Game.Beatmaps.Formats; using osu.Game.Beatmaps.Formats;
using osu.Game.IO; using osu.Game.IO;
using osu.Game.IO.Serialization; using osu.Game.IO.Serialization;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Osu; using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Osu.Beatmaps; using osu.Game.Rulesets.Osu.Beatmaps;
@ -23,12 +22,6 @@ namespace osu.Game.Tests.Beatmaps.Formats
[TestFixture] [TestFixture]
public class OsuJsonDecoderTest public class OsuJsonDecoderTest
{ {
[SetUp]
public void SetUp()
{
Decoder.RegisterDependencies(new AssemblyRulesetStore());
}
private const string normal = "Soleily - Renatus (Gamu) [Insane].osu"; private const string normal = "Soleily - Renatus (Gamu) [Insane].osu";
private const string marathon = "Within Temptation - The Unforgiving (Armin) [Marathon].osu"; private const string marathon = "Within Temptation - The Unforgiving (Armin) [Marathon].osu";
private const string with_sb = "Kozato snow - Rengetsu Ouka (_Kiva) [Yuki YukI].osu"; private const string with_sb = "Kozato snow - Rengetsu Ouka (_Kiva) [Yuki YukI].osu";

View File

@ -9,19 +9,12 @@
using osu.Game.Beatmaps.Formats; using osu.Game.Beatmaps.Formats;
using osu.Game.IO; using osu.Game.IO;
using osu.Game.IO.Archives; using osu.Game.IO.Archives;
using osu.Game.Rulesets;
namespace osu.Game.Tests.Beatmaps.IO namespace osu.Game.Tests.Beatmaps.IO
{ {
[TestFixture] [TestFixture]
public class OszArchiveReaderTest public class OszArchiveReaderTest
{ {
[SetUp]
public void SetUp()
{
Decoder.RegisterDependencies(new AssemblyRulesetStore());
}
[Test] [Test]
public void TestReadBeatmaps() public void TestReadBeatmaps()
{ {

View File

@ -8,7 +8,6 @@
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Formats; using osu.Game.Beatmaps.Formats;
using osu.Game.IO; using osu.Game.IO;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Osu; using osu.Game.Rulesets.Osu;
@ -29,8 +28,6 @@ public class LegacyEditorBeatmapPatcherTest
[SetUp] [SetUp]
public void Setup() public void Setup()
{ {
Decoder.RegisterDependencies(new AssemblyRulesetStore());
patcher = new LegacyEditorBeatmapPatcher(current = new EditorBeatmap(new OsuBeatmap patcher = new LegacyEditorBeatmapPatcher(current = new EditorBeatmap(new OsuBeatmap
{ {
BeatmapInfo = BeatmapInfo =

View File

@ -34,12 +34,6 @@ public abstract class BeatmapConversionTest<TConvertMapping, TConvertValue>
protected abstract string ResourceAssembly { get; } protected abstract string ResourceAssembly { get; }
[SetUp]
public void Setup()
{
Decoder.RegisterDependencies(new AssemblyRulesetStore());
}
protected void Test(string name, params Type[] mods) protected void Test(string name, params Type[] mods)
{ {
var ourResult = convert(name, mods.Select(m => (Mod)Activator.CreateInstance(m)).ToArray()); var ourResult = convert(name, mods.Select(m => (Mod)Activator.CreateInstance(m)).ToArray());

View File

@ -22,12 +22,6 @@ public abstract class DifficultyCalculatorTest
protected abstract string ResourceAssembly { get; } protected abstract string ResourceAssembly { get; }
[SetUp]
public void Setup()
{
Decoder.RegisterDependencies(new AssemblyRulesetStore());
}
protected void Test(double expected, string name, params Mod[] mods) protected void Test(double expected, string name, params Mod[] mods)
{ {
// Platform-dependent math functions (Pow, Cbrt, Exp, etc) may result in minute differences. // Platform-dependent math functions (Pow, Cbrt, Exp, etc) may result in minute differences.