Skip to content

Commit c9e2fa1

Browse files
MarcosSimoneliMarcosSimoneli
authored
Update NUnit to 4.0.1 (fixes #442) (#443)
1 parent c7f0d62 commit c9e2fa1

File tree

113 files changed

+710
-708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+710
-708
lines changed

‎Algorithms.Tests/Algorithms.Tests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</PackageReference>
2121
<PackageReference Include="FluentAssertions" Version="6.12.0" />
2222
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
23-
<PackageReference Include="nunit" Version="3.12.0" />
24-
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
23+
<PackageReference Include="nunit" Version="4.0.1" />
24+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
2525
</ItemGroup>
2626
</Project>

‎Algorithms.Tests/Compressors/BurrowsWheelerTransformTests.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public void Encode(string input, string expectedString, int expectedIndex)
1515

1616
var (encoded, index) = bwt.Encode(input);
1717

18-
Assert.AreEqual(expectedString, encoded);
19-
Assert.AreEqual(expectedIndex, index);
18+
Assert.That(encoded, Is.EqualTo(expectedString));
19+
Assert.That(index, Is.EqualTo(expectedIndex));
2020
}
2121

2222
[TestCase("nnbaaa", 3, "banana")]
@@ -28,7 +28,7 @@ public void Decode(string encoded, int index, string expected)
2828

2929
var result = bwt.Decode(encoded, index);
3030

31-
Assert.AreEqual(expected, result);
31+
Assert.That(result, Is.EqualTo(expected));
3232
}
3333

3434
[Test]
@@ -42,6 +42,6 @@ public void RandomEncodeDecode()
4242
var (encoded, index) = bwt.Encode(inputString);
4343
var result = bwt.Decode(encoded, index);
4444

45-
Assert.AreEqual(inputString, result);
45+
Assert.That(result, Is.EqualTo(inputString));
4646
}
4747
}

‎Algorithms.Tests/Compressors/HuffmanCompressorTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public static void CompressingPhrase(string uncompressedText, string expectedCom
2525
var decompressedText = translator.Translate(compressedText, decompressionKeys);
2626

2727
//Assert
28-
Assert.AreEqual(expectedCompressedText, compressedText);
29-
Assert.AreEqual(uncompressedText, decompressedText);
28+
Assert.That(compressedText, Is.EqualTo(expectedCompressedText));
29+
Assert.That(decompressedText, Is.EqualTo(uncompressedText));
3030
}
3131

3232
[Test]
@@ -45,7 +45,7 @@ public static void DecompressedTextTheSameAsOriginal(
4545
var decompressedText = translator.Translate(compressedText, decompressionKeys);
4646

4747
//Assert
48-
Assert.AreEqual(text, decompressedText);
48+
Assert.That(decompressedText, Is.EqualTo(text));
4949
}
5050

5151
[Test]

‎Algorithms.Tests/Compressors/ShannonFanoCompressorTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public static void CompressingPhrase(string uncompressedText, string expectedCom
2222
var decompressedText = translator.Translate(compressedText, decompressionKeys);
2323

2424
//Assert
25-
Assert.AreEqual(expectedCompressedText, compressedText);
26-
Assert.AreEqual(uncompressedText, decompressedText);
25+
Assert.That(compressedText, Is.EqualTo(expectedCompressedText));
26+
Assert.That(decompressedText, Is.EqualTo(uncompressedText));
2727
}
2828

2929
[Test]
@@ -40,6 +40,6 @@ public static void DecompressedTextTheSameAsOriginal([Random(0, 1000, 100)] int
4040
var decompressedText = translator.Translate(compressedText, decompressionKeys);
4141

4242
//Assert
43-
Assert.AreEqual(text, decompressedText);
43+
Assert.That(decompressedText, Is.EqualTo(text));
4444
}
4545
}

‎Algorithms.Tests/Compressors/TranslatorTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ public static void TranslateCorrectly()
2323
var translatedText = translator.Translate("Hey man!", dict);
2424

2525
// Assert
26-
Assert.AreEqual("Good day sir.", translatedText);
26+
Assert.That(translatedText, Is.EqualTo("Good day sir."));
2727
}
2828
}

‎Algorithms.Tests/Encoders/CaesarEncoderTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ public static void DecodedStringIsTheSame([Random(100)] int key)
1919
var decoded = encoder.Decode(encoded, key);
2020

2121
// Assert
22-
Assert.AreEqual(message, decoded);
22+
Assert.That(decoded, Is.EqualTo(message));
2323
}
2424
}

‎Algorithms.Tests/Encoders/FeistelCipherTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static void DecodedStringIsTheSame([Random(100)] uint key)
2323
var decoded = encoder.Decode(encoded, key);
2424

2525
// Assert
26-
Assert.AreEqual(message, decoded);
26+
Assert.That(decoded, Is.EqualTo(message));
2727
}
2828

2929
[TestCase("00001111", (uint)0x12345678)]

‎Algorithms.Tests/Encoders/HillEnconderTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ public static void DecodedStringIsTheSame()
2222
var decodeText = encoder.Decode(encodedText, key);
2323

2424
// Assert
25-
Assert.AreEqual(message, decodeText);
25+
Assert.That(decodeText, Is.EqualTo(message));
2626
}
2727
}

‎Algorithms.Tests/Encoders/NysiisEncoderTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ public void AttemptNysiis(string source, string expected)
2626
{
2727
var enc = new NysiisEncoder();
2828
var nysiis = enc.Encode(source);
29-
Assert.AreEqual(expected, nysiis);
29+
Assert.That(nysiis, Is.EqualTo(expected));
3030
}
3131
}

‎Algorithms.Tests/Encoders/SoundexEncoderTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ public static void AttemptSoundex(string source, string encoded)
2121
{
2222
SoundexEncoder enc = new();
2323
var nysiis = enc.Encode(source);
24-
Assert.AreEqual(nysiis, encoded);
24+
Assert.That(encoded, Is.EqualTo(nysiis));
2525
}
2626
}

‎Algorithms.Tests/Encoders/VigenereEncoderTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static void DecodedStringIsTheSame()
2222
var decoded = encoder.Decode(encoded, key);
2323

2424
// Assert
25-
Assert.AreEqual(message, decoded);
25+
Assert.That(decoded, Is.EqualTo(message));
2626
}
2727

2828
[Test]
@@ -38,7 +38,7 @@ public static void Encode_KeyIsTooShort_KeyIsAppended()
3838
var decoded = encoder.Decode(encoded, key);
3939

4040
// Assert
41-
Assert.AreEqual(message, decoded);
41+
Assert.That(decoded, Is.EqualTo(message));
4242
}
4343

4444
[Test]

‎Algorithms.Tests/Graph/BreadthFirstSearchTests.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void VisitAll_ShouldCountNumberOfVisitedVertix_ResultShouldBeTheSameAsNum
3737
dfsSearcher.VisitAll(graph, vertex1, _ => countOfVisitedVertices++);
3838

3939
//Assert
40-
Assert.AreEqual(countOfVisitedVertices, graph.Count);
40+
Assert.That(graph.Count, Is.EqualTo(countOfVisitedVertices));
4141
}
4242

4343
[Test]
@@ -78,9 +78,9 @@ public void VisitAll_ShouldCountNumberOfVisitedVerices_TwoSeparatedGraphInOne()
7878
dfsSearcher.VisitAll(graph, vertex4, _ => countOfVisitedVerticesPerSecondGraph++);
7979

8080
//Assert
81-
Assert.AreEqual(countOfVisitedVerticesPerFirstGraph, 3);
81+
Assert.That(countOfVisitedVerticesPerFirstGraph, Is.EqualTo(3));
8282

83-
Assert.AreEqual(countOfVisitedVerticesPerSecondGraph, 3);
83+
Assert.That(countOfVisitedVerticesPerSecondGraph, Is.EqualTo(3));
8484
}
8585

8686
[Test]
@@ -126,6 +126,6 @@ public void VisitAll_ReturnTheSuqenceOfVertices_ShouldBeTheSameAsExpected()
126126
dfsSearcher.VisitAll(graph, vertex1, vertex => sequenceOfVisitedVertices.Add(vertex));
127127

128128
//Assert
129-
CollectionAssert.AreEqual(expectedSequenceOfVisitedVertices, sequenceOfVisitedVertices);
129+
Assert.That(sequenceOfVisitedVertices, Is.EqualTo(expectedSequenceOfVisitedVertices));
130130
}
131131
}

‎Algorithms.Tests/Graph/BreadthFirstTreeTraversalTests.cs

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using Algorithms.Graph;
2-
using NUnit.Framework;
32
using DataStructures.BinarySearchTree;
4-
using System;
3+
using NUnit.Framework;
54

65
namespace Algorithms.Tests.Graph;
76

@@ -23,7 +22,7 @@ public static void CorrectLevelOrderTraversal()
2322
int[] levelOrder = BreadthFirstTreeTraversal<int>.LevelOrderTraversal(testTree);
2423

2524
// Assert
26-
Assert.AreEqual(levelOrder, correctPath);
25+
Assert.That(correctPath, Is.EqualTo(levelOrder));
2726
}
2827

2928
[Test]
@@ -36,11 +35,11 @@ public static void EmptyArrayForNullRoot()
3635
int[] levelOrder = BreadthFirstTreeTraversal<int>.LevelOrderTraversal(testTree);
3736

3837
// Assert
39-
Assert.IsEmpty(levelOrder);
38+
Assert.That(levelOrder, Is.Empty);
4039
}
4140

42-
[TestCase(new [] {7, 9, 5})]
43-
[TestCase(new [] { 7, 13, 11, 15, 14, 4, 5, 16, 2 })]
41+
[TestCase(new[] { 7, 9, 5 })]
42+
[TestCase(new[] { 7, 13, 11, 15, 14, 4, 5, 16, 2 })]
4443
public static void IncorrectLevelOrderTraversal(int[] insertion)
4544
{
4645
// Arrange
@@ -54,7 +53,7 @@ public static void IncorrectLevelOrderTraversal(int[] insertion)
5453
int[] levelOrder = BreadthFirstTreeTraversal<int>.LevelOrderTraversal(testTree);
5554

5655
// Assert
57-
Assert.AreNotEqual(levelOrder, insertion);
56+
Assert.That(insertion, Is.Not.EqualTo(levelOrder));
5857
}
5958

6059
[Test]
@@ -72,7 +71,7 @@ public static void DeepestNodeInTree()
7271
int deepest = BreadthFirstTreeTraversal<int>.DeepestNode(testTree);
7372

7473
// Assert
75-
Assert.AreEqual(12, deepest);
74+
Assert.That(deepest, Is.EqualTo(12));
7675
}
7776

7877
[Test]
@@ -85,7 +84,7 @@ public static void DeepestNodeOfEmptyTree()
8584
int? deepest = BreadthFirstTreeTraversal<int?>.DeepestNode(testTree);
8685

8786
// Assert
88-
Assert.IsNull(deepest);
87+
Assert.That(deepest, Is.Null);
8988
}
9089
}
9190

‎Algorithms.Tests/Graph/DepthFirstSearchTests.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void VisitAll_ShouldCountNumberOfVisitedVertix_ResultShouldBeTheSameAsNum
3737
dfsSearcher.VisitAll(graph, vertex1, _ => countOfVisitedVertices++);
3838

3939
//Assert
40-
Assert.AreEqual(countOfVisitedVertices, graph.Count);
40+
Assert.That(graph.Count, Is.EqualTo(countOfVisitedVertices));
4141
}
4242

4343
[Test]
@@ -78,9 +78,9 @@ public void VisitAll_ShouldCountNumberOfVisitedVertices_TwoSeparatedGraphInOne()
7878
dfsSearcher.VisitAll(graph, vertex4, _ => countOfVisitedVerticesPerSecondGraph++);
7979

8080
//Assert
81-
Assert.AreEqual(countOfVisitedVerticesPerFirstGraph, 3);
81+
Assert.That(3, Is.EqualTo(countOfVisitedVerticesPerFirstGraph));
8282

83-
Assert.AreEqual(countOfVisitedVerticesPerSecondGraph, 3);
83+
Assert.That(3, Is.EqualTo(countOfVisitedVerticesPerSecondGraph));
8484
}
8585

8686
[Test]
@@ -124,6 +124,6 @@ public void VisitAll_ReturnTheSuqenceOfVertices_ShouldBeTheSameAsExpected()
124124
dfsSearcher.VisitAll(graph, vertex1, vertex => sequenceOfVisitedVertices.Add(vertex));
125125

126126
//Assert
127-
CollectionAssert.AreEqual(expectedSequenceOfVisitedVertices, sequenceOfVisitedVertices);
127+
Assert.That(sequenceOfVisitedVertices, Is.EqualTo(expectedSequenceOfVisitedVertices));
128128
}
129129
}

‎Algorithms.Tests/Knapsack/DynamicProgrammingKnapsackSolverTests.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static void SmallSampleOfChar()
2828
var actual = solver.Solve(items, capacity, weightSelector, valueSelector);
2929

3030
//Assert
31-
Assert.AreEqual(expected.OrderBy(x => x), actual.OrderBy(x => x));
31+
Assert.That(actual.OrderBy(x => x), Is.EqualTo(expected.OrderBy(x => x)));
3232
}
3333

3434
[Test]
@@ -53,7 +53,7 @@ public static void FSU_P01()
5353
var actual = solver.Solve(items, capacity, weightSelector, valueSelector);
5454

5555
//Assert
56-
Assert.AreEqual(expected.OrderBy(x => x), actual.OrderBy(x => x));
56+
Assert.That(actual.OrderBy(x => x), Is.EqualTo(expected.OrderBy(x => x)));
5757
}
5858

5959
[Test]
@@ -80,7 +80,7 @@ public static void FSU_P07_WithNonIntegralValues()
8080
var actual = solver.Solve(items, capacity * 10, weightSelector, valueSelector);
8181

8282
//Assert
83-
Assert.AreEqual(expected.OrderBy(x => x), actual.OrderBy(x => x));
83+
Assert.That(actual.OrderBy(x => x), Is.EqualTo(expected.OrderBy(x => x)));
8484
}
8585

8686

@@ -98,6 +98,6 @@ public static void TakesHalf(
9898
var result = solver.Solve(items, length, _ => 1, _ => 1);
9999

100100
//Assert
101-
Assert.AreEqual(expectedResult, result);
101+
Assert.That(result, Is.EqualTo(expectedResult));
102102
}
103103
}

‎Algorithms.Tests/Knapsack/NaiveKnapsackSolverTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ public static void TakesHalf(
2020
var result = solver.Solve(items, length, _ => 1, _ => 1);
2121

2222
//Assert
23-
Assert.AreEqual(expectedResult, result);
23+
Assert.That(result, Is.EqualTo(expectedResult));
2424
}
2525
}

‎Algorithms.Tests/ModularArithmetic/ChineseRemainderTheoremTest.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public static void TestCompute1()
1717
var x = ChineseRemainderTheorem.Compute(new List<long> { 1L, 1L, 3L, 1L }, new List<long> { 2L, 3L, 5L, 7L });
1818

1919
// Assert
20-
Assert.AreEqual(expected, x);
20+
Assert.That(x, Is.EqualTo(expected));
2121
}
2222

2323
[Test]
@@ -29,7 +29,7 @@ public static void TestCompute2()
2929
var x = ChineseRemainderTheorem.Compute(new List<long> { 0L, 0L, 2L, 1L, 1L }, new List<long> { 2L, 5L, 7L, 9L, 11L });
3030

3131
// Assert
32-
Assert.AreEqual(expected, x);
32+
Assert.That(x, Is.EqualTo(expected));
3333
}
3434

3535
[Test]
@@ -41,7 +41,7 @@ public static void TestCompute3()
4141
var x = ChineseRemainderTheorem.Compute(new List<long> { 1L, 4L, 13L }, new List<long> { 4L, 9L, 25L });
4242

4343
// Assert
44-
Assert.AreEqual(expected, x);
44+
Assert.That(x, Is.EqualTo(expected));
4545
}
4646

4747
[Test]
@@ -105,7 +105,7 @@ public static void TestCompute_BigInteger_1()
105105
);
106106

107107
// Assert
108-
Assert.AreEqual(expected, x);
108+
Assert.That(x, Is.EqualTo(expected));
109109
}
110110

111111
[Test]
@@ -120,7 +120,7 @@ public static void TestCompute_BigInteger_2()
120120
);
121121

122122
// Assert
123-
Assert.AreEqual(expected, x);
123+
Assert.That(x, Is.EqualTo(expected));
124124
}
125125

126126
[Test]
@@ -135,7 +135,7 @@ public static void TestCompute_BigInteger_3()
135135
);
136136

137137
// Assert
138-
Assert.AreEqual(expected, x);
138+
Assert.That(x, Is.EqualTo(expected));
139139
}
140140

141141
[Test]

‎Algorithms.Tests/ModularArithmetic/ExtendedEuclideanAlgorithmTest.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ public static void TestCompute(long a, long b, long expectedGCD, long expectedBe
2323
var eeaResult = ExtendedEuclideanAlgorithm.Compute(a, b);
2424

2525
// Assert
26-
Assert.AreEqual(expectedGCD, eeaResult.gcd);
27-
Assert.AreEqual(expectedBezoutOfA, eeaResult.bezoutA);
28-
Assert.AreEqual(expectedBezoutOfB, eeaResult.bezoutB);
26+
Assert.That(eeaResult.gcd, Is.EqualTo(expectedGCD));
27+
Assert.That(eeaResult.bezoutA, Is.EqualTo(expectedBezoutOfA));
28+
Assert.That(eeaResult.bezoutB, Is.EqualTo(expectedBezoutOfB));
2929
}
3030

3131
[TestCase(240, 46, 2, -9, 47)]
@@ -45,8 +45,8 @@ public static void TestCompute_BigInteger(long a, long b, long expectedGCD, long
4545
var eeaResult = ExtendedEuclideanAlgorithm.Compute(new BigInteger(a), new BigInteger(b));
4646

4747
// Assert
48-
Assert.AreEqual(new BigInteger(expectedGCD), eeaResult.gcd);
49-
Assert.AreEqual(new BigInteger(expectedBezoutOfA), eeaResult.bezoutA);
50-
Assert.AreEqual(new BigInteger(expectedBezoutOfB), eeaResult.bezoutB);
48+
Assert.That(eeaResult.gcd, Is.EqualTo(new BigInteger(expectedGCD)));
49+
Assert.That(eeaResult.bezoutA, Is.EqualTo(new BigInteger(expectedBezoutOfA)));
50+
Assert.That(eeaResult.bezoutB, Is.EqualTo(new BigInteger(expectedBezoutOfB)));
5151
}
5252
}

0 commit comments

Comments
 (0)