Skip to content

Commit 81d479c

Browse files
Jack251970Jack251970
committed
Fix build issue for nunit 4.3.2 & Improve code quality
1 parent 2d90481 commit 81d479c

File tree

8 files changed

+113
-133
lines changed

8 files changed

+113
-133
lines changed

‎Flow.Launcher.Test/FilesFoldersTest.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Flow.Launcher.Plugin.SharedCommands;
22
using NUnit.Framework;
3+
using NUnit.Framework.Legacy;
34

45
namespace Flow.Launcher.Test
56
{
@@ -35,7 +36,7 @@ public class FilesFoldersTest
3536
[TestCase(@"c:\barr", @"c:\foo\..\bar\baz", false)]
3637
public void GivenTwoPaths_WhenCheckPathContains_ThenShouldBeExpectedResult(string parentPath, string path, bool expectedResult)
3738
{
38-
Assert.AreEqual(expectedResult, FilesFolders.PathContains(parentPath, path));
39+
ClassicAssert.AreEqual(expectedResult, FilesFolders.PathContains(parentPath, path));
3940
}
4041

4142
// Equality
@@ -47,7 +48,7 @@ public void GivenTwoPaths_WhenCheckPathContains_ThenShouldBeExpectedResult(strin
4748
[TestCase(@"c:\foo", @"c:\foo\", true)]
4849
public void GivenTwoPathsAreTheSame_WhenCheckPathContains_ThenShouldBeExpectedResult(string parentPath, string path, bool expectedResult)
4950
{
50-
Assert.AreEqual(expectedResult, FilesFolders.PathContains(parentPath, path, allowEqual: expectedResult));
51+
ClassicAssert.AreEqual(expectedResult, FilesFolders.PathContains(parentPath, path, allowEqual: expectedResult));
5152
}
5253
}
5354
}

‎Flow.Launcher.Test/FuzzyMatcherTest.cs

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Diagnostics;
44
using System.Linq;
55
using NUnit.Framework;
6+
using NUnit.Framework.Legacy;
67
using Flow.Launcher.Infrastructure;
78
using Flow.Launcher.Plugin;
89
using Flow.Launcher.Plugin.SharedModels;
@@ -21,8 +22,8 @@ public class FuzzyMatcherTest
2122
private const string MicrosoftSqlServerManagementStudio = "Microsoft SQL Server Management Studio";
2223
private const string VisualStudioCode = "Visual Studio Code";
2324

24-
public List<string> GetSearchStrings()
25-
=> new List<string>
25+
public static List<string> GetSearchStrings()
26+
=> new()
2627
{
2728
Chrome,
2829
"Choose which programs you want Windows to use for activities like web browsing, editing photos, sending e-mail, and playing music.",
@@ -34,7 +35,7 @@ public List<string> GetSearchStrings()
3435
OneOneOneOne
3536
};
3637

37-
public List<int> GetPrecisionScores()
38+
public static List<int> GetPrecisionScores()
3839
{
3940
var listToReturn = new List<int>();
4041

@@ -71,10 +72,10 @@ public void MatchTest()
7172

7273
results = results.Where(x => x.Score > 0).OrderByDescending(x => x.Score).ToList();
7374

74-
Assert.IsTrue(results.Count == 3);
75-
Assert.IsTrue(results[0].Title == "Inste");
76-
Assert.IsTrue(results[1].Title == "Install Package");
77-
Assert.IsTrue(results[2].Title == "file open in browser-test");
75+
ClassicAssert.IsTrue(results.Count == 3);
76+
ClassicAssert.IsTrue(results[0].Title == "Inste");
77+
ClassicAssert.IsTrue(results[1].Title == "Install Package");
78+
ClassicAssert.IsTrue(results[2].Title == "file open in browser-test");
7879
}
7980

8081
[TestCase("Chrome")]
@@ -84,7 +85,7 @@ public void WhenNotAllCharactersFoundInSearchString_ThenShouldReturnZeroScore(st
8485
var matcher = new StringMatcher();
8586
var scoreResult = matcher.FuzzyMatch(searchString, compareString).RawScore;
8687

87-
Assert.True(scoreResult == 0);
88+
ClassicAssert.True(scoreResult == 0);
8889
}
8990

9091
[TestCase("chr")]
@@ -125,7 +126,7 @@ public void GivenQueryString_WhenAppliedPrecisionFiltering_ThenShouldReturnGreat
125126
Debug.WriteLine("###############################################");
126127
Debug.WriteLine("");
127128

128-
Assert.IsFalse(filteredResult.Any(x => x.Score < precisionScore));
129+
ClassicAssert.IsFalse(filteredResult.Any(x => x.Score < precisionScore));
129130
}
130131
}
131132

@@ -151,7 +152,7 @@ public void WhenGivenQueryString_ThenShouldReturn_TheDesiredScoring(
151152
var rawScore = matcher.FuzzyMatch(queryString, compareString).RawScore;
152153

153154
// Should
154-
Assert.AreEqual(expectedScore, rawScore,
155+
ClassicAssert.AreEqual(expectedScore, rawScore,
155156
$"Expected score for compare string '{compareString}': {expectedScore}, Actual: {rawScore}");
156157
}
157158

@@ -190,12 +191,12 @@ public void WhenGivenDesiredPrecision_ThenShouldReturn_AllResultsGreaterOrEqual(
190191
Debug.WriteLine("###############################################");
191192
Debug.WriteLine($"QueryString: {queryString} CompareString: {compareString}");
192193
Debug.WriteLine(
193-
$"RAW SCORE: {matchResult.RawScore.ToString()}, PrecisionLevelSetAt: {expectedPrecisionScore} ({(int) expectedPrecisionScore})");
194+
$"RAW SCORE: {matchResult.RawScore}, PrecisionLevelSetAt: {expectedPrecisionScore} ({(int) expectedPrecisionScore})");
194195
Debug.WriteLine("###############################################");
195196
Debug.WriteLine("");
196197

197198
// Should
198-
Assert.AreEqual(expectedPrecisionResult, matchResult.IsSearchPrecisionScoreMet(),
199+
ClassicAssert.AreEqual(expectedPrecisionResult, matchResult.IsSearchPrecisionScoreMet(),
199200
$"Query: {queryString}{Environment.NewLine} " +
200201
$"Compare: {compareString}{Environment.NewLine}" +
201202
$"Raw Score: {matchResult.RawScore}{Environment.NewLine}" +
@@ -241,12 +242,12 @@ public void WhenGivenQuery_ShouldReturnResults_ContainingAllQuerySubstrings(
241242
Debug.WriteLine("###############################################");
242243
Debug.WriteLine($"QueryString: {queryString} CompareString: {compareString}");
243244
Debug.WriteLine(
244-
$"RAW SCORE: {matchResult.RawScore.ToString()}, PrecisionLevelSetAt: {expectedPrecisionScore} ({(int) expectedPrecisionScore})");
245+
$"RAW SCORE: {matchResult.RawScore}, PrecisionLevelSetAt: {expectedPrecisionScore} ({(int) expectedPrecisionScore})");
245246
Debug.WriteLine("###############################################");
246247
Debug.WriteLine("");
247248

248249
// Should
249-
Assert.AreEqual(expectedPrecisionResult, matchResult.IsSearchPrecisionScoreMet(),
250+
ClassicAssert.AreEqual(expectedPrecisionResult, matchResult.IsSearchPrecisionScoreMet(),
250251
$"Query:{queryString}{Environment.NewLine} " +
251252
$"Compare:{compareString}{Environment.NewLine}" +
252253
$"Raw Score: {matchResult.RawScore}{Environment.NewLine}" +
@@ -277,7 +278,7 @@ public void WhenGivenAQuery_Scoring_ShouldGiveMoreWeightToStartOfNewWord(
277278
Debug.WriteLine("");
278279

279280
// Should
280-
Assert.True(compareString1Result.Score > compareString2Result.Score,
281+
ClassicAssert.True(compareString1Result.Score > compareString2Result.Score,
281282
$"Query: \"{queryString}\"{Environment.NewLine} " +
282283
$"CompareString1: \"{compareString1}\", Score: {compareString1Result.Score}{Environment.NewLine}" +
283284
$"Should be greater than{Environment.NewLine}" +
@@ -310,7 +311,7 @@ public void WhenGivenTwoStrings_Scoring_ShouldGiveMoreWeightToTheStringCloserToI
310311
Debug.WriteLine("");
311312

312313
// Should
313-
Assert.True(compareString1Result.Score > compareString2Result.Score,
314+
ClassicAssert.True(compareString1Result.Score > compareString2Result.Score,
314315
$"Query: \"{queryString}\"{Environment.NewLine} " +
315316
$"CompareString1: \"{compareString1}\", Score: {compareString1Result.Score}{Environment.NewLine}" +
316317
$"Should be greater than{Environment.NewLine}" +
@@ -336,7 +337,7 @@ public void WhenMultipleResults_ExactMatchingResult_ShouldHaveGreatestScore(
336337
var secondScore = new[] {secondNameMatch, secondDescriptionMatch, secondExecutableNameMatch}.Max();
337338

338339
// Assert
339-
Assert.IsTrue(firstScore > secondScore,
340+
ClassicAssert.IsTrue(firstScore > secondScore,
340341
$"Query: \"{queryString}\"{Environment.NewLine} " +
341342
$"Name of first: \"{firstName}\", Final Score: {firstScore}{Environment.NewLine}" +
342343
$"Should be greater than{Environment.NewLine}" +
@@ -360,7 +361,7 @@ public void WhenGivenAnAcronymQuery_ShouldReturnAcronymScore(string queryString,
360361
{
361362
var matcher = new StringMatcher();
362363
var score = matcher.FuzzyMatch(queryString, compareString).Score;
363-
Assert.IsTrue(score == desiredScore,
364+
ClassicAssert.IsTrue(score == desiredScore,
364365
$@"Query: ""{queryString}""
365366
CompareString: ""{compareString}""
366367
Score: {score}

‎Flow.Launcher.Test/HttpTest.cs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using NUnit.Framework;
1+
using NUnit.Framework;
2+
using NUnit.Framework.Legacy;
23
using System;
34
using Flow.Launcher.Infrastructure.UserSettings;
45
using Flow.Launcher.Infrastructure.Http;
@@ -16,16 +17,16 @@ public void GivenHttpProxy_WhenUpdated_ThenWebProxyShouldAlsoBeUpdatedToTheSame(
1617

1718
proxy.Enabled = true;
1819
proxy.Server = "127.0.0.1";
19-
Assert.AreEqual(Http.WebProxy.Address, new Uri($"http://{proxy.Server}:{proxy.Port}"));
20-
Assert.IsNull(Http.WebProxy.Credentials);
20+
ClassicAssert.AreEqual(Http.WebProxy.Address, new Uri($"http://{proxy.Server}:{proxy.Port}"));
21+
ClassicAssert.IsNull(Http.WebProxy.Credentials);
2122

2223
proxy.UserName = "test";
23-
Assert.NotNull(Http.WebProxy.Credentials);
24-
Assert.AreEqual(Http.WebProxy.Credentials.GetCredential(Http.WebProxy.Address, "Basic").UserName, proxy.UserName);
25-
Assert.AreEqual(Http.WebProxy.Credentials.GetCredential(Http.WebProxy.Address, "Basic").Password, "");
24+
ClassicAssert.NotNull(Http.WebProxy.Credentials);
25+
ClassicAssert.AreEqual(Http.WebProxy.Credentials.GetCredential(Http.WebProxy.Address, "Basic").UserName, proxy.UserName);
26+
ClassicAssert.AreEqual(Http.WebProxy.Credentials.GetCredential(Http.WebProxy.Address, "Basic").Password, "");
2627

2728
proxy.Password = "test password";
28-
Assert.AreEqual(Http.WebProxy.Credentials.GetCredential(Http.WebProxy.Address, "Basic").Password, proxy.Password);
29+
ClassicAssert.AreEqual(Http.WebProxy.Credentials.GetCredential(Http.WebProxy.Address, "Basic").Password, proxy.Password);
2930
}
3031
}
3132
}

‎Flow.Launcher.Test/PluginLoadTest.cs

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using NUnit.Framework;
2+
using NUnit.Framework.Legacy;
23
using Flow.Launcher.Core.Plugin;
34
using Flow.Launcher.Plugin;
45
using System.Collections.Generic;
@@ -15,37 +16,37 @@ public void GivenDuplicatePluginMetadatasWhenLoadedThenShouldReturnOnlyUniqueLis
1516
// Given
1617
var duplicateList = new List<PluginMetadata>
1718
{
18-
new PluginMetadata
19+
new()
1920
{
2021
ID = "CEA0TYUC6D3B4085823D60DC76F28855",
2122
Version = "1.0.0"
2223
},
23-
new PluginMetadata
24+
new()
2425
{
2526
ID = "CEA0TYUC6D3B4085823D60DC76F28855",
2627
Version = "1.0.1"
2728
},
28-
new PluginMetadata
29+
new()
2930
{
3031
ID = "CEA0TYUC6D3B4085823D60DC76F28855",
3132
Version = "1.0.2"
3233
},
33-
new PluginMetadata
34+
new()
3435
{
3536
ID = "CEA0TYUC6D3B4085823D60DC76F28855",
3637
Version = "1.0.0"
3738
},
38-
new PluginMetadata
39+
new()
3940
{
4041
ID = "CEA0TYUC6D3B4085823D60DC76F28855",
4142
Version = "1.0.0"
4243
},
43-
new PluginMetadata
44+
new()
4445
{
4546
ID = "ABC0TYUC6D3B7855823D60DC76F28855",
4647
Version = "1.0.0"
4748
},
48-
new PluginMetadata
49+
new()
4950
{
5051
ID = "ABC0TYUC6D3B7855823D60DC76F28855",
5152
Version = "1.0.0"
@@ -56,11 +57,11 @@ public void GivenDuplicatePluginMetadatasWhenLoadedThenShouldReturnOnlyUniqueLis
5657
(var unique, var duplicates) = PluginConfig.GetUniqueLatestPluginMetadata(duplicateList);
5758

5859
// Then
59-
Assert.True(unique.FirstOrDefault().ID == "CEA0TYUC6D3B4085823D60DC76F28855" && unique.FirstOrDefault().Version == "1.0.2");
60-
Assert.True(unique.Count() == 1);
60+
ClassicAssert.True(unique.FirstOrDefault().ID == "CEA0TYUC6D3B4085823D60DC76F28855" && unique.FirstOrDefault().Version == "1.0.2");
61+
ClassicAssert.True(unique.Count == 1);
6162

62-
Assert.False(duplicates.Any(x => x.Version == "1.0.2" && x.ID == "CEA0TYUC6D3B4085823D60DC76F28855"));
63-
Assert.True(duplicates.Count() == 6);
63+
ClassicAssert.False(duplicates.Any(x => x.Version == "1.0.2" && x.ID == "CEA0TYUC6D3B4085823D60DC76F28855"));
64+
ClassicAssert.True(duplicates.Count == 6);
6465
}
6566

6667
[Test]
@@ -69,12 +70,12 @@ public void GivenDuplicatePluginMetadatasWithNoUniquePluginWhenLoadedThenShouldR
6970
// Given
7071
var duplicateList = new List<PluginMetadata>
7172
{
72-
new PluginMetadata
73+
new()
7374
{
7475
ID = "CEA0TYUC6D3B7855823D60DC76F28855",
7576
Version = "1.0.0"
7677
},
77-
new PluginMetadata
78+
new()
7879
{
7980
ID = "CEA0TYUC6D3B7855823D60DC76F28855",
8081
Version = "1.0.0"
@@ -85,8 +86,8 @@ public void GivenDuplicatePluginMetadatasWithNoUniquePluginWhenLoadedThenShouldR
8586
(var unique, var duplicates) = PluginConfig.GetUniqueLatestPluginMetadata(duplicateList);
8687

8788
// Then
88-
Assert.True(unique.Count() == 0);
89-
Assert.True(duplicates.Count() == 2);
89+
ClassicAssert.True(unique.Count == 0);
90+
ClassicAssert.True(duplicates.Count == 2);
9091
}
9192
}
9293
}

0 commit comments

Comments
 (0)