Failing test showing package dependency in range does not work if more than one package references

Author: tl-maisie-sadler

CycloneDX.Tests/ProgramTests.cs

@@ -18,12 +18,17 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Abstractions;
 using System.IO.Abstractions.TestingHelpers;
+using System.Runtime.Serialization.Formatters;
+using System.Security.Cryptography;
 using System.Threading.Tasks;
 using CycloneDX.Interfaces;
 using CycloneDX.Models;
+using CycloneDX.Services;
 using Moq;
 using Xunit;
+using static CycloneDX.Models.Component;
 using XFS = System.IO.Abstractions.TestingHelpers.MockUnixSupport;
 
 namespace CycloneDX.Tests
@@ -75,7 +80,7 @@ public async Task CallingCycloneDX_WithOutputFilename_CreatesOutputFilename()
                 .Setup(s => s.GetSolutionDotnetDependencys(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<string>(), It.IsAny<string>()))
                 .ReturnsAsync(new HashSet<DotnetDependency>());
 
-            Runner runner = new Runner(fileSystem: mockFileSystem, null, null, null, null, null, solutionFileService: mockSolutionFileService.Object, null);            
+            Runner runner = new Runner(fileSystem: mockFileSystem, null, null, null, null, null, solutionFileService: mockSolutionFileService.Object, null);
 
             RunOptions runOptions = new RunOptions
             {
@@ -128,7 +133,55 @@ public async Task CallingCycloneDX_WithSolutionOrProjectFileThatDoesntExistsRetu
 
             var exitCode = await runner.HandleCommandAsync(runOptions);
 
-            Assert.NotEqual((int)ExitCode.OK, exitCode);            
+            Assert.NotEqual((int)ExitCode.OK, exitCode);
+        }
+
+        [Fact]
+        public async Task CallingCycloneDX_WithMultipleReferencesToPackage_ResolvesOne()
+        {
+            var solutionFile = "test.sln";
+            var mockFileSystem = new MockFileSystem(new Dictionary<string, MockFileData>
+            {
+                {solutionFile,new MockFileData("") },
+            });
+            var mockSolutionFileService = new Mock<ISolutionFileService>();
+            mockSolutionFileService
+                .Setup(s => s.GetSolutionDotnetDependencys(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<string>(), It.IsAny<string>()))
+                .ReturnsAsync(new HashSet<DotnetDependency>
+                {
+                    new DotnetDependency { Name = "Package 1", Version = "1.2.3" },
+                    new DotnetDependency { Name = "Package 1", Version = "1.3.5" },
+                    new DotnetDependency { Name = "Package 2", Version = "2.0.0", Dependencies = new Dictionary<string, string>{{"Package 1", "[1.2.3, 1.2.3]" }} },
+                });
+
+            var mockNugetService = new Mock<INugetService>();
+            mockNugetService.Setup(s => s.GetComponentAsync(It.Is<DotnetDependency>(o => o.Name == "Package 1" && o.Version == "1.2.3")))
+                .ReturnsAsync(new Component { Name = "Package 1", Version = "1.2.3", });
+            mockNugetService.Setup(s => s.GetComponentAsync(It.Is<DotnetDependency>(o => o.Name == "Package 1" && o.Version == "1.3.5")))
+                .ReturnsAsync(new Component { Name = "Package 1", Version = "1.3.5", });
+            mockNugetService.Setup(s => s.GetComponentAsync(It.Is<DotnetDependency>(o => o.Name == "Package 2" && o.Version == "2.0.0")))
+                .ReturnsAsync(new Component { Name = "Package 2", Version = "2.0.0", });
+
+            var mockNugetServiceFactory = new Mock<INugetServiceFactory>();
+            mockNugetServiceFactory
+                .Setup(s => s.Create(It.IsAny<RunOptions>(), It.IsAny<IFileSystem>(), It.IsAny<IGithubService>(), It.IsAny<List<string>>()))
+                .Returns(mockNugetService.Object);
+
+            Runner runner = new Runner(fileSystem: mockFileSystem, null, null, null, null, null, solutionFileService: mockSolutionFileService.Object, nugetServiceFactory: mockNugetServiceFactory.Object);
+
+            RunOptions runOptions = new RunOptions
+            {
+                SolutionOrProjectFile = XFS.Path(solutionFile),
+                scanProjectReferences = true,
+                outputDirectory = XFS.Path(@"c:\NewDirectory"),
+                outputFilename = XFS.Path(@"my_bom.xml")
+            };
+
+            var exitCode = await runner.HandleCommandAsync(runOptions);
+
+            Assert.Equal((int)ExitCode.OK, exitCode);
+            var output = mockFileSystem.GetFile("/NewDirectory/my_bom.xml");
+            Assert.NotNull(output);
         }
     }
 }