Skip to content

Commit 1054e7a

Browse files
committed
C#: Update assets unit tests.
1 parent 003166a commit 1054e7a

File tree

1 file changed

+27
-10
lines changed
  • csharp/extractor/Semmle.Extraction.Tests

1 file changed

+27
-10
lines changed

csharp/extractor/Semmle.Extraction.Tests/Assets.cs

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,28 @@ public void TestAssets1()
1414
// Setup
1515
var assets = new Assets(new ProgressMonitor(new LoggerStub()));
1616
var json = assetsJson1;
17+
var dependencies = new Dependencies();
1718

1819
// Execute
19-
var success = assets.TryParse(json, out var dependencies);
20+
var success = assets.TryParse(json, dependencies);
2021

2122
// Verify
2223
Assert.True(success);
23-
Assert.Equal(4, dependencies.Count());
24+
Assert.Equal(5, dependencies.Required.Count());
25+
Assert.Equal(4, dependencies.UsedPackages.Count());
2426

25-
var normalizedPaths = dependencies.Select(FixExpectedPathOnWindows);
26-
// Packages references
27+
var normalizedPaths = dependencies.Required.Select(FixExpectedPathOnWindows);
28+
// Required references
2729
Assert.Contains("castle.core/4.4.1/lib/netstandard1.5/Castle.Core.dll", normalizedPaths);
30+
Assert.Contains("castle.core/4.4.1/lib/netstandard1.5/Castle.Core2.dll", normalizedPaths);
2831
Assert.Contains("json.net/1.0.33/lib/netstandard2.0/Json.Net.dll", normalizedPaths);
2932
Assert.Contains("microsoft.aspnetcore.cryptography.internal/6.0.8/lib/net6.0/Microsoft.AspNetCore.Cryptography.Internal.dll", normalizedPaths);
3033
Assert.Contains("humanizer.core/2.8.26/lib/netstandard2.0", normalizedPaths);
34+
// Used packages
35+
Assert.Contains("castle.core", dependencies.UsedPackages);
36+
Assert.Contains("json.net", dependencies.UsedPackages);
37+
Assert.Contains("microsoft.aspnetcore.cryptography.internal", dependencies.UsedPackages);
38+
Assert.Contains("humanizer.core", dependencies.UsedPackages);
3139
}
3240

3341
[Fact]
@@ -36,15 +44,20 @@ public void TestAssets2()
3644
// Setup
3745
var assets = new Assets(new ProgressMonitor(new LoggerStub()));
3846
var json = assetsJson2;
47+
var dependencies = new Dependencies();
3948

4049
// Execute
41-
var success = assets.TryParse(json, out var dependencies);
50+
var success = assets.TryParse(json, dependencies);
4251

4352
// Verify
4453
Assert.True(success);
45-
Assert.Equal(2, dependencies.Count());
46-
Assert.Contains("microsoft.netframework.referenceassemblies/1.0.3", dependencies);
47-
Assert.Contains("microsoft.netframework.referenceassemblies.net48/1.0.3", dependencies);
54+
Assert.Equal(2, dependencies.Required.Count());
55+
// Required references
56+
Assert.Contains("microsoft.netframework.referenceassemblies/1.0.3", dependencies.Required);
57+
Assert.Contains("microsoft.netframework.referenceassemblies.net48/1.0.3", dependencies.Required);
58+
// Used packages
59+
Assert.Contains("microsoft.netframework.referenceassemblies", dependencies.UsedPackages);
60+
Assert.Contains("microsoft.netframework.referenceassemblies.net48", dependencies.UsedPackages);
4861
}
4962

5063
[Fact]
@@ -53,13 +66,14 @@ public void TestAssets3()
5366
// Setup
5467
var assets = new Assets(new ProgressMonitor(new LoggerStub()));
5568
var json = "garbage data";
69+
var dependencies = new Dependencies();
5670

5771
// Execute
58-
var success = assets.TryParse(json, out var dependencies);
72+
var success = assets.TryParse(json, dependencies);
5973

6074
// Verify
6175
Assert.False(success);
62-
Assert.Empty(dependencies);
76+
Assert.Empty(dependencies.Required);
6377
}
6478

6579
private readonly string assetsJson1 = """
@@ -76,6 +90,9 @@ public void TestAssets3()
7690
"compile": {
7791
"lib/netstandard1.5/Castle.Core.dll": {
7892
"related": ".xml"
93+
},
94+
"lib/netstandard1.5/Castle.Core2.dll": {
95+
"related": ".xml"
7996
}
8097
},
8198
"runtime": {

0 commit comments

Comments
 (0)