aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2023-02-09 19:18:53 -0500
committerBob Arnson <github@bobs.org>2023-02-09 20:45:37 -0500
commit48a7e6460707d8d6e1587cccdbf028249a417093 (patch)
tree4f7323ad031e2013dcfe9a906c7ece94183c71fd
parent15218b98004e5966bb8b8135c319e1a02978f4c8 (diff)
downloadwix-48a7e6460707d8d6e1587cccdbf028249a417093.tar.gz
wix-48a7e6460707d8d6e1587cccdbf028249a417093.tar.bz2
wix-48a7e6460707d8d6e1587cccdbf028249a417093.zip
Add some useful testing to VS.wixext.
-rw-r--r--src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs23
1 files changed, 21 insertions, 2 deletions
diff --git a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs
index d173bafd..f3e81e2d 100644
--- a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs
+++ b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs
@@ -42,7 +42,9 @@ namespace WixToolsetTest.VisualStudio
42 var folder = TestData.Get(@"TestData\UsingVsixPackage"); 42 var folder = TestData.Get(@"TestData\UsingVsixPackage");
43 var build = new Builder(folder, typeof(VSExtensionFactory), new[] { folder }); 43 var build = new Builder(folder, typeof(VSExtensionFactory), new[] { folder });
44 44
45 var results = build.BuildAndQuery(BuildARM64, "CustomAction"); 45 var results = build.BuildAndQuery(BuildARM64, "CustomAction", "Property");
46
47 var customActionResults = results.Where(r => r.StartsWith("CustomAction:")).ToArray();
46 WixAssert.CompareLineByLine(new[] 48 WixAssert.CompareLineByLine(new[]
47 { 49 {
48 "CustomAction:SetVS2010Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2010_VSIX_INSTALLER_PATH]\t", 50 "CustomAction:SetVS2010Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2010_VSIX_INSTALLER_PATH]\t",
@@ -59,7 +61,24 @@ namespace WixToolsetTest.VisualStudio
59 "CustomAction:Vwd2013VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2013_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t", 61 "CustomAction:Vwd2013VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2013_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t",
60 "CustomAction:Vwd2015VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2015_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t", 62 "CustomAction:Vwd2015VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2015_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t",
61 "CustomAction:Wix4VSFindInstances_A64\t257\tVSCA_A64\tFindInstances\t", 63 "CustomAction:Wix4VSFindInstances_A64\t257\tVSCA_A64\tFindInstances\t",
62 }, results); 64 }, customActionResults);
65
66 var propertyResults = results.Single(r => r.StartsWith("Property:SecureCustomProperties")).Split('\t')[1].Split(';');
67 WixAssert.CompareLineByLine(new[]
68 {
69 "VS_VSIX_INSTALLER_PATH",
70 "VS2010_VSIX_INSTALLER_PATH",
71 "VS2012_VSIX_INSTALLER_PATH",
72 "VS2013_VSIX_INSTALLER_PATH",
73 "VS2015_VSIX_INSTALLER_PATH",
74 "VS2017_IDE_DIR",
75 "VS2017_ROOT_FOLDER",
76 "VS2017DEVENV",
77 "VS2019_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED",
78 "VS2022_ROOT_FOLDER",
79 "WIX_DOWNGRADE_DETECTED",
80 "WIX_UPGRADE_DETECTED",
81 }, propertyResults);
63 } 82 }
64 83
65 private static void Build(string[] args) 84 private static void Build(string[] args)