RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-24 15:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
smoogipoo 2018-05-11 16:12:56 +09:00
parent 97a523584d
commit 3e7fa45ad1
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game.Rulesets.Mania.Tests/TestCaseManiaHitObjects.cs
View File

@ -6,6 +6,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.Mania.Objects; using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Mania.Objects.Drawables; using osu.Game.Rulesets.Mania.Objects.Drawables;
using osu.Game.Rulesets.Objects;
using osu.Game.Tests.Visual; using osu.Game.Tests.Visual;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
@ -17,6 +18,9 @@ namespace osu.Game.Rulesets.Mania.Tests
{ {
public TestCaseManiaHitObjects() public TestCaseManiaHitObjects()
{ {
var hitWindows = new HitWindows();
hitWindows.SetDifficulty(5);
Add(new FillFlowContainer Add(new FillFlowContainer
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
@ -43,14 +47,14 @@ namespace osu.Game.Rulesets.Mania.Tests
RelativeChildSize = new Vector2(1, 10000), RelativeChildSize = new Vector2(1, 10000),
Children = new[] Children = new[]
{ {
new DrawableNote(new Note(), ManiaAction.Key1) new DrawableNote(new Note { HitWindows = hitWindows }, ManiaAction.Key1)
{ {
Y = 5000, Y = 5000,
LifetimeStart = double.MinValue, LifetimeStart = double.MinValue,
LifetimeEnd = double.MaxValue, LifetimeEnd = double.MaxValue,
AccentColour = Color4.Red AccentColour = Color4.Red
}, },
new DrawableNote(new Note(), ManiaAction.Key1) new DrawableNote(new Note { HitWindows = hitWindows }, ManiaAction.Key1)
{ {
Y = 6000, Y = 6000,
LifetimeStart = double.MinValue, LifetimeStart = double.MinValue,
@ -77,13 +81,17 @@ namespace osu.Game.Rulesets.Mania.Tests
RelativeChildSize = new Vector2(1, 10000), RelativeChildSize = new Vector2(1, 10000),
Children = new[] Children = new[]
{ {
new DrawableHoldNote(new HoldNote { Duration = 1000 } , ManiaAction.Key1) new DrawableHoldNote(new HoldNote
{
Duration = 1000,
HitWindows = hitWindows
} , ManiaAction.Key1)
{ {
Y = 5000, Y = 5000,
Height = 1000, Height = 1000,
LifetimeStart = double.MinValue, LifetimeStart = double.MinValue,
LifetimeEnd = double.MaxValue, LifetimeEnd = double.MaxValue,
AccentColour = Color4.Red AccentColour = Color4.Red,
} }
} }
} }

3
osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
View File

@ -9,6 +9,7 @@ using osu.Game.Audio;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Formats; using osu.Game.Beatmaps.Formats;
using osu.Game.IO.Serialization; using osu.Game.IO.Serialization;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Objects.Types;
using osu.Game.Tests.Resources; using osu.Game.Tests.Resources;
using OpenTK; using OpenTK;
@ -117,7 +118,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
public void TestParity(string beatmap) public void TestParity(string beatmap)
{ {
var legacy = decode(beatmap, out Beatmap json); var legacy = decode(beatmap, out Beatmap json);
json.ShouldDeepEqual(legacy); json.WithDeepEqual(legacy).IgnoreProperty(r => r.DeclaringType == typeof(HitWindows)).Assert();
} }
/// <summary> /// <summary>