sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-06 16:13:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add tests

Browse Source
This commit is contained in:
Andrei Zavatski
2020-02-25 10:29:03 +03:00
parent 4cbb2a2f59
commit c1455be855
2 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs
View File

@ -13,6 +13,8 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osuTK; using osuTK;
using JetBrains.Annotations;
using NUnit.Framework;
namespace osu.Game.Tests.Visual.Online namespace osu.Game.Tests.Visual.Online
{ {
@ -30,6 +32,8 @@ namespace osu.Game.Tests.Visual.Online
private readonly BindableBool showDeleted = new BindableBool(); private readonly BindableBool showDeleted = new BindableBool();
private readonly Container content; private readonly Container content;
private TestCommentsPage commentsPage;
public TestSceneCommentsPage() public TestSceneCommentsPage()
{ {
Add(new FillFlowContainer Add(new FillFlowContainer
@ -57,15 +61,29 @@ namespace osu.Game.Tests.Visual.Online
} }
} }
}); });
}
AddStep("load comments", () => createPage(getCommentBundle())); [Test]
AddStep("load empty comments", () => createPage(getEmptyCommentBundle())); public void TestAppendDuplicatedComment()
{
AddStep("Create page", () => createPage(getCommentBundle()));
AddAssert("Dictionary length is 10", () => commentsPage?.DictionaryLength == 10);
AddStep("Append existing comment", () => commentsPage?.AppendComments(getCommentSubBundle()));
AddAssert("Dictionary length is 10", () => commentsPage?.DictionaryLength == 10);
}
[Test]
public void TestEmptyBundle()
{
AddStep("Create page", () => createPage(getEmptyCommentBundle()));
AddAssert("Dictionary length is 0", () => commentsPage?.DictionaryLength == 0);
} }
private void createPage(CommentBundle commentBundle) private void createPage(CommentBundle commentBundle)
{ {
commentsPage = null;
content.Clear(); content.Clear();
content.Add(new CommentsPage(commentBundle) content.Add(commentsPage = new TestCommentsPage(commentBundle)
{ {
ShowDeleted = { BindTarget = showDeleted } ShowDeleted = { BindTarget = showDeleted }
}); });
@ -182,5 +200,33 @@ namespace osu.Game.Tests.Visual.Online
} }
}, },
}; };
private CommentBundle getCommentSubBundle() => new CommentBundle
{
Comments = new List<Comment>
{
new Comment
{
Id = 1,
Message = "Simple test comment",
LegacyName = "TestUser1",
CreatedAt = DateTimeOffset.Now,
VotesCount = 5
},
},
IncludedComments = new List<Comment>(),
};
private class TestCommentsPage : CommentsPage
{
public TestCommentsPage(CommentBundle commentBundle)
: base(commentBundle)
{
}
public new void AppendComments([NotNull] CommentBundle bundle) => base.AppendComments(bundle);
public int DictionaryLength => CommentDictionary.Count;
}
} }
} }

16
osu.Game/Overlays/Comments/CommentsPage.cs
View File

@ -61,15 +61,15 @@ namespace osu.Game.Overlays.Comments
return; return;
} }
appendComments(commentBundle); AppendComments(commentBundle);
} }
private DrawableComment getDrawableComment(Comment comment) private DrawableComment getDrawableComment(Comment comment)
{ {
if (commentDictionary.TryGetValue(comment.Id, out var existing)) if (CommentDictionary.TryGetValue(comment.Id, out var existing))
return existing; return existing;
return commentDictionary[comment.Id] = new DrawableComment(comment) return CommentDictionary[comment.Id] = new DrawableComment(comment)
{ {
ShowDeleted = { BindTarget = ShowDeleted }, ShowDeleted = { BindTarget = ShowDeleted },
Sort = { BindTarget = Sort }, Sort = { BindTarget = Sort },
@ -81,25 +81,25 @@ namespace osu.Game.Overlays.Comments
{ {
var request = new GetCommentsRequest(CommentableId.Value, Type.Value, Sort.Value, page, drawableComment.Comment.Id); var request = new GetCommentsRequest(CommentableId.Value, Type.Value, Sort.Value, page, drawableComment.Comment.Id);
request.Success += response => Schedule(() => appendComments(response)); request.Success += response => Schedule(() => AppendComments(response));
api.PerformAsync(request); api.PerformAsync(request);
} }
private readonly Dictionary<long, DrawableComment> commentDictionary = new Dictionary<long, DrawableComment>(); protected readonly Dictionary<long, DrawableComment> CommentDictionary = new Dictionary<long, DrawableComment>();
/// <summary> /// <summary>
/// Appends retrieved comments to the subtree rooted of comments in this page. /// Appends retrieved comments to the subtree rooted of comments in this page.
/// </summary> /// </summary>
/// <param name="bundle">The bundle of comments to add.</param> /// <param name="bundle">The bundle of comments to add.</param>
private void appendComments([NotNull] CommentBundle bundle) protected void AppendComments([NotNull] CommentBundle bundle)
{ {
var orphaned = new List<Comment>(); var orphaned = new List<Comment>();
foreach (var comment in bundle.Comments.Concat(bundle.IncludedComments)) foreach (var comment in bundle.Comments.Concat(bundle.IncludedComments))
{ {
// Exclude possible duplicated comments. // Exclude possible duplicated comments.
if (commentDictionary.ContainsKey(comment.Id)) if (CommentDictionary.ContainsKey(comment.Id))
continue; continue;
addNewComment(comment); addNewComment(comment);
@ -118,7 +118,7 @@ namespace osu.Game.Overlays.Comments
// Comments that have no parent are added as top-level comments to the flow. // Comments that have no parent are added as top-level comments to the flow.
flow.Add(drawableComment); flow.Add(drawableComment);
} }
else if (commentDictionary.TryGetValue(comment.ParentId.Value, out var parentDrawable)) else if (CommentDictionary.TryGetValue(comment.ParentId.Value, out var parentDrawable))
{ {
// The comment's parent has already been seen, so the parent<-> child links can be added. // The comment's parent has already been seen, so the parent<-> child links can be added.
comment.ParentComment = parentDrawable.Comment; comment.ParentComment = parentDrawable.Comment;