fixup failing tests

- file conflicts are now the full path, since the goal state is fully resolved.
- added a helper to make it easier to read test output when errors don't match.

Author: jimmylewis

test/LibraryManager.Test/LibrariesValidatorTest.cs

@@ -13,8 +13,9 @@
 using Microsoft.Web.LibraryManager.Mocks;
 using Microsoft.Web.LibraryManager.Providers.Cdnjs;
 using Microsoft.Web.LibraryManager.Providers.FileSystem;
-using Microsoft.Web.LibraryManager.Providers.Unpkg;
 using Microsoft.Web.LibraryManager.Providers.jsDelivr;
+using Microsoft.Web.LibraryManager.Providers.Unpkg;
+using Microsoft.Web.LibraryManager.Test.TestUtilities;
 using Moq;
 
 namespace Microsoft.Web.LibraryManager.Test
@@ -44,8 +45,9 @@ public void Setup()
         [TestMethod]
         public async Task DetectConflictsAsync_ConflictingFiles_SameDestination()
         {
+            string conflictFilePath = Path.Combine(_dependencies.GetHostInteractions().WorkingDirectory, "lib", "package.json");
             string expectedErrorCode = "LIB016";
-            string expectedErrorMessage = "Conflicting file \"lib\\package.json\" found in more than one library: jquery, d3";
+            string expectedErrorMessage = $"Conflicting file \"{conflictFilePath}\" found in more than one library: jquery, d3";
             var manifest = Manifest.FromJson(_docDifferentLibraries_SameFiles_SameLocation, _dependencies);
 
             IEnumerable<OperationResult<LibraryInstallationGoalState>> conflicts = await LibrariesValidator.GetManifestErrorsAsync(manifest, _dependencies, CancellationToken.None);
@@ -92,11 +94,10 @@ public async Task DetectConflictsAsync_SameLibrary_DifferentProviders()
 
             IEnumerable<OperationResult<LibraryInstallationGoalState>> results = await LibrariesValidator.GetManifestErrorsAsync(manifest, _dependencies, CancellationToken.None);
 
-            var conflictsList = results.ToList();
+            var conflictsList = results.Where(r => r.Errors?.Count > 0).ToList();
             Assert.AreEqual(1, conflictsList.Count);
-            Assert.IsTrue(conflictsList[0].Errors.Count == 1);
-            Assert.AreEqual(conflictsList[0].Errors[0].Code, expectedErrorCode);
-            Assert.AreEqual(conflictsList[0].Errors[0].Message, expectedErrorMessage);
+            List<IError> expectedErrors = [new Contracts.Error(expectedErrorCode, expectedErrorMessage)];
+            Assert.That.ErrorsEqual(expectedErrors, conflictsList[0].Errors);
         }
 
         [TestMethod]
@@ -244,7 +245,7 @@ public async Task GetLibrariesErrors_LibrariesNoProvider()
       ""{ManifestConstants.Library}"": ""[email protected]"",
       ""{ManifestConstants.Provider}"": ""unpkg"",
       ""{ManifestConstants.Destination}"": ""lib2"",
-      ""{ManifestConstants.Files}"": [ ""jquery.js"" ]
+      ""{ManifestConstants.Files}"": [ ""dist/jquery.js"" ]
     }},
   ]
 }}

test/LibraryManager.Test/TestUtilities/AssertExtensions.cs

@@ -0,0 +1,31 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.Web.LibraryManager.Contracts;
+
+namespace Microsoft.Web.LibraryManager.Test.TestUtilities;
+
+public static class AssertExtensions
+{
+    public static void ErrorsEqual(this Assert assert, IList<IError> expected, IList<IError> actual)
+    {
+        string BuildString(IList<IError> errors)
+        {
+            StringBuilder stringBuilder = new StringBuilder();
+            foreach (IError error in errors)
+            {
+                stringBuilder.AppendLine($"{error.Code}: {error.Message}");
+            }
+            return stringBuilder.ToString();
+        }
+
+        Assert.AreEqual(BuildString(expected), BuildString(actual));
+    }
+}