Fix incorrect handling of multi-mod incompatibilities

This commit is contained in:
smoogipoo
2021-02-02 18:31:08 +09:00
parent d0655c21c6
commit 1df412a03c
2 changed files with 25 additions and 1 deletions

View File

@ -32,7 +32,7 @@ namespace osu.Game.Tests.Mods
}
[Test]
public void TestIncompatibleThroughMultiMod()
public void TestMultiModIncompatibleWithTopLevel()
{
var mod1 = new Mock<Mod>();
@ -47,6 +47,21 @@ namespace osu.Game.Tests.Mods
Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, multiMod }), Is.False);
}
[Test]
public void TestTopLevelIncompatibleWithMultiMod()
{
// The nested mod.
var mod1 = new Mock<CustomMod1>();
var multiMod = new MultiMod(new MultiMod(mod1.Object));
var mod2 = new Mock<CustomMod2>();
mod2.Setup(m => m.IncompatibleMods).Returns(new[] { typeof(CustomMod1) });
// Test both orderings.
Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { multiMod, mod2.Object }), Is.False);
Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { mod2.Object, multiMod }), Is.False);
}
[Test]
public void TestCompatibleMods()
{
@ -83,5 +98,13 @@ namespace osu.Game.Tests.Mods
var mod = new Mock<Mod>();
Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
}
public abstract class CustomMod1 : Mod
{
}
public abstract class CustomMod2 : Mod
{
}
}
}