From 4d37b75f9573a7c580b33bb276c8cb086f4a2338 Mon Sep 17 00:00:00 2001 From: TSR Berry <20988865+TSRBerry@users.noreply.github.com> Date: Sat, 8 Jul 2023 20:17:34 +0200 Subject: [PATCH] Convert TreeDictionaryTests to xUnit --- src/Ryujinx.Tests/TreeDictionaryTests.cs | 204 ++++++++++++----------- 1 file changed, 106 insertions(+), 98 deletions(-) diff --git a/src/Ryujinx.Tests/TreeDictionaryTests.cs b/src/Ryujinx.Tests/TreeDictionaryTests.cs index ea9fb0731..7163025b4 100644 --- a/src/Ryujinx.Tests/TreeDictionaryTests.cs +++ b/src/Ryujinx.Tests/TreeDictionaryTests.cs @@ -1,18 +1,26 @@ -using NUnit.Framework; using Ryujinx.Common.Collections; using System; using System.Collections.Generic; +using Xunit; +using Xunit.Abstractions; namespace Ryujinx.Tests.Collections { - class TreeDictionaryTests + public class TreeDictionaryTests { - [Test] + private readonly ITestOutputHelper _testOutputHelper; + + public TreeDictionaryTests(ITestOutputHelper testOutputHelper) + { + _testOutputHelper = testOutputHelper; + } + + [Fact] public void EnsureAddIntegrity() { TreeDictionary dictionary = new(); - Assert.AreEqual(dictionary.Count, 0); + Assert.Equal(0, dictionary.Count); dictionary.Add(2, 7); dictionary.Add(1, 4); @@ -22,36 +30,36 @@ namespace Ryujinx.Tests.Collections dictionary.Add(11, 2); dictionary.Add(5, 2); - Assert.AreEqual(dictionary.Count, 7); + Assert.Equal(7, dictionary.Count); List> list = dictionary.AsLevelOrderList(); /* * Tree Should Look as Follows After Rotations - * + * * 2 * 1 4 * 3 10 * 5 11 - * + * */ - Assert.AreEqual(list.Count, dictionary.Count); - Assert.AreEqual(list[0].Key, 2); - Assert.AreEqual(list[1].Key, 1); - Assert.AreEqual(list[2].Key, 4); - Assert.AreEqual(list[3].Key, 3); - Assert.AreEqual(list[4].Key, 10); - Assert.AreEqual(list[5].Key, 5); - Assert.AreEqual(list[6].Key, 11); + Assert.Equal(list.Count, dictionary.Count); + Assert.Equal(2, list[0].Key); + Assert.Equal(1, list[1].Key); + Assert.Equal(4, list[2].Key); + Assert.Equal(3, list[3].Key); + Assert.Equal(10, list[4].Key); + Assert.Equal(5, list[5].Key); + Assert.Equal(11, list[6].Key); } - [Test] + [Fact] public void EnsureRemoveIntegrity() { TreeDictionary dictionary = new(); - Assert.AreEqual(dictionary.Count, 0); + Assert.Equal(0, dictionary.Count); dictionary.Add(2, 7); dictionary.Add(1, 4); @@ -66,38 +74,38 @@ namespace Ryujinx.Tests.Collections dictionary.Add(13, 2); dictionary.Add(24, 2); dictionary.Add(6, 2); - Assert.AreEqual(dictionary.Count, 13); + Assert.Equal(13, dictionary.Count); List> list = dictionary.AsLevelOrderList(); /* * Tree Should Look as Follows After Rotations - * + * * 4 * 2 10 * 1 3 7 13 * 5 9 11 24 - * 6 8 + * 6 8 */ foreach (KeyValuePair node in list) { - Console.WriteLine($"{node.Key} -> {node.Value}"); + _testOutputHelper.WriteLine($"{node.Key} -> {node.Value}"); } - Assert.AreEqual(list.Count, dictionary.Count); - Assert.AreEqual(list[0].Key, 4); - Assert.AreEqual(list[1].Key, 2); - Assert.AreEqual(list[2].Key, 10); - Assert.AreEqual(list[3].Key, 1); - Assert.AreEqual(list[4].Key, 3); - Assert.AreEqual(list[5].Key, 7); - Assert.AreEqual(list[6].Key, 13); - Assert.AreEqual(list[7].Key, 5); - Assert.AreEqual(list[8].Key, 9); - Assert.AreEqual(list[9].Key, 11); - Assert.AreEqual(list[10].Key, 24); - Assert.AreEqual(list[11].Key, 6); - Assert.AreEqual(list[12].Key, 8); + Assert.Equal(list.Count, dictionary.Count); + Assert.Equal(4, list[0].Key); + Assert.Equal(2, list[1].Key); + Assert.Equal(10, list[2].Key); + Assert.Equal(1, list[3].Key); + Assert.Equal(3, list[4].Key); + Assert.Equal(7, list[5].Key); + Assert.Equal(13, list[6].Key); + Assert.Equal(5, list[7].Key); + Assert.Equal(9, list[8].Key); + Assert.Equal(11, list[9].Key); + Assert.Equal(24, list[10].Key); + Assert.Equal(6, list[11].Key); + Assert.Equal(8, list[12].Key); list.Clear(); @@ -105,31 +113,31 @@ namespace Ryujinx.Tests.Collections /* * Tree Should Look as Follows After Removal - * + * * 4 * 2 10 * 1 3 6 13 * 5 9 11 24 - * 8 + * 8 */ list = dictionary.AsLevelOrderList(); foreach (KeyValuePair node in list) { - Console.WriteLine($"{node.Key} -> {node.Value}"); + _testOutputHelper.WriteLine($"{node.Key} -> {node.Value}"); } - Assert.AreEqual(list[0].Key, 4); - Assert.AreEqual(list[1].Key, 2); - Assert.AreEqual(list[2].Key, 10); - Assert.AreEqual(list[3].Key, 1); - Assert.AreEqual(list[4].Key, 3); - Assert.AreEqual(list[5].Key, 6); - Assert.AreEqual(list[6].Key, 13); - Assert.AreEqual(list[7].Key, 5); - Assert.AreEqual(list[8].Key, 9); - Assert.AreEqual(list[9].Key, 11); - Assert.AreEqual(list[10].Key, 24); - Assert.AreEqual(list[11].Key, 8); + Assert.Equal(4, list[0].Key); + Assert.Equal(2, list[1].Key); + Assert.Equal(10, list[2].Key); + Assert.Equal(1, list[3].Key); + Assert.Equal(3, list[4].Key); + Assert.Equal(6, list[5].Key); + Assert.Equal(13, list[6].Key); + Assert.Equal(5, list[7].Key); + Assert.Equal(9, list[8].Key); + Assert.Equal(11, list[9].Key); + Assert.Equal(24, list[10].Key); + Assert.Equal(8, list[11].Key); list.Clear(); @@ -138,36 +146,36 @@ namespace Ryujinx.Tests.Collections list = dictionary.AsLevelOrderList(); /* * Tree Should Look as Follows After Removal - * + * * 4 * 2 9 * 1 3 6 13 * 5 8 11 24 - * + * */ foreach (KeyValuePair node in list) { - Console.WriteLine($"{node.Key} -> {node.Value}"); + _testOutputHelper.WriteLine($"{node.Key} -> {node.Value}"); } - Assert.AreEqual(list[0].Key, 4); - Assert.AreEqual(list[1].Key, 2); - Assert.AreEqual(list[2].Key, 9); - Assert.AreEqual(list[3].Key, 1); - Assert.AreEqual(list[4].Key, 3); - Assert.AreEqual(list[5].Key, 6); - Assert.AreEqual(list[6].Key, 13); - Assert.AreEqual(list[7].Key, 5); - Assert.AreEqual(list[8].Key, 8); - Assert.AreEqual(list[9].Key, 11); - Assert.AreEqual(list[10].Key, 24); + Assert.Equal(4, list[0].Key); + Assert.Equal(2, list[1].Key); + Assert.Equal(9, list[2].Key); + Assert.Equal(1, list[3].Key); + Assert.Equal(3, list[4].Key); + Assert.Equal(6, list[5].Key); + Assert.Equal(13, list[6].Key); + Assert.Equal(5, list[7].Key); + Assert.Equal(8, list[8].Key); + Assert.Equal(11, list[9].Key); + Assert.Equal(24, list[10].Key); } - [Test] + [Fact] public void EnsureOverwriteIntegrity() { TreeDictionary dictionary = new(); - Assert.AreEqual(dictionary.Count, 0); + Assert.Equal(0, dictionary.Count); dictionary.Add(2, 7); dictionary.Add(1, 4); @@ -182,7 +190,7 @@ namespace Ryujinx.Tests.Collections dictionary.Add(13, 2); dictionary.Add(24, 2); dictionary.Add(6, 2); - Assert.AreEqual(dictionary.Count, 13); + Assert.Equal(13, dictionary.Count); List> list = dictionary.AsLevelOrderList(); @@ -193,52 +201,52 @@ namespace Ryujinx.Tests.Collections /* * Tree Should Look as Follows After Rotations - * + * * 4 * 2 10 * 1 3 7 13 * 5 9 11 24 - * 6 8 + * 6 8 */ - Assert.AreEqual(list.Count, dictionary.Count); - Assert.AreEqual(list[0].Key, 4); - Assert.AreEqual(list[1].Key, 2); - Assert.AreEqual(list[2].Key, 10); - Assert.AreEqual(list[3].Key, 1); - Assert.AreEqual(list[4].Key, 3); - Assert.AreEqual(list[5].Key, 7); - Assert.AreEqual(list[6].Key, 13); - Assert.AreEqual(list[7].Key, 5); - Assert.AreEqual(list[8].Key, 9); - Assert.AreEqual(list[9].Key, 11); - Assert.AreEqual(list[10].Key, 24); - Assert.AreEqual(list[11].Key, 6); - Assert.AreEqual(list[12].Key, 8); + Assert.Equal(list.Count, dictionary.Count); + Assert.Equal(4, list[0].Key); + Assert.Equal(2, list[1].Key); + Assert.Equal(10, list[2].Key); + Assert.Equal(1, list[3].Key); + Assert.Equal(3, list[4].Key); + Assert.Equal(7, list[5].Key); + Assert.Equal(13, list[6].Key); + Assert.Equal(5, list[7].Key); + Assert.Equal(9, list[8].Key); + Assert.Equal(11, list[9].Key); + Assert.Equal(24, list[10].Key); + Assert.Equal(6, list[11].Key); + Assert.Equal(8, list[12].Key); - Assert.AreEqual(list[4].Value, 2); + Assert.Equal(2, list[4].Value); dictionary.Add(3, 4); list = dictionary.AsLevelOrderList(); - Assert.AreEqual(list[4].Value, 4); + Assert.Equal(4, list[4].Value); // Assure that none of the nodes locations have been modified. - Assert.AreEqual(list[0].Key, 4); - Assert.AreEqual(list[1].Key, 2); - Assert.AreEqual(list[2].Key, 10); - Assert.AreEqual(list[3].Key, 1); - Assert.AreEqual(list[4].Key, 3); - Assert.AreEqual(list[5].Key, 7); - Assert.AreEqual(list[6].Key, 13); - Assert.AreEqual(list[7].Key, 5); - Assert.AreEqual(list[8].Key, 9); - Assert.AreEqual(list[9].Key, 11); - Assert.AreEqual(list[10].Key, 24); - Assert.AreEqual(list[11].Key, 6); - Assert.AreEqual(list[12].Key, 8); + Assert.Equal(4, list[0].Key); + Assert.Equal(2, list[1].Key); + Assert.Equal(10, list[2].Key); + Assert.Equal(1, list[3].Key); + Assert.Equal(3, list[4].Key); + Assert.Equal(7, list[5].Key); + Assert.Equal(13, list[6].Key); + Assert.Equal(5, list[7].Key); + Assert.Equal(9, list[8].Key); + Assert.Equal(11, list[9].Key); + Assert.Equal(24, list[10].Key); + Assert.Equal(6, list[11].Key); + Assert.Equal(8, list[12].Key); } } }