Skip to content

Commit 1c46f56

Browse files
committed
Minor Cleanup
1 parent 0257ba2 commit 1c46f56

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

Src/NuGetDefense.Lib/Scanner.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -277,11 +277,11 @@ private void ScanVulnerabilities(ScanOptions options)
277277
vulnDict);
278278
}
279279

280-
if (_settings.ErrorSettings.IgnoredCvEs != null)
280+
if (_settings.ErrorSettings.IgnoredCvEs is { Length: > 0 })
281281
{
282-
Log.Logger.Information("ignoring {ignoredCVECount} Vulnerabilities", _settings.ErrorSettings.IgnoredCvEs.Length);
283-
if (_settings.ErrorSettings.IgnoredCvEs.Length > 0)
284-
VulnerabilityData.IgnoreCVEs(vulnDict, _settings.ErrorSettings.IgnoredCvEs);
282+
Log.Logger.Information("ignoring {ignoredCVECount} Vulnerabilities",
283+
_settings.ErrorSettings.IgnoredCvEs.Length);
284+
VulnerabilityData.IgnoreCVEs(vulnDict, _settings.ErrorSettings.IgnoredCvEs);
285285
}
286286

287287
if (vulnDict != null) ReportVulnerabilities(vulnDict);

Src/NuGetDefenseTests/SqliteCacheTests.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void UpdateCacheNoVulns()
3232
const string packageVersion = "1.2.3-123Test";
3333
var pkgs = new[]
3434
{
35-
new NuGetPackage { Version = packageVersion, Dependencies = Array.Empty<string>(), Id = packageId }
35+
new NuGetPackage { Version = packageVersion, Dependencies = [], Id = packageId }
3636
};
3737

3838
cache.UpdateCache(new(), pkgs, TestSourceID);
@@ -52,8 +52,8 @@ public void UpdateCacheWithVulnsCached()
5252
const string packageVersion = "1.2.3-123Test";
5353
var pkgs = new[]
5454
{
55-
new NuGetPackage { Version = "4.5.2", Dependencies = Array.Empty<string>(), Id = "no_vulns" },
56-
new NuGetPackage { Version = packageVersion, Dependencies = Array.Empty<string>(), Id = packageId }
55+
new NuGetPackage { Version = "4.5.2", Dependencies = [], Id = "no_vulns" },
56+
new NuGetPackage { Version = packageVersion, Dependencies = [], Id = packageId }
5757
};
5858

5959
Dictionary<string, Dictionary<string, Vulnerability>> vulns = new()
@@ -96,8 +96,8 @@ public void VulnerabilityUpsertSucceedsWhenVulnerabilityExists()
9696
const string packageVersion = "1.2.3-123Test";
9797
var pkgs = new[]
9898
{
99-
new NuGetPackage { Version = "4.5.2", Dependencies = Array.Empty<string>(), Id = "no_vulns" },
100-
new NuGetPackage { Version = packageVersion, Dependencies = Array.Empty<string>(), Id = packageId }
99+
new NuGetPackage { Version = "4.5.2", Dependencies = [], Id = "no_vulns" },
100+
new NuGetPackage { Version = packageVersion, Dependencies = [], Id = packageId }
101101
};
102102

103103
Dictionary<string, Dictionary<string, Vulnerability>> vulns = new()
@@ -133,8 +133,8 @@ public void VulnerabilityUpsertSucceedsWhenVulnerabilityDoesNotExsist()
133133
const string packageVersion = "1.2.3-123Test";
134134
var pkgs = new[]
135135
{
136-
new NuGetPackage { Version = "4.5.2", Dependencies = Array.Empty<string>(), Id = "no_vulns" },
137-
new NuGetPackage { Version = packageVersion, Dependencies = Array.Empty<string>(), Id = packageId }
136+
new NuGetPackage { Version = "4.5.2", Dependencies = [], Id = "no_vulns" },
137+
new NuGetPackage { Version = packageVersion, Dependencies = [], Id = packageId }
138138
};
139139

140140
Dictionary<string, Dictionary<string, Vulnerability>> vulns = new()

Src/NuGetDefenseTests/VulnerabilityReportsTest.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ public void IgnoreVulnerabilitiesForPackage()
6363
};
6464

6565
IgnorePackages(in pkgs, ignorePkgs, out pkgs);
66-
Assert.True(pkgs.Length == 1);
67-
Assert.True(pkgs[0].Id == "TestPkg");
68-
Assert.True(pkgs[0].Version == "1.0.1");
69-
Assert.True(pkgs[0].LineNumber == 1);
66+
Assert.Single(pkgs);
67+
Assert.Equal("TestPkg", pkgs[0].Id);
68+
Assert.Equal("1.0.1", pkgs[0].Version);
69+
Assert.Equal(1, pkgs[0].LineNumber);
7070
}
7171

7272
[Fact]

0 commit comments

Comments
 (0)