Test Fix: PackageRestoreManager uses ConcurrentBag for restored packa…

…ges (#5502)
NuGet · Nov 21, 2023 · 67271ef · 67271ef
1 parent 8c13fea
commit 67271ef
Showing 1 changed file with 24 additions and 9 deletions.
diff --git a/test/NuGet.Core.Tests/NuGet.PackageManagement.Test/PackageRestoreManagerTests.cs b/test/NuGet.Core.Tests/NuGet.PackageManagement.Test/PackageRestoreManagerTests.cs
@@ -15,18 +15,26 @@
 using NuGet.Versioning;
 using Test.Utility;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace NuGet.Test
 {
     public class PackageRestoreManagerTests
     {
         private readonly List<PackageIdentity> Packages = new List<PackageIdentity>
-            {
-                new PackageIdentity("jQuery", new NuGetVersion("1.4.4")),
-                new PackageIdentity("jQuery", new NuGetVersion("1.6.4")),
-                new PackageIdentity("jQuery.Validation", new NuGetVersion("1.13.1")),
-                new PackageIdentity("jQuery.UI.Combined", new NuGetVersion("1.11.2"))
-            };
+        {
+            new PackageIdentity("jQuery", new NuGetVersion("1.4.4")),
+            new PackageIdentity("jQuery", new NuGetVersion("1.6.4")),
+            new PackageIdentity("jQuery.Validation", new NuGetVersion("1.13.1")),
+            new PackageIdentity("jQuery.UI.Combined", new NuGetVersion("1.11.2"))
+        };
+
+        private readonly ITestOutputHelper _output;
+
+        public PackageRestoreManagerTests(ITestOutputHelper output)
+        {
+            _output = output;
+        }
 
         [Fact]
         public async Task TestGetMissingPackagesForSolution()
@@ -331,12 +339,19 @@ await nuGetPackageManager.InstallPackageAsync(projectB, jQueryValidation,
                     sourceRepositoryProvider,
                     testSettings,
                     testSolutionManager);
-                var restoredPackages = new List<PackageIdentity>();
-                packageRestoreManager.PackageRestoredEvent += delegate (object sender, PackageRestoredEventArgs args) { restoredPackages.Add(args.Package); };
+                var restoredPackages = new ConcurrentBag<PackageIdentity>();
+                packageRestoreManager.PackageRestoredEvent += delegate (object sender, PackageRestoredEventArgs args)
+                {
+                    _output.WriteLine($"PackageRestoredEvent: args.Package={args.Package};\n" +
+                        $"args.Restored={args.Restored}\n---\n");
+                    restoredPackages.Add(args.Package);
+                };
 
                 var restoreFailedPackages = new ConcurrentDictionary<Packaging.PackageReference, IEnumerable<string>>(PackageReferenceComparer.Instance);
                 packageRestoreManager.PackageRestoreFailedEvent += delegate (object sender, PackageRestoreFailedEventArgs args)
                 {
+                    _output.WriteLine($"PackageRestoreFailedEvent: {args.RestoreFailedPackageReference}\n" +
+                        $"ProjectNames: {args.ProjectNames}\n---\n");
                     restoreFailedPackages.AddOrUpdate(args.RestoreFailedPackageReference,
                         args.ProjectNames,
                         (Packaging.PackageReference packageReference, IEnumerable<string> oldValue) => { return oldValue; });
@@ -353,7 +368,7 @@ await nuGetPackageManager.InstallPackageAsync(projectB, jQueryValidation,
                 nuGetPackageManager.PackageExistsInPackagesFolder(testPackage2).Should().BeFalse();
 
                 // Act
-                await packageRestoreManager.RestoreMissingPackagesInSolutionAsync(testSolutionManager.SolutionDirectory,
+                PackageRestoreResult result = await packageRestoreManager.RestoreMissingPackagesInSolutionAsync(testSolutionManager.SolutionDirectory,
                     testNuGetProjectContext,
                     new TestLogger(),
                     CancellationToken.None);