2020-03-13 20:29:10 +00:00
|
|
|
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
2019-06-21 06:32:06 +00:00
|
|
|
|
// See the LICENCE file in the repository root for full licence text.
|
|
|
|
|
|
|
|
|
|
using System;
|
|
|
|
|
using System.Collections.Generic;
|
2020-01-30 05:35:03 +00:00
|
|
|
|
using System.Linq;
|
2019-07-01 10:35:04 +00:00
|
|
|
|
using NUnit.Framework;
|
2019-06-21 06:32:06 +00:00
|
|
|
|
using osu.Framework.Allocation;
|
2019-07-01 10:35:04 +00:00
|
|
|
|
using osu.Framework.Bindables;
|
2019-06-21 06:32:06 +00:00
|
|
|
|
using osu.Framework.Graphics;
|
|
|
|
|
using osu.Framework.Graphics.Containers;
|
2019-07-01 10:35:04 +00:00
|
|
|
|
using osu.Framework.Graphics.UserInterface;
|
2020-01-30 05:35:03 +00:00
|
|
|
|
using osu.Framework.Testing;
|
|
|
|
|
using osu.Game.Graphics.UserInterface;
|
2019-06-21 06:32:06 +00:00
|
|
|
|
using osu.Game.Online.Chat;
|
|
|
|
|
using osu.Game.Overlays;
|
|
|
|
|
using osu.Game.Overlays.Chat;
|
2019-07-01 10:35:04 +00:00
|
|
|
|
using osu.Game.Overlays.Chat.Selection;
|
2019-06-21 06:32:06 +00:00
|
|
|
|
using osu.Game.Overlays.Chat.Tabs;
|
2019-07-01 10:35:04 +00:00
|
|
|
|
using osu.Game.Users;
|
|
|
|
|
using osuTK.Input;
|
2019-06-21 06:32:06 +00:00
|
|
|
|
|
|
|
|
|
namespace osu.Game.Tests.Visual.Online
|
|
|
|
|
{
|
2020-03-23 01:01:33 +00:00
|
|
|
|
public class TestSceneChatOverlay : OsuManualInputManagerTestScene
|
2019-06-21 06:32:06 +00:00
|
|
|
|
{
|
|
|
|
|
public override IReadOnlyList<Type> RequiredTypes => new[]
|
|
|
|
|
{
|
|
|
|
|
typeof(ChatLine),
|
|
|
|
|
typeof(DrawableChannel),
|
|
|
|
|
typeof(ChannelSelectorTabItem),
|
|
|
|
|
typeof(ChannelTabControl),
|
|
|
|
|
typeof(ChannelTabItem),
|
|
|
|
|
typeof(PrivateChannelTabItem),
|
|
|
|
|
typeof(TabCloseButton)
|
|
|
|
|
};
|
|
|
|
|
|
2019-07-01 10:35:04 +00:00
|
|
|
|
private TestChatOverlay chatOverlay;
|
|
|
|
|
private ChannelManager channelManager;
|
2019-06-21 06:32:06 +00:00
|
|
|
|
|
2020-03-13 17:34:22 +00:00
|
|
|
|
private IEnumerable<Channel> visibleChannels => chatOverlay.ChannelTabControl.VisibleItems.Where(channel => channel.Name != "+");
|
|
|
|
|
private IEnumerable<Channel> joinedChannels => chatOverlay.ChannelTabControl.Items.Where(channel => channel.Name != "+");
|
2020-01-30 20:17:46 +00:00
|
|
|
|
private readonly List<Channel> channels;
|
|
|
|
|
|
2020-03-13 17:34:22 +00:00
|
|
|
|
private Channel currentChannel => channelManager.CurrentChannel.Value;
|
|
|
|
|
private Channel nextChannel => joinedChannels.ElementAt(joinedChannels.ToList().IndexOf(currentChannel) + 1);
|
|
|
|
|
private Channel previousChannel => joinedChannels.ElementAt(joinedChannels.ToList().IndexOf(currentChannel) - 1);
|
2020-01-30 20:17:46 +00:00
|
|
|
|
private Channel channel1 => channels[0];
|
|
|
|
|
private Channel channel2 => channels[1];
|
|
|
|
|
|
|
|
|
|
public TestSceneChatOverlay()
|
|
|
|
|
{
|
|
|
|
|
channels = Enumerable.Range(1, 10)
|
2020-03-16 18:44:03 +00:00
|
|
|
|
.Select(index => new Channel(new User())
|
2020-01-30 20:17:46 +00:00
|
|
|
|
{
|
|
|
|
|
Name = $"Channel no. {index}",
|
2020-03-16 18:10:42 +00:00
|
|
|
|
Topic = index == 3 ? null : $"We talk about the number {index} here",
|
2020-03-16 18:44:03 +00:00
|
|
|
|
Type = index % 2 == 0 ? ChannelType.PM : ChannelType.Temporary
|
2020-01-30 20:17:46 +00:00
|
|
|
|
})
|
|
|
|
|
.ToList();
|
|
|
|
|
}
|
2019-07-01 10:35:04 +00:00
|
|
|
|
|
|
|
|
|
[SetUp]
|
|
|
|
|
public void Setup()
|
|
|
|
|
{
|
|
|
|
|
Schedule(() =>
|
|
|
|
|
{
|
|
|
|
|
ChannelManagerContainer container;
|
|
|
|
|
|
2020-01-30 20:17:46 +00:00
|
|
|
|
Child = container = new ChannelManagerContainer(channels)
|
2019-07-01 10:35:04 +00:00
|
|
|
|
{
|
|
|
|
|
RelativeSizeAxes = Axes.Both,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
chatOverlay = container.ChatOverlay;
|
|
|
|
|
channelManager = container.ChannelManager;
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[Test]
|
|
|
|
|
public void TestHideOverlay()
|
|
|
|
|
{
|
|
|
|
|
AddAssert("Chat overlay is visible", () => chatOverlay.State.Value == Visibility.Visible);
|
|
|
|
|
AddAssert("Selector is visible", () => chatOverlay.SelectionOverlayState == Visibility.Visible);
|
|
|
|
|
|
|
|
|
|
AddStep("Close chat overlay", () => chatOverlay.Hide());
|
|
|
|
|
|
|
|
|
|
AddAssert("Chat overlay was hidden", () => chatOverlay.State.Value == Visibility.Hidden);
|
|
|
|
|
AddAssert("Channel selection overlay was hidden", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[Test]
|
|
|
|
|
public void TestSelectingChannelClosesSelector()
|
|
|
|
|
{
|
|
|
|
|
AddAssert("Selector is visible", () => chatOverlay.SelectionOverlayState == Visibility.Visible);
|
|
|
|
|
|
|
|
|
|
AddStep("Join channel 1", () => channelManager.JoinChannel(channel1));
|
|
|
|
|
AddStep("Switch to channel 1", () => clickDrawable(chatOverlay.TabMap[channel1]));
|
|
|
|
|
|
2020-03-13 17:34:22 +00:00
|
|
|
|
AddAssert("Current channel is channel 1", () => currentChannel == channel1);
|
2019-07-01 10:35:04 +00:00
|
|
|
|
AddAssert("Channel selector was closed", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
|
|
|
|
|
}
|
|
|
|
|
|
2020-01-30 05:35:03 +00:00
|
|
|
|
[Test]
|
|
|
|
|
public void TestSearchInSelector()
|
|
|
|
|
{
|
2020-03-16 18:10:42 +00:00
|
|
|
|
AddStep("Search for 'no. 2'", () => chatOverlay.ChildrenOfType<SearchTextBox>().First().Text = "no. 2");
|
|
|
|
|
AddUntilStep("Only channel 2 visible", () =>
|
2020-01-30 15:33:24 +00:00
|
|
|
|
{
|
|
|
|
|
var listItems = chatOverlay.ChildrenOfType<ChannelListItem>().Where(c => c.IsPresent);
|
|
|
|
|
return listItems.Count() == 1 && listItems.Single().Channel == channel2;
|
|
|
|
|
});
|
2020-01-30 05:35:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
2020-01-30 20:17:46 +00:00
|
|
|
|
[Test]
|
|
|
|
|
public void TestChannelShortcutKeys()
|
|
|
|
|
{
|
2020-03-16 18:10:42 +00:00
|
|
|
|
AddStep("Join channels", () => channels.ForEach(channel => channelManager.JoinChannel(channel)));
|
|
|
|
|
AddStep("Close channel selector", () =>
|
2020-01-30 20:17:46 +00:00
|
|
|
|
{
|
|
|
|
|
InputManager.PressKey(Key.Escape);
|
|
|
|
|
InputManager.ReleaseKey(Key.Escape);
|
|
|
|
|
});
|
2020-03-16 18:10:42 +00:00
|
|
|
|
AddUntilStep("Wait for close", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
|
2020-01-30 20:17:46 +00:00
|
|
|
|
|
|
|
|
|
for (int zeroBasedIndex = 0; zeroBasedIndex < 10; ++zeroBasedIndex)
|
|
|
|
|
{
|
|
|
|
|
var oneBasedIndex = zeroBasedIndex + 1;
|
|
|
|
|
var targetNumberKey = oneBasedIndex % 10;
|
|
|
|
|
var targetChannel = channels[zeroBasedIndex];
|
2020-03-16 18:10:42 +00:00
|
|
|
|
AddStep($"Press Alt+{targetNumberKey}", () => pressChannelHotkey(targetNumberKey));
|
|
|
|
|
AddAssert($"Channel #{oneBasedIndex} is selected", () => currentChannel == targetChannel);
|
2020-01-30 20:17:46 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-13 17:34:22 +00:00
|
|
|
|
private Channel expectedChannel;
|
|
|
|
|
|
|
|
|
|
[Test]
|
2020-03-16 18:10:42 +00:00
|
|
|
|
public void TestCloseChannelBehaviour()
|
2020-03-13 17:34:22 +00:00
|
|
|
|
{
|
|
|
|
|
AddUntilStep("Join until dropdown has channels", () =>
|
|
|
|
|
{
|
|
|
|
|
if (visibleChannels.Count() < joinedChannels.Count())
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
// Using temporary channels because they don't hide their names when not active
|
2020-03-16 18:10:42 +00:00
|
|
|
|
channelManager.JoinChannel(new Channel
|
2020-03-16 18:44:03 +00:00
|
|
|
|
{
|
2020-03-16 20:31:22 +00:00
|
|
|
|
Name = $"Channel no. {joinedChannels.Count() + 11}",
|
2020-03-16 18:44:03 +00:00
|
|
|
|
Type = ChannelType.Temporary
|
2020-03-16 18:10:42 +00:00
|
|
|
|
});
|
2020-03-13 17:34:22 +00:00
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
AddStep("Switch to last tab", () => clickDrawable(chatOverlay.TabMap[visibleChannels.Last()]));
|
|
|
|
|
AddAssert("Last visible selected", () => currentChannel == visibleChannels.Last());
|
|
|
|
|
|
|
|
|
|
// Closing the last channel before dropdown
|
|
|
|
|
AddStep("Close current channel", () =>
|
|
|
|
|
{
|
|
|
|
|
expectedChannel = nextChannel;
|
|
|
|
|
chatOverlay.ChannelTabControl.RemoveChannel(currentChannel);
|
|
|
|
|
});
|
|
|
|
|
AddAssert("Next channel selected", () => currentChannel == expectedChannel);
|
2020-03-16 18:10:42 +00:00
|
|
|
|
AddAssert("Selector remained closed", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
|
2020-03-13 17:34:22 +00:00
|
|
|
|
|
|
|
|
|
// Depending on the window size, one more channel might need to be closed for the selectorTab to appear
|
|
|
|
|
AddUntilStep("Close channels until selector visible", () =>
|
|
|
|
|
{
|
|
|
|
|
if (chatOverlay.ChannelTabControl.VisibleItems.Last().Name == "+")
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
chatOverlay.ChannelTabControl.RemoveChannel(visibleChannels.Last());
|
|
|
|
|
return false;
|
|
|
|
|
});
|
|
|
|
|
AddAssert("Last visible selected", () => currentChannel == visibleChannels.Last());
|
|
|
|
|
|
|
|
|
|
// Closing the last channel with dropdown no longer present
|
2020-03-13 20:29:10 +00:00
|
|
|
|
AddStep("Close last when selector next", () =>
|
2020-03-13 17:34:22 +00:00
|
|
|
|
{
|
|
|
|
|
expectedChannel = previousChannel;
|
|
|
|
|
chatOverlay.ChannelTabControl.RemoveChannel(currentChannel);
|
|
|
|
|
});
|
2020-03-16 18:10:42 +00:00
|
|
|
|
AddAssert("Previous channel selected", () => currentChannel == expectedChannel);
|
2020-03-13 17:34:22 +00:00
|
|
|
|
|
|
|
|
|
// Standard channel closing
|
|
|
|
|
AddStep("Switch to previous channel", () => chatOverlay.ChannelTabControl.SwitchTab(-1));
|
2020-03-13 20:29:10 +00:00
|
|
|
|
AddStep("Close current channel", () =>
|
2020-03-13 17:34:22 +00:00
|
|
|
|
{
|
|
|
|
|
expectedChannel = nextChannel;
|
|
|
|
|
chatOverlay.ChannelTabControl.RemoveChannel(currentChannel);
|
|
|
|
|
});
|
2020-03-16 18:10:42 +00:00
|
|
|
|
AddAssert("Next channel selected", () => currentChannel == expectedChannel);
|
|
|
|
|
|
|
|
|
|
// Selector reappearing after all channels closed
|
|
|
|
|
AddUntilStep("Close all channels", () =>
|
|
|
|
|
{
|
|
|
|
|
if (!joinedChannels.Any())
|
|
|
|
|
return true;
|
2020-03-16 18:44:03 +00:00
|
|
|
|
|
2020-03-16 18:10:42 +00:00
|
|
|
|
chatOverlay.ChannelTabControl.RemoveChannel(joinedChannels.Last());
|
|
|
|
|
return false;
|
|
|
|
|
});
|
|
|
|
|
AddAssert("Selector is visible", () => chatOverlay.SelectionOverlayState == Visibility.Visible);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[Test]
|
|
|
|
|
public void TestChannelCloseButton()
|
|
|
|
|
{
|
2020-03-16 18:44:03 +00:00
|
|
|
|
AddStep("Join 2 channels", () =>
|
2020-03-16 18:10:42 +00:00
|
|
|
|
{
|
|
|
|
|
channelManager.JoinChannel(channel1);
|
2020-03-16 18:44:03 +00:00
|
|
|
|
channelManager.JoinChannel(channel2);
|
2020-03-16 18:10:42 +00:00
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
// PM channel close button only appears when active
|
2020-03-16 18:44:03 +00:00
|
|
|
|
AddStep("Select PM channel", () => clickDrawable(chatOverlay.TabMap[channel2]));
|
|
|
|
|
AddStep("Click PM close button", () => clickDrawable(((TestPrivateChannelTabItem)chatOverlay.TabMap[channel2]).CloseButton.Child));
|
|
|
|
|
AddAssert("PM channel closed", () => !channelManager.JoinedChannels.Contains(channel2));
|
2020-03-16 18:10:42 +00:00
|
|
|
|
|
|
|
|
|
// Non-PM chat channel close button only appears when hovered
|
|
|
|
|
AddStep("Hover normal channel tab", () => InputManager.MoveMouseTo(chatOverlay.TabMap[channel1]));
|
|
|
|
|
AddStep("Click normal close button", () => clickDrawable(((TestChannelTabItem)chatOverlay.TabMap[channel1]).CloseButton.Child));
|
|
|
|
|
AddAssert("All channels closed", () => !channelManager.JoinedChannels.Any());
|
2020-03-13 17:34:22 +00:00
|
|
|
|
}
|
|
|
|
|
|
2020-01-30 20:17:46 +00:00
|
|
|
|
private void pressChannelHotkey(int number)
|
|
|
|
|
{
|
|
|
|
|
var channelKey = Key.Number0 + number;
|
|
|
|
|
InputManager.PressKey(Key.AltLeft);
|
|
|
|
|
InputManager.PressKey(channelKey);
|
|
|
|
|
InputManager.ReleaseKey(Key.AltLeft);
|
|
|
|
|
InputManager.ReleaseKey(channelKey);
|
|
|
|
|
}
|
|
|
|
|
|
2019-07-01 10:35:04 +00:00
|
|
|
|
private void clickDrawable(Drawable d)
|
2019-06-21 06:32:06 +00:00
|
|
|
|
{
|
2019-07-01 10:35:04 +00:00
|
|
|
|
InputManager.MoveMouseTo(d);
|
|
|
|
|
InputManager.Click(MouseButton.Left);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private class ChannelManagerContainer : Container
|
|
|
|
|
{
|
|
|
|
|
public TestChatOverlay ChatOverlay { get; private set; }
|
|
|
|
|
|
|
|
|
|
[Cached]
|
|
|
|
|
public ChannelManager ChannelManager { get; } = new ChannelManager();
|
|
|
|
|
|
|
|
|
|
private readonly List<Channel> channels;
|
|
|
|
|
|
|
|
|
|
public ChannelManagerContainer(List<Channel> channels)
|
|
|
|
|
{
|
|
|
|
|
this.channels = channels;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[BackgroundDependencyLoader]
|
|
|
|
|
private void load()
|
|
|
|
|
{
|
|
|
|
|
((BindableList<Channel>)ChannelManager.AvailableChannels).AddRange(channels);
|
|
|
|
|
|
|
|
|
|
Child = ChatOverlay = new TestChatOverlay { RelativeSizeAxes = Axes.Both, };
|
|
|
|
|
ChatOverlay.Show();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private class TestChatOverlay : ChatOverlay
|
|
|
|
|
{
|
|
|
|
|
public Visibility SelectionOverlayState => ChannelSelectionOverlay.State.Value;
|
|
|
|
|
|
2020-03-13 17:34:22 +00:00
|
|
|
|
public new ChannelTabControl ChannelTabControl => base.ChannelTabControl;
|
|
|
|
|
|
2019-07-01 10:35:04 +00:00
|
|
|
|
public new ChannelSelectionOverlay ChannelSelectionOverlay => base.ChannelSelectionOverlay;
|
|
|
|
|
|
|
|
|
|
protected override ChannelTabControl CreateChannelTabControl() => new TestTabControl();
|
|
|
|
|
|
|
|
|
|
public IReadOnlyDictionary<Channel, TabItem<Channel>> TabMap => ((TestTabControl)ChannelTabControl).TabMap;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private class TestTabControl : ChannelTabControl
|
|
|
|
|
{
|
2020-03-13 17:33:58 +00:00
|
|
|
|
protected override TabItem<Channel> CreateTabItem(Channel value)
|
|
|
|
|
{
|
|
|
|
|
switch (value.Type)
|
|
|
|
|
{
|
|
|
|
|
case ChannelType.PM:
|
|
|
|
|
return new TestPrivateChannelTabItem(value);
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
return new TestChannelTabItem(value);
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-07-01 10:35:04 +00:00
|
|
|
|
|
|
|
|
|
public new IReadOnlyDictionary<Channel, TabItem<Channel>> TabMap => base.TabMap;
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-13 17:33:58 +00:00
|
|
|
|
private class TestChannelTabItem : ChannelTabItem
|
2019-07-01 10:35:04 +00:00
|
|
|
|
{
|
|
|
|
|
public TestChannelTabItem(Channel channel)
|
|
|
|
|
: base(channel)
|
2019-06-21 06:32:06 +00:00
|
|
|
|
{
|
2019-07-01 10:35:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public new ClickableContainer CloseButton => base.CloseButton;
|
2019-06-21 06:32:06 +00:00
|
|
|
|
}
|
2020-03-13 17:33:58 +00:00
|
|
|
|
|
|
|
|
|
private class TestPrivateChannelTabItem : PrivateChannelTabItem
|
|
|
|
|
{
|
|
|
|
|
public TestPrivateChannelTabItem(Channel channel)
|
|
|
|
|
: base(channel)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public new ClickableContainer CloseButton => base.CloseButton;
|
|
|
|
|
}
|
2019-06-21 06:32:06 +00:00
|
|
|
|
}
|
|
|
|
|
}
|