RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add test for local echo adding day separator

This commit is contained in:
Bartłomiej Dach 2022-11-21 20:30:42 +01:00
parent e53b4321ff
commit 76bb529cfa
No known key found for this signature in database
3 changed files with 93 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
osu.Game.Tests/Visual/Online/TestSceneDrawableChannel.cs Normal file
View File

@ -0,0 +1,87 @@
// 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.Linq;
using NUnit.Framework;
using osu.Framework.Graphics;
using osu.Framework.Testing;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Chat;
using osu.Game.Overlays.Chat;
namespace osu.Game.Tests.Visual.Online
{
[TestFixture]
public class TestSceneDrawableChannel : OsuTestScene
{
private Channel channel = null!;
private DrawableChannel drawableChannel = null!;
[SetUpSteps]
public void SetUpSteps()
{
AddStep("create channel", () => channel = new Channel
{
Id = 1,
Name = "Test channel"
});
AddStep("create drawable channel", () => Child = drawableChannel = new DrawableChannel(channel)
{
RelativeSizeAxes = Axes.Both
});
}
[Test]
public void TestDaySeparators()
{
var localUser = new APIUser
{
Id = 3,
Username = "LocalUser"
};
string uuid = Guid.NewGuid().ToString();
AddStep("add local echo message", () => channel.AddLocalEcho(new LocalEchoMessage
{
Sender = localUser,
Content = "Hi there all!",
Timestamp = new DateTimeOffset(2022, 11, 21, 20, 11, 13, TimeSpan.Zero),
Uuid = uuid
}));
AddUntilStep("one day separator present", () => drawableChannel.ChildrenOfType<DaySeparator>().Count() == 1);
AddStep("add two prior messages to channel", () => channel.AddNewMessages(
new Message(1)
{
Sender = new APIUser
{
Id = 1,
Username = "TestUser"
},
Content = "This is a message",
Timestamp = new DateTimeOffset(2021, 10, 10, 13, 33, 23, TimeSpan.Zero),
},
new Message(2)
{
Sender = new APIUser
{
Id = 2,
Username = "TestUser2"
},
Content = "This is another message",
Timestamp = new DateTimeOffset(2021, 10, 11, 13, 33, 23, TimeSpan.Zero)
}));
AddUntilStep("three day separators present", () => drawableChannel.ChildrenOfType<DaySeparator>().Count() == 3);
AddStep("resolve pending message", () => channel.ReplaceMessage(channel.Messages.OfType<LocalEchoMessage>().Single(), new Message(3)
{
Sender = localUser,
Content = "Hi there all!",
Timestamp = new DateTimeOffset(2022, 11, 22, 20, 11, 16, TimeSpan.Zero),
Uuid = uuid
}));
AddUntilStep("three day separators present", () => drawableChannel.ChildrenOfType<DaySeparator>().Count() == 3);
AddAssert("last day separator is from correct day", () => drawableChannel.ChildrenOfType<DaySeparator>().Last().Date.Date == new DateTime(2022, 11, 22));
}
}
}

4
osu.Game/Online/Chat/StandAloneChatDisplay.cs
View File

@ -174,8 +174,8 @@ protected class StandAloneDaySeparator : DaySeparator
protected override float Spacing => 5;
protected override float DateAlign => 125;
public StandAloneDaySeparator(DateTimeOffset time)
: base(time)
public StandAloneDaySeparator(DateTimeOffset date)
: base(date)
{
}

8
osu.Game/Overlays/Chat/DaySeparator.cs
View File

@ -22,14 +22,14 @@ public class DaySeparator : Container
protected virtual float Spacing => 15;
private readonly DateTimeOffset time;
public readonly DateTimeOffset Date;
[Resolved(CanBeNull = true)]
private OverlayColourProvider? colourProvider { get; set; }
public DaySeparator(DateTimeOffset time)
public DaySeparator(DateTimeOffset date)
{
this.time = time;
Date = date;
Height = 40;
}
@ -80,7 +80,7 @@ private void load()
{
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
Text = time.ToLocalTime().ToLocalisableString(@"dd MMMM yyyy").ToUpper(),
Text = Date.ToLocalTime().ToLocalisableString(@"dd MMMM yyyy").ToUpper(),
Font = OsuFont.Torus.With(size: TextSize, weight: FontWeight.SemiBold),
Colour = colourProvider?.Content1 ?? Colour4.White,
},