Test fixes

Author: JohnMcPMS

src/AppInstallerCLIE2ETests/DSCv3ResourceCommands.cs

@@ -21,7 +21,7 @@ namespace AppInstallerCLIE2ETests
     [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1011:Closing square brackets should be spaced correctly", Justification = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3687 pending SC 1.2 release")]
     public class DSCv3ResourceCommands
     {
-        private const string DefaultPackageIdentifier = "AppInstallerTest.TestExeInstaller";
+        private const string DefaultPackageIdentifier = Constants.ExeInstallerPackageId;
         private const string DefaultPackageLowVersion = "1.0.0.0";
         private const string DefaultPackageMidVersion = "1.1.0.0";
         private const string DefaultPackageHighVersion = "2.0.0.0";
@@ -748,7 +748,7 @@ private class PackageResourceData
 
             public string InstallMode { get; set; }
 
-            public bool? AcceptAgreements { get; set; }
+            public bool? AcceptAgreements { get; set; } = true;
         }
     }
 }

src/AppInstallerCLIE2ETests/DownloadCommand.cs

@@ -55,7 +55,7 @@ public void DownloadToDefaultDirectory()
             var result = TestCommon.RunAICLICommand("download", $"{Constants.ExeInstallerPackageId} --version {packageVersion}");
             Assert.AreEqual(Constants.ErrorCode.S_OK, result.ExitCode);
             string downloadDir = Path.Combine(TestCommon.GetDefaultDownloadDirectory(), $"{Constants.ExeInstallerPackageId}_{packageVersion}");
-            TestCommon.AssertInstallerDownload(downloadDir, "TestExeInstaller", packageVersion, ProcessorArchitecture.X86, TestCommon.Scope.Unknown, PackageInstallerType.Exe);
+            TestCommon.AssertInstallerDownload(downloadDir, "TestExeInstaller", packageVersion, ProcessorArchitecture.X86, TestCommon.Scope.User, PackageInstallerType.Exe);
         }
 
         /// <summary>
@@ -67,7 +67,7 @@ public void DownloadToDirectory()
             var downloadDir = TestCommon.GetRandomTestDir();
             var result = TestCommon.RunAICLICommand("download", $"{Constants.ExeInstallerPackageId} --download-directory {downloadDir}");
             Assert.AreEqual(Constants.ErrorCode.S_OK, result.ExitCode);
-            TestCommon.AssertInstallerDownload(downloadDir, "TestExeInstaller", "2.0.0.0", ProcessorArchitecture.X86, TestCommon.Scope.Unknown, PackageInstallerType.Exe);
+            TestCommon.AssertInstallerDownload(downloadDir, "TestExeInstaller", "2.0.0.0", ProcessorArchitecture.X86, TestCommon.Scope.User, PackageInstallerType.Exe);
         }
 
         /// <summary>

src/AppInstallerCLIE2ETests/Interop/DownloadInterop.cs

@@ -118,7 +118,7 @@ public async Task DownloadToDefaultDirectory()
             var packageVersion = "2.0.0.0";
             Assert.AreEqual(DownloadResultStatus.Ok, downloadResult.Status);
             string downloadDir = Path.Combine(TestCommon.GetDefaultDownloadDirectory(), $"{Constants.ExeInstallerPackageId}_{packageVersion}");
-            TestCommon.AssertInstallerDownload(downloadDir, "TestExeInstaller", packageVersion, ProcessorArchitecture.X86, TestCommon.Scope.Unknown, PackageInstallerType.Exe);
+            TestCommon.AssertInstallerDownload(downloadDir, "TestExeInstaller", packageVersion, ProcessorArchitecture.X86, TestCommon.Scope.User, PackageInstallerType.Exe);
         }
 
         /// <summary>
@@ -142,7 +142,7 @@ public async Task DownloadToDirectory()
 
             // Assert
             Assert.AreEqual(DownloadResultStatus.Ok, downloadResult.Status);
-            TestCommon.AssertInstallerDownload(downloadDir, "TestExeInstaller", "2.0.0.0", ProcessorArchitecture.X86, TestCommon.Scope.Unknown, PackageInstallerType.Exe);
+            TestCommon.AssertInstallerDownload(downloadDir, "TestExeInstaller", "2.0.0.0", ProcessorArchitecture.X86, TestCommon.Scope.User, PackageInstallerType.Exe);
         }
 
         /// <summary>

src/AppInstallerCLIE2ETests/Interop/InstallInterop.cs

@@ -482,7 +482,7 @@ public async Task InstallPortableFailsWithCleanup()
         public async Task InstallRequireUserScope()
         {
             // Find package
-            var searchResult = this.FindOnePackage(this.testSource, PackageMatchField.Id, PackageFieldMatchOption.Equals, "AppInstallerTest.TestExeInstaller");
+            var searchResult = this.FindOnePackage(this.testSource, PackageMatchField.Id, PackageFieldMatchOption.Equals, "AppInstallerTest.TestExeInstallerNoScope");
 
             // Configure installation
             var installOptions = this.TestFactory.CreateInstallOptions();
@@ -505,7 +505,7 @@ public async Task InstallRequireUserScope()
         public async Task InstallRequireUserScopeAndUnknown()
         {
             // Find package
-            var searchResult = this.FindOnePackage(this.testSource, PackageMatchField.Id, PackageFieldMatchOption.Equals, "AppInstallerTest.TestExeInstaller");
+            var searchResult = this.FindOnePackage(this.testSource, PackageMatchField.Id, PackageFieldMatchOption.Equals, "AppInstallerTest.TestExeInstallerNoScope");
 
             // Configure installation
             var installOptions = this.TestFactory.CreateInstallOptions();
@@ -725,4 +725,4 @@ public async Task InstallMSIX_VerifyInstalledCatalog()
             Assert.True(TestCommon.VerifyTestMsixInstalledAndCleanup());
         }
     }
-}
+}

src/AppInstallerCLIE2ETests/TestData/Manifests/TestExeInstaller_NoScope.yaml

@@ -0,0 +1,20 @@
+Id: AppInstallerTest.TestExeInstallerNoScope
+Name: TestExeInstaller
+Version: 1.0.0.0
+Publisher: AppInstallerTest
+License: Test
+Installers:
+  - Arch: x86
+    Url: https://localhost:5001/TestKit/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.exe
+    Sha256: <EXEHASH>
+    InstallerType: exe
+    ProductCode: '{A499DD5E-8DC5-4AD2-911A-BCD0263295E9}'
+    Switches:
+      Custom: /execustom
+      SilentWithProgress: /exeswp
+      Silent: /exesilent
+      Interactive: /exeinteractive
+      Language: /exeenus
+      Log: /LogFile <LOGPATH>
+      InstallLocation: /InstallDir <INSTALLPATH>
+ManifestVersion: 0.1.0