Skip to content

Commit 4ece6dc

Browse files
SteveDesmond-caSteveDesmond-ca
committed
Use collection expressions where available
1 parent 4a57799 commit 4ece6dc

File tree

6 files changed

+39
-48
lines changed

6 files changed

+39
-48
lines changed

‎src/LibYear.Core/ProjectFileManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ private async Task<IReadOnlyCollection<IProjectFile>> GetProjects(string path, b
2828
}
2929

3030
var fileInfo = _fileSystem.FileInfo.New(path);
31-
return new[] { await ReadFile(fileInfo) }.ToArray();
31+
return [await ReadFile(fileInfo)];
3232
}
3333

3434
public async Task<IReadOnlyCollection<IProjectFile>> GetProjectsInDir(string dirPath, bool recursive)

‎test/LibYear.Core.Tests/PackageVersionCheckerTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public async Task CanGetVersionInfoFromMetadata()
1414
//arrange
1515
var metadata = PackageSearchMetadataBuilder.FromIdentity(new PackageIdentity("test", new PackageVersion(1, 2, 3))).Build();
1616
var metadataResource = Substitute.For<PackageMetadataResource>();
17-
metadataResource.GetMetadataAsync(Arg.Any<string>(), Arg.Any<bool>(), Arg.Any<bool>(), Arg.Any<SourceCacheContext>(), Arg.Any<ILogger>(), Arg.Any<CancellationToken>()).Returns(new [] { metadata });
17+
metadataResource.GetMetadataAsync(Arg.Any<string>(), Arg.Any<bool>(), Arg.Any<bool>(), Arg.Any<SourceCacheContext>(), Arg.Any<ILogger>(), Arg.Any<CancellationToken>()).Returns([metadata]);
1818

1919
var checker = new PackageVersionChecker(metadataResource);
2020

@@ -60,7 +60,7 @@ public async Task CanGetResultFromMetadata()
6060
metadata2.IsListed.Returns(true);
6161

6262
var metadataResource = Substitute.For<PackageMetadataResource>();
63-
metadataResource.GetMetadataAsync(Arg.Any<string>(), Arg.Any<bool>(), Arg.Any<bool>(), Arg.Any<SourceCacheContext>(), Arg.Any<ILogger>(), Arg.Any<CancellationToken>()).Returns(new [] { metadata1, metadata2 });
63+
metadataResource.GetMetadataAsync(Arg.Any<string>(), Arg.Any<bool>(), Arg.Any<bool>(), Arg.Any<SourceCacheContext>(), Arg.Any<ILogger>(), Arg.Any<CancellationToken>()).Returns([metadata1, metadata2]);
6464

6565
var checker = new PackageVersionChecker(metadataResource);
6666

@@ -207,7 +207,7 @@ public async Task GetPackagesGetsPackages()
207207
var project = new TestProjectFile("test", new Dictionary<string, PackageVersion?> { { "test", new PackageVersion(1, 2, 3) } });
208208

209209
//act
210-
var packages = await checker.GetPackages(new[] { project });
210+
var packages = await checker.GetPackages([project]);
211211

212212
//assert
213213
var latest = packages.Details.First().Details.First().Latest!.Version.ToString();

‎test/LibYear.Core.Tests/ProjectFileManagerTests.cs‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public async Task GetAllProjectsGetsCurrentDirectoryByDefault()
138138
var fileManager = new ProjectFileManager(fileSystem);
139139

140140
//act
141-
var projects = await fileManager.GetAllProjects(Array.Empty<string>());
141+
var projects = await fileManager.GetAllProjects([]);
142142

143143
//assert
144144
Assert.Contains(projects, p => p.FileName.EndsWith("Directory.Build.props"));
@@ -157,13 +157,11 @@ public async Task CanUpdateProjectFiles()
157157
var fileManager = new ProjectFileManager(fileSystem);
158158

159159
//act
160-
var allResults = new SolutionResult(new[]
161-
{
162-
new ProjectResult(new TestProjectFile("test1"), new[]
163-
{
164-
new Result("test1", new Release(new PackageVersion(0, 1, 0), DateTime.Today), new Release(new PackageVersion(1, 2, 3), DateTime.Today)),
165-
})
166-
});
160+
var allResults = new SolutionResult([
161+
new ProjectResult(new TestProjectFile("test1"), [
162+
new Result("test1", new Release(new PackageVersion(0, 1, 0), DateTime.Today), new Release(new PackageVersion(1, 2, 3), DateTime.Today))
163+
])
164+
]);
167165
var updated = await fileManager.Update(allResults);
168166

169167
//assert
@@ -197,7 +195,7 @@ public async Task GetAllProjectsWithoutRecurseFlag()
197195
var fileManager = new ProjectFileManager(fileSystem);
198196

199197
//act
200-
var projects = await fileManager.GetAllProjects(["FileTypes"], false);
198+
var projects = await fileManager.GetAllProjects(["FileTypes"]);
201199

202200
//assert
203201
Assert.DoesNotContain(projects, p => p.FileName.EndsWith("sub-project.csproj"));

‎test/LibYear.Core.Tests/SolutionResultTests.cs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,14 @@ public void DaysBehindIsTotalFromProjects()
1212
var project2 = new TestProjectFile("test2", new Dictionary<string, PackageVersion?>());
1313
var projects = new[]
1414
{
15-
new ProjectResult(project1, new[]
16-
{
15+
new ProjectResult(project1, [
1716
new Result("dep1", new Release(new PackageVersion("1.2.3"), new DateTime(2022, 10, 1)), new Release(new PackageVersion("1.2.4"), new DateTime(2022, 10, 5))),
1817
new Result("dep2", new Release(new PackageVersion("1.2.3"), new DateTime(2022, 10, 2)), new Release(new PackageVersion("1.2.4"), new DateTime(2022, 10, 5)))
19-
}),
20-
new ProjectResult(project2, new[]
21-
{
18+
]),
19+
new ProjectResult(project2, [
2220
new Result("dep3", new Release(new PackageVersion("1.2.3"), new DateTime(2022, 10, 3)), new Release(new PackageVersion("1.2.4"), new DateTime(2022, 10, 5))),
2321
new Result("dep4", new Release(new PackageVersion("1.2.3"), new DateTime(2022, 10, 4)), new Release(new PackageVersion("1.2.4"), new DateTime(2022, 10, 5)))
24-
})
22+
])
2523
};
2624
var result = new SolutionResult(projects);
2725

‎test/LibYear.Tests/AppTests.cs‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ public async Task UpdateFlagUpdates()
1616
{
1717
//arrange
1818
var checker = Substitute.For<IPackageVersionChecker>();
19-
checker.GetPackages(Arg.Any<IReadOnlyCollection<IProjectFile>>()).Returns(new SolutionResult(Array.Empty<ProjectResult>()));
19+
checker.GetPackages(Arg.Any<IReadOnlyCollection<IProjectFile>>()).Returns(new SolutionResult([]));
2020

2121
var manager = Substitute.For<IProjectFileManager>();
22-
manager.GetAllProjects(Arg.Any<IReadOnlyCollection<string>>()).Returns(new IProjectFile[] { new TestProjectFile("test1") });
22+
manager.GetAllProjects(Arg.Any<IReadOnlyCollection<string>>()).Returns([new TestProjectFile("test1")]);
2323
manager.Update(Arg.Any<SolutionResult>()).Returns(UpdateResult);
2424

2525
var console = new TestConsole();
@@ -38,13 +38,13 @@ public async Task DisplaysPackagesByDefault()
3838
//arrange
3939
var checker = Substitute.For<IPackageVersionChecker>();
4040
var projectFile = new TestProjectFile("test project");
41-
var result = new ProjectResult(projectFile, new[] { new Result("test1", new Release(new PackageVersion(1, 2, 3), DateTime.Today), new Release(new PackageVersion(1, 2, 3), DateTime.Today)) });
41+
var result = new ProjectResult(projectFile, [new Result("test1", new Release(new PackageVersion(1, 2, 3), DateTime.Today), new Release(new PackageVersion(1, 2, 3), DateTime.Today))]);
4242

43-
var results = new SolutionResult(new[] { result });
43+
var results = new SolutionResult([result]);
4444
checker.GetPackages(Arg.Any<IReadOnlyCollection<IProjectFile>>()).Returns(results);
4545

4646
var manager = Substitute.For<IProjectFileManager>();
47-
manager.GetAllProjects(Arg.Any<IReadOnlyCollection<string>>()).Returns(new IProjectFile[] { projectFile });
47+
manager.GetAllProjects(Arg.Any<IReadOnlyCollection<string>>()).Returns([projectFile]);
4848

4949
var console = new TestConsole();
5050
var app = new App(checker, manager, console);
@@ -62,13 +62,13 @@ public async Task QuietModeIgnoresPackageAtNewestVersion()
6262
//arrange
6363
var checker = Substitute.For<IPackageVersionChecker>();
6464
var projectFile = new TestProjectFile("test project");
65-
var result = new ProjectResult(projectFile, new[] { new Result("test1", new Release(new PackageVersion(1, 2, 3), DateTime.Today), new Release(new PackageVersion(1, 2, 3), DateTime.Today)) });
65+
var result = new ProjectResult(projectFile, [new Result("test1", new Release(new PackageVersion(1, 2, 3), DateTime.Today), new Release(new PackageVersion(1, 2, 3), DateTime.Today))]);
6666

67-
var results = new SolutionResult(new[] { result });
67+
var results = new SolutionResult([result]);
6868
checker.GetPackages(Arg.Any<IReadOnlyCollection<IProjectFile>>()).Returns(results);
6969

7070
var manager = Substitute.For<IProjectFileManager>();
71-
manager.GetAllProjects(Arg.Any<IReadOnlyCollection<string>>()).Returns(new IProjectFile[] { projectFile });
71+
manager.GetAllProjects(Arg.Any<IReadOnlyCollection<string>>()).Returns([projectFile]);
7272

7373
var console = new TestConsole();
7474
var app = new App(checker, manager, console);
@@ -87,15 +87,14 @@ public async Task MultiplePackagesShowsGrandTotal()
8787
var checker = Substitute.For<IPackageVersionChecker>();
8888
var projectFile1 = new TestProjectFile("test project 1");
8989
var projectFile2 = new TestProjectFile("test project 2");
90-
var results = new SolutionResult(new []
91-
{
92-
new ProjectResult(projectFile1, new[] { new Result("test1", new Release(new PackageVersion(1, 2, 3), DateTime.Today), new Release(new PackageVersion(1, 2, 3), DateTime.Today)) }),
93-
new ProjectResult(projectFile2, new[] { new Result("test1", new Release(new PackageVersion(1, 2, 3), DateTime.Today), new Release(new PackageVersion(1, 2, 3), DateTime.Today)) })
94-
});
90+
var results = new SolutionResult([
91+
new ProjectResult(projectFile1, [new Result("test1", new Release(new PackageVersion(1, 2, 3), DateTime.Today), new Release(new PackageVersion(1, 2, 3), DateTime.Today))]),
92+
new ProjectResult(projectFile2, [new Result("test1", new Release(new PackageVersion(1, 2, 3), DateTime.Today), new Release(new PackageVersion(1, 2, 3), DateTime.Today))])
93+
]);
9594
checker.GetPackages(Arg.Any<IReadOnlyCollection<IProjectFile>>()).Returns(results);
9695

9796
var manager = Substitute.For<IProjectFileManager>();
98-
manager.GetAllProjects(Arg.Any<IReadOnlyCollection<string>>()).Returns(new IProjectFile[] { projectFile1, projectFile2 });
97+
manager.GetAllProjects(Arg.Any<IReadOnlyCollection<string>>()).Returns([projectFile1, projectFile2]);
9998

10099
var console = new TestConsole();
101100
var app = new App(checker, manager, console);
@@ -114,15 +113,14 @@ public async Task EmptyResultsAreSkipped()
114113
var checker = Substitute.For<IPackageVersionChecker>();
115114
var projectFile1 = new TestProjectFile("test project 1");
116115
var projectFile2 = new TestProjectFile("test project 2");
117-
var results = new SolutionResult(new []
118-
{
119-
new ProjectResult(projectFile1, new[] { new Result("test1", new Release(new PackageVersion(1, 2, 3), DateTime.Today), new Release(new PackageVersion(1, 2, 3), DateTime.Today)) }),
116+
var results = new SolutionResult([
117+
new ProjectResult(projectFile1, [new Result("test1", new Release(new PackageVersion(1, 2, 3), DateTime.Today), new Release(new PackageVersion(1, 2, 3), DateTime.Today))]),
120118
new ProjectResult(projectFile2, new List<Result>())
121-
});
119+
]);
122120
checker.GetPackages(Arg.Any<IReadOnlyCollection<IProjectFile>>()).Returns(results);
123121

124122
var manager = Substitute.For<IProjectFileManager>();
125-
manager.GetAllProjects(Arg.Any<IReadOnlyCollection<string>>()).Returns(new IProjectFile[] { projectFile1, projectFile2 });
123+
manager.GetAllProjects(Arg.Any<IReadOnlyCollection<string>>()).Returns([projectFile1, projectFile2]);
126124

127125
var console = new TestConsole();
128126
var app = new App(checker, manager, console);
@@ -142,7 +140,7 @@ public async Task MissingProjectFilesShowsError()
142140
var checker = Substitute.For<IPackageVersionChecker>();
143141

144142
var manager = Substitute.For<IProjectFileManager>();
145-
manager.GetAllProjects(Arg.Any<IReadOnlyCollection<string>>()).Returns(Array.Empty<IProjectFile>());
143+
manager.GetAllProjects(Arg.Any<IReadOnlyCollection<string>>()).Returns([]);
146144

147145
var console = new TestConsole();
148146
var app = new App(checker, manager, console);

‎test/LibYear.Tests/LimitCheckerTests.cs‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,16 @@ namespace LibYear.Tests;
66

77
public class LimitCheckerTests
88
{
9-
private static readonly SolutionResult SolutionResult = new(new[]
10-
{
11-
new ProjectResult(new TestProjectFile("test1", new Dictionary<string, PackageVersion?>()), new[]
12-
{
9+
private static readonly SolutionResult SolutionResult = new([
10+
new ProjectResult(new TestProjectFile("test1", new Dictionary<string, PackageVersion?>()), [
1311
new Result("dep1", new Release(new PackageVersion("1.2.3"), new DateTime(2018, 1, 1)), new Release(new PackageVersion("1.2.4"), new DateTime(2022, 1, 1))),
1412
new Result("dep2", new Release(new PackageVersion("1.2.3"), new DateTime(2019, 1, 1)), new Release(new PackageVersion("1.2.4"), new DateTime(2022, 1, 1)))
15-
}),
16-
new ProjectResult(new TestProjectFile("test1", new Dictionary<string, PackageVersion?>()), new[]
17-
{
13+
]),
14+
new ProjectResult(new TestProjectFile("test1", new Dictionary<string, PackageVersion?>()), [
1815
new Result("dep3", new Release(new PackageVersion("1.2.3"), new DateTime(2020, 1, 1)), new Release(new PackageVersion("1.2.4"), new DateTime(2022, 1, 1))),
1916
new Result("dep4", new Release(new PackageVersion("1.2.3"), new DateTime(2021, 1, 1)), new Release(new PackageVersion("1.2.4"), new DateTime(2022, 1, 1)))
20-
})
21-
});
17+
])
18+
]);
2219

2320
[Fact]
2421
public void PassesWhenNoLimitsSet()

0 commit comments

Comments
 (0)