Fix tests

Author: dsplaisted

src/Tests/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/SdkDirectoryWorkloadManifestProviderTests.cs

@@ -480,7 +480,7 @@ public void ItThrowsExceptionIfWorkloadSetJsonFilesHaveDuplicateManifests()
                 }
                 """);
 
-            Assert.Throws<ArgumentException>(() =>
+            Assert.Throws<InvalidOperationException>(() =>
                 new SdkDirectoryWorkloadManifestProvider(sdkRootPath: _fakeDotnetRootDirectory, sdkVersion: "8.0.200", userProfileDir: null, globalJsonPath: null));
         }
 

src/Tests/dotnet-workload-install.Tests/MockPackWorkloadInstaller.cs

@@ -20,6 +20,7 @@ internal class MockPackWorkloadInstaller : IInstaller
             new List<(ManifestVersionUpdate manifestUpdate, DirectoryPath?)>();
         public string CachePath;
         public bool GarbageCollectionCalled = false;
+        public bool InstallWorkloadSetCalled = false;
         public MockInstallationRecordRepository InstallationRecordRepository;
         public bool FailingRollback;
         public bool FailingGarbageCollection;
@@ -107,6 +108,7 @@ public void InstallWorkloads(IEnumerable<WorkloadId> workloadIds, SdkFeatureBand
 
         public WorkloadSet InstallWorkloadSet(ITransactionContext context, string workloadSetVersion, DirectoryPath? offlineCache = null)
         {
+            InstallWorkloadSetCalled = true;
             var workloadSet = WorkloadSet.FromJson(workloadSetContents, new SdkFeatureBand("6.0.100"));
             workloadSet.Version = workloadSetVersion;
             return workloadSet;

src/Tests/dotnet-workload-install.Tests/MockWorkloadManifestUpdater.cs

@@ -14,11 +14,13 @@ internal class MockWorkloadManifestUpdater : IWorkloadManifestUpdater
         public int GetManifestPackageDownloadsCallCount = 0;
         private readonly IEnumerable<ManifestUpdateWithWorkloads> _manifestUpdates;
         private bool _fromWorkloadSet;
+        private string _workloadSetVersion;
 
-        public MockWorkloadManifestUpdater(IEnumerable<ManifestUpdateWithWorkloads> manifestUpdates = null, bool fromWorkloadSet = false)
+        public MockWorkloadManifestUpdater(IEnumerable<ManifestUpdateWithWorkloads> manifestUpdates = null, bool fromWorkloadSet = false, string workloadSetVersion = null)
         {
             _manifestUpdates = manifestUpdates ?? new List<ManifestUpdateWithWorkloads>();
             _fromWorkloadSet = fromWorkloadSet;
+            _workloadSetVersion = workloadSetVersion;
         }
 
         public Task UpdateAdvertisingManifestsAsync(bool includePreview, bool useWorkloadSets = false, DirectoryPath? cachePath = null)
@@ -58,7 +60,7 @@ public void DeleteUpdatableWorkloadsFile() { }
 
         public IEnumerable<ManifestVersionUpdate> CalculateManifestUpdatesForWorkloadSet(WorkloadSet workloadSet) => _manifestUpdates.Select(t => t.ManifestUpdate);
 
-        public string GetAdvertisedWorkloadSetVersion() => throw new NotImplementedException();
+        public string GetAdvertisedWorkloadSetVersion() => _workloadSetVersion;
 
     }
 }

src/Tests/dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs

@@ -196,7 +196,12 @@ public void GivenWorkloadUpdateItUpdatesOutOfDatePacks()
         [InlineData(false)]
         public void UpdateViaWorkloadSet(bool upgrade)
         {
-            var versionNumber = "8.0.0";
+            var testDir = _testAssetsManager.CreateTestDirectory(identifier: upgrade.ToString());
+            string dotnetDir = Path.Combine(testDir.Path, "dotnet");
+            string userProfileDir = Path.Combine(testDir.Path, "userProfileDir");
+
+            var sdkVersion = "8.0.300";
+            var workloadSetVersion = "8.0.302";
             var workloadSetContents = @"
 {
 ""android"": ""2.3.4/8.0.200""
@@ -205,7 +210,7 @@ public void UpdateViaWorkloadSet(bool upgrade)
             var nugetPackageDownloader = new MockNuGetPackageDownloader();
             var workloadResolver = new MockWorkloadResolver(new WorkloadInfo[] { new WorkloadInfo(new WorkloadId("android"), string.Empty) });
             var workloadInstaller = new MockPackWorkloadInstaller(
-                Path.Combine(Path.GetTempPath(), "dotnetTestPat", "userProfileDir"),
+                dotnetDir,
                 installedWorkloads: new List<WorkloadId>() { new WorkloadId("android")},
                 workloadSetContents: workloadSetContents)
             {
@@ -216,34 +221,17 @@ public void UpdateViaWorkloadSet(bool upgrade)
                 manifestUpdates: new ManifestUpdateWithWorkloads[] {
                     new ManifestUpdateWithWorkloads(new ManifestVersionUpdate(new ManifestId("android"), new ManifestVersion(oldVersion), "8.0.200", new ManifestVersion("2.3.4"), "8.0.200"), Enumerable.Empty<KeyValuePair<WorkloadId, WorkloadDefinition>>().ToDictionary())
                 },
-                fromWorkloadSet: true);
-            var resolverFactory = new MockWorkloadResolverFactory(Path.Combine(Path.GetTempPath(), "dotnetTestPath"), versionNumber, workloadResolver, "userProfileDir");
+                fromWorkloadSet: true, workloadSetVersion: workloadSetVersion);
+            var resolverFactory = new MockWorkloadResolverFactory(dotnetDir, sdkVersion, workloadResolver, userProfileDir);
             var updateCommand = new WorkloadUpdateCommand(Parser.Instance.Parse("dotnet workload update"), Reporter.Output, resolverFactory, workloadInstaller, nugetPackageDownloader, workloadManifestUpdater);
 
-            var installStatePath = Path.Combine(Path.GetTempPath(), "dotnetTestPath", "metadata", "workloads", versionNumber, "InstallState", "default.json");
+            var installStatePath = Path.Combine(dotnetDir, "metadata", "workloads", sdkVersion, "InstallState", "default.json");
             var contents = new InstallStateContents();
             contents.UseWorkloadSets = true;
-            var versionFile = Path.Combine("userProfileDir", "sdk-advertising", "8.0.0", "microsoft.net.workloads", Constants.workloadSetVersionFileName);
-            try
-            {
-                Directory.CreateDirectory(Path.GetDirectoryName(installStatePath));
-                File.WriteAllText(installStatePath, contents.ToString());
-                updateCommand.Execute();
-                File.Exists(versionFile).Should().BeTrue();
-                File.ReadAllText(versionFile).Should().Be("8.0.0");
-            }
-            finally
-            {
-                if (File.Exists(versionFile))
-                {
-                    File.Delete(versionFile);
-                }
-
-                if (File.Exists(installStatePath))
-                {
-                    File.Delete(installStatePath);
-                }
-            }
+
+            Directory.CreateDirectory(Path.GetDirectoryName(installStatePath));
+            File.WriteAllText(installStatePath, contents.ToString());
+            updateCommand.Execute();
 
             workloadInstaller.InstalledManifests.Count.Should().Be(1);
             workloadInstaller.InstalledManifests[0].manifestUpdate.NewVersion.ToString().Should().Be("2.3.4");