Use array.empty instead of null value.

This commit is contained in:
為什麼
2022-07-11 00:20:56 +08:00
committed by andy840119
parent ee7e7f2d3a
commit 2a83404dbe

View File

@ -162,19 +162,19 @@ namespace osu.Game.Tests.Mods
new object[] new object[]
{ {
new Mod[] { new OsuModHidden(), new InvalidMultiplayerMod() }, new Mod[] { new OsuModHidden(), new InvalidMultiplayerMod() },
null Array.Empty<Type>()
}, },
// invalid free mod is valid for local. // invalid free mod is valid for local.
new object[] new object[]
{ {
new Mod[] { new OsuModHidden(), new InvalidMultiplayerFreeMod() }, new Mod[] { new OsuModHidden(), new InvalidMultiplayerFreeMod() },
null Array.Empty<Type>()
}, },
// valid pair. // valid pair.
new object[] new object[]
{ {
new Mod[] { new OsuModHidden(), new OsuModHardRock() }, new Mod[] { new OsuModHidden(), new OsuModHardRock() },
null Array.Empty<Type>()
}, },
}; };
@ -214,13 +214,13 @@ namespace osu.Game.Tests.Mods
new object[] new object[]
{ {
new Mod[] { new OsuModHidden(), new InvalidMultiplayerFreeMod() }, new Mod[] { new OsuModHidden(), new InvalidMultiplayerFreeMod() },
null Array.Empty<Type>()
}, },
// valid pair. // valid pair.
new object[] new object[]
{ {
new Mod[] { new OsuModHidden(), new OsuModHardRock() }, new Mod[] { new OsuModHidden(), new OsuModHardRock() },
null Array.Empty<Type>()
}, },
}; };
@ -254,19 +254,19 @@ namespace osu.Game.Tests.Mods
new object[] new object[]
{ {
new Mod[] { new OsuModHidden(), new OsuModApproachDifferent() }, new Mod[] { new OsuModHidden(), new OsuModApproachDifferent() },
null, Array.Empty<Type>(),
}, },
// incompatible pair with derived class is valid for free mods. // incompatible pair with derived class is valid for free mods.
new object[] new object[]
{ {
new Mod[] { new OsuModDeflate(), new OsuModSpinIn() }, new Mod[] { new OsuModDeflate(), new OsuModSpinIn() },
null, Array.Empty<Type>(),
}, },
// valid pair. // valid pair.
new object[] new object[]
{ {
new Mod[] { new OsuModHidden(), new OsuModHardRock() }, new Mod[] { new OsuModHidden(), new OsuModHardRock() },
null Array.Empty<Type>()
}, },
}; };
@ -275,12 +275,12 @@ namespace osu.Game.Tests.Mods
{ {
bool isValid = ModUtils.CheckValidForGameplay(inputMods, out var invalid); bool isValid = ModUtils.CheckValidForGameplay(inputMods, out var invalid);
Assert.That(isValid, Is.EqualTo(expectedInvalid == null)); Assert.That(isValid, Is.EqualTo(expectedInvalid.Length == 0));
if (isValid) if (isValid)
Assert.IsNull(invalid); Assert.IsNull(invalid);
else else
Assert.That(invalid.Select(t => t.GetType()), Is.EquivalentTo(expectedInvalid)); Assert.That(invalid?.Select(t => t.GetType()), Is.EquivalentTo(expectedInvalid));
} }
[TestCaseSource(nameof(invalid_multiplayer_mod_test_scenarios))] [TestCaseSource(nameof(invalid_multiplayer_mod_test_scenarios))]
@ -288,12 +288,12 @@ namespace osu.Game.Tests.Mods
{ {
bool isValid = ModUtils.CheckValidRequiredModsForMultiplayer(inputMods, out var invalid); bool isValid = ModUtils.CheckValidRequiredModsForMultiplayer(inputMods, out var invalid);
Assert.That(isValid, Is.EqualTo(expectedInvalid == null)); Assert.That(isValid, Is.EqualTo(expectedInvalid.Length == 0));
if (isValid) if (isValid)
Assert.IsNull(invalid); Assert.IsNull(invalid);
else else
Assert.That(invalid.Select(t => t.GetType()), Is.EquivalentTo(expectedInvalid)); Assert.That(invalid?.Select(t => t.GetType()), Is.EquivalentTo(expectedInvalid));
} }
[TestCaseSource(nameof(invalid_free_mod_test_scenarios))] [TestCaseSource(nameof(invalid_free_mod_test_scenarios))]
@ -301,12 +301,12 @@ namespace osu.Game.Tests.Mods
{ {
bool isValid = ModUtils.CheckValidFreeModsForMultiplayer(inputMods, out var invalid); bool isValid = ModUtils.CheckValidFreeModsForMultiplayer(inputMods, out var invalid);
Assert.That(isValid, Is.EqualTo(expectedInvalid == null)); Assert.That(isValid, Is.EqualTo(expectedInvalid.Length == 0));
if (isValid) if (isValid)
Assert.IsNull(invalid); Assert.IsNull(invalid);
else else
Assert.That(invalid.Select(t => t.GetType()), Is.EquivalentTo(expectedInvalid)); Assert.That(invalid?.Select(t => t.GetType()), Is.EquivalentTo(expectedInvalid));
} }
public abstract class CustomMod1 : Mod, IModCompatibilitySpecification public abstract class CustomMod1 : Mod, IModCompatibilitySpecification