diff options
author | Bob Arnson <bob@firegiant.com> | 2025-02-14 22:29:39 -0500 |
---|---|---|
committer | Bob Arnson <github@bobs.org> | 2025-03-03 14:25:07 -0500 |
commit | ca6e44d496b0c589fdaabad69a00643f539c47cd (patch) | |
tree | edf84727cecfc03092a2851b465d97622c5048eb /src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs | |
parent | ba7fd5837ea149b2e319cc577fad27ce1162a064 (diff) | |
download | wix-ca6e44d496b0c589fdaabad69a00643f539c47cd.tar.gz wix-ca6e44d496b0c589fdaabad69a00643f539c47cd.tar.bz2 wix-ca6e44d496b0c589fdaabad69a00643f539c47cd.zip |
Convert ext\ to MSTest and traversal projects.
- Move ext\ unit tests to MSTest.
- MSBuildify ext projects with MSTest execution.
- Fork test support projects for MSTest:
- WixInternal.TestSupport
- WixInternal.Core.TestPackage
Diffstat (limited to 'src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs')
-rw-r--r-- | src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 61 |
1 files changed, 31 insertions, 30 deletions
diff --git a/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 13c39091..03d87e4e 100644 --- a/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs | |||
@@ -2,19 +2,20 @@ | |||
2 | 2 | ||
3 | namespace WixToolsetTest.Util | 3 | namespace WixToolsetTest.Util |
4 | { | 4 | { |
5 | using System; | ||
5 | using System.IO; | 6 | using System.IO; |
6 | using System.Linq; | 7 | using System.Linq; |
7 | using System.Xml; | 8 | using System.Xml; |
8 | using WixInternal.TestSupport; | ||
9 | using WixInternal.Core.TestPackage; | ||
10 | using WixToolset.Util; | ||
11 | using Xunit; | ||
12 | using System.Xml.Linq; | 9 | using System.Xml.Linq; |
13 | using System; | 10 | using Microsoft.VisualStudio.TestTools.UnitTesting; |
11 | using WixInternal.MSTestSupport; | ||
12 | using WixInternal.Core.MSTestPackage; | ||
13 | using WixToolset.Util; | ||
14 | 14 | ||
15 | [TestClass] | ||
15 | public class UtilExtensionFixture | 16 | public class UtilExtensionFixture |
16 | { | 17 | { |
17 | [Fact] | 18 | [TestMethod] |
18 | public void CanBuildUsingFileShare() | 19 | public void CanBuildUsingFileShare() |
19 | { | 20 | { |
20 | var folder = TestData.Get(@"TestData\UsingFileShare"); | 21 | var folder = TestData.Get(@"TestData\UsingFileShare"); |
@@ -35,7 +36,7 @@ namespace WixToolsetTest.Util | |||
35 | }, results.OrderBy(s => s).ToArray()); | 36 | }, results.OrderBy(s => s).ToArray()); |
36 | } | 37 | } |
37 | 38 | ||
38 | [Fact] | 39 | [TestMethod] |
39 | public void CanBuildUsingFileShareX64() | 40 | public void CanBuildUsingFileShareX64() |
40 | { | 41 | { |
41 | var folder = TestData.Get(@"TestData\UsingFileShare"); | 42 | var folder = TestData.Get(@"TestData\UsingFileShare"); |
@@ -56,7 +57,7 @@ namespace WixToolsetTest.Util | |||
56 | }, results.OrderBy(s => s).ToArray()); | 57 | }, results.OrderBy(s => s).ToArray()); |
57 | } | 58 | } |
58 | 59 | ||
59 | [Fact] | 60 | [TestMethod] |
60 | public void CanRoundtripFileShare() | 61 | public void CanRoundtripFileShare() |
61 | { | 62 | { |
62 | var folder = TestData.Get(@"TestData", "UsingFileShare"); | 63 | var folder = TestData.Get(@"TestData", "UsingFileShare"); |
@@ -79,7 +80,7 @@ namespace WixToolsetTest.Util | |||
79 | }, utilElementNames); | 80 | }, utilElementNames); |
80 | } | 81 | } |
81 | 82 | ||
82 | [Fact] | 83 | [TestMethod] |
83 | public void CanBuildCloseApplication() | 84 | public void CanBuildCloseApplication() |
84 | { | 85 | { |
85 | var folder = TestData.Get(@"TestData\CloseApplication"); | 86 | var folder = TestData.Get(@"TestData\CloseApplication"); |
@@ -96,7 +97,7 @@ namespace WixToolsetTest.Util | |||
96 | }, results.OrderBy(s => s).ToArray()); | 97 | }, results.OrderBy(s => s).ToArray()); |
97 | } | 98 | } |
98 | 99 | ||
99 | [Fact] | 100 | [TestMethod] |
100 | public void CanBuildInternetShortcutInProduct() | 101 | public void CanBuildInternetShortcutInProduct() |
101 | { | 102 | { |
102 | var folder = TestData.Get(@"TestData\InternetShortcut"); | 103 | var folder = TestData.Get(@"TestData\InternetShortcut"); |
@@ -116,7 +117,7 @@ namespace WixToolsetTest.Util | |||
116 | }, results.OrderBy(s => s).ToArray()); | 117 | }, results.OrderBy(s => s).ToArray()); |
117 | } | 118 | } |
118 | 119 | ||
119 | [Fact] | 120 | [TestMethod] |
120 | public void CanBuildInternetShortcutInMergeModule() | 121 | public void CanBuildInternetShortcutInMergeModule() |
121 | { | 122 | { |
122 | var folder = TestData.Get(@"TestData\InternetShortcutModule"); | 123 | var folder = TestData.Get(@"TestData\InternetShortcutModule"); |
@@ -136,7 +137,7 @@ namespace WixToolsetTest.Util | |||
136 | }, results.OrderBy(s => s).ToArray()); | 137 | }, results.OrderBy(s => s).ToArray()); |
137 | } | 138 | } |
138 | 139 | ||
139 | [Fact] | 140 | [TestMethod] |
140 | public void CanBuildWithPermissionEx() | 141 | public void CanBuildWithPermissionEx() |
141 | { | 142 | { |
142 | var folder = TestData.Get(@"TestData\PermissionEx"); | 143 | var folder = TestData.Get(@"TestData\PermissionEx"); |
@@ -153,7 +154,7 @@ namespace WixToolsetTest.Util | |||
153 | }, results.OrderBy(s => s).ToArray()); | 154 | }, results.OrderBy(s => s).ToArray()); |
154 | } | 155 | } |
155 | 156 | ||
156 | [Fact] | 157 | [TestMethod] |
157 | public void CanBuildRemoveRegistryKeyExInMergeModule() | 158 | public void CanBuildRemoveRegistryKeyExInMergeModule() |
158 | { | 159 | { |
159 | var folder = TestData.Get(@"TestData", "RemoveRegistryKeyEx"); | 160 | var folder = TestData.Get(@"TestData", "RemoveRegistryKeyEx"); |
@@ -168,7 +169,7 @@ namespace WixToolsetTest.Util | |||
168 | }, results.OrderBy(s => s).ToArray()); | 169 | }, results.OrderBy(s => s).ToArray()); |
169 | } | 170 | } |
170 | 171 | ||
171 | [Fact] | 172 | [TestMethod] |
172 | public void CanBuildRemoveFolderExInMergeModule() | 173 | public void CanBuildRemoveFolderExInMergeModule() |
173 | { | 174 | { |
174 | var folder = TestData.Get(@"TestData\RemoveFolderEx"); | 175 | var folder = TestData.Get(@"TestData\RemoveFolderEx"); |
@@ -183,7 +184,7 @@ namespace WixToolsetTest.Util | |||
183 | }, results.OrderBy(s => s).ToArray()); | 184 | }, results.OrderBy(s => s).ToArray()); |
184 | } | 185 | } |
185 | 186 | ||
186 | [Fact] | 187 | [TestMethod] |
187 | public void CanBuildRemoveFolderExInPackage() | 188 | public void CanBuildRemoveFolderExInPackage() |
188 | { | 189 | { |
189 | var folder = TestData.Get(@"TestData\RemoveFolderExPackage"); | 190 | var folder = TestData.Get(@"TestData\RemoveFolderExPackage"); |
@@ -198,7 +199,7 @@ namespace WixToolsetTest.Util | |||
198 | }, results.OrderBy(s => s).ToArray()); | 199 | }, results.OrderBy(s => s).ToArray()); |
199 | } | 200 | } |
200 | 201 | ||
201 | [Fact] | 202 | [TestMethod] |
202 | public void CanBuildServiceConfig() | 203 | public void CanBuildServiceConfig() |
203 | { | 204 | { |
204 | var folder = TestData.Get(@"TestData", "ServiceConfig"); | 205 | var folder = TestData.Get(@"TestData", "ServiceConfig"); |
@@ -215,7 +216,7 @@ namespace WixToolsetTest.Util | |||
215 | }, results.OrderBy(s => s).ToArray()); | 216 | }, results.OrderBy(s => s).ToArray()); |
216 | } | 217 | } |
217 | 218 | ||
218 | [Fact] | 219 | [TestMethod] |
219 | public void CanBuildWithEventManifest() | 220 | public void CanBuildWithEventManifest() |
220 | { | 221 | { |
221 | var folder = TestData.Get(@"TestData\EventManifest"); | 222 | var folder = TestData.Get(@"TestData\EventManifest"); |
@@ -240,7 +241,7 @@ namespace WixToolsetTest.Util | |||
240 | }, results.OrderBy(s => s).ToArray()); | 241 | }, results.OrderBy(s => s).ToArray()); |
241 | } | 242 | } |
242 | 243 | ||
243 | [Fact] | 244 | [TestMethod] |
244 | public void CanBuildWithQueries() | 245 | public void CanBuildWithQueries() |
245 | { | 246 | { |
246 | var folder = TestData.Get(@"TestData\Queries"); | 247 | var folder = TestData.Get(@"TestData\Queries"); |
@@ -259,7 +260,7 @@ namespace WixToolsetTest.Util | |||
259 | }, results.OrderBy(s => s).ToArray()); | 260 | }, results.OrderBy(s => s).ToArray()); |
260 | } | 261 | } |
261 | 262 | ||
262 | [Fact] | 263 | [TestMethod] |
263 | public void CanBuildAndDecompiileQueries() | 264 | public void CanBuildAndDecompiileQueries() |
264 | { | 265 | { |
265 | var folder = TestData.Get(@"TestData\Queries"); | 266 | var folder = TestData.Get(@"TestData\Queries"); |
@@ -285,7 +286,7 @@ namespace WixToolsetTest.Util | |||
285 | }, utilElementNames); | 286 | }, utilElementNames); |
286 | } | 287 | } |
287 | 288 | ||
288 | [Fact] | 289 | [TestMethod] |
289 | public void CanBuildWithXmlConfig() | 290 | public void CanBuildWithXmlConfig() |
290 | { | 291 | { |
291 | var folder = TestData.Get(@"TestData", "XmlConfig"); | 292 | var folder = TestData.Get(@"TestData", "XmlConfig"); |
@@ -301,7 +302,7 @@ namespace WixToolsetTest.Util | |||
301 | }, results.OrderBy(s => s).ToArray()); | 302 | }, results.OrderBy(s => s).ToArray()); |
302 | } | 303 | } |
303 | 304 | ||
304 | [Fact] | 305 | [TestMethod] |
305 | public void CanRoundtripXmlConfig() | 306 | public void CanRoundtripXmlConfig() |
306 | { | 307 | { |
307 | var folder = TestData.Get(@"TestData", "XmlConfig"); | 308 | var folder = TestData.Get(@"TestData", "XmlConfig"); |
@@ -324,7 +325,7 @@ namespace WixToolsetTest.Util | |||
324 | }, utilElementNames); | 325 | }, utilElementNames); |
325 | } | 326 | } |
326 | 327 | ||
327 | [Fact] | 328 | [TestMethod] |
328 | public void CanBuildModuleWithXmlConfig() | 329 | public void CanBuildModuleWithXmlConfig() |
329 | { | 330 | { |
330 | var folder = TestData.Get(@"TestData", "XmlConfigModule"); | 331 | var folder = TestData.Get(@"TestData", "XmlConfigModule"); |
@@ -338,7 +339,7 @@ namespace WixToolsetTest.Util | |||
338 | }, results.OrderBy(s => s).ToArray()); | 339 | }, results.OrderBy(s => s).ToArray()); |
339 | } | 340 | } |
340 | 341 | ||
341 | [Fact] | 342 | [TestMethod] |
342 | public void CanBuildBundleWithSearches() | 343 | public void CanBuildBundleWithSearches() |
343 | { | 344 | { |
344 | var folder = TestData.Get(@"TestData\BundleWithSearches"); | 345 | var folder = TestData.Get(@"TestData\BundleWithSearches"); |
@@ -366,15 +367,15 @@ namespace WixToolsetTest.Util | |||
366 | 367 | ||
367 | result.AssertSuccess(); | 368 | result.AssertSuccess(); |
368 | 369 | ||
369 | Assert.True(File.Exists(bundlePath)); | 370 | Assert.IsTrue(File.Exists(bundlePath)); |
370 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); | 371 | Assert.IsTrue(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); |
371 | 372 | ||
372 | var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); | 373 | var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); |
373 | extractResult.AssertSuccess(); | 374 | extractResult.AssertSuccess(); |
374 | 375 | ||
375 | var bootstrapperExtensionDatas = extractResult.SelectBootstrapperExtensionDataNodes("/be:BootstrapperExtensionData/be:BootstrapperExtension[@Id='Wix4UtilBootstrapperExtension_X86']"); | 376 | var bootstrapperExtensionDatas = extractResult.SelectBootstrapperExtensionDataNodes("/be:BootstrapperExtensionData/be:BootstrapperExtension[@Id='Wix4UtilBootstrapperExtension_X86']"); |
376 | Assert.Equal(1, bootstrapperExtensionDatas.Count); | 377 | Assert.AreEqual(1, bootstrapperExtensionDatas.Count); |
377 | Assert.Equal("<BootstrapperExtension Id='Wix4UtilBootstrapperExtension_X86'>" + | 378 | Assert.AreEqual("<BootstrapperExtension Id='Wix4UtilBootstrapperExtension_X86'>" + |
378 | "<WixWindowsFeatureSearch Id='DetectSHA2SupportId' Type='sha2CodeSigning' />" + | 379 | "<WixWindowsFeatureSearch Id='DetectSHA2SupportId' Type='sha2CodeSigning' />" + |
379 | "</BootstrapperExtension>", bootstrapperExtensionDatas[0].GetTestXml()); | 380 | "</BootstrapperExtension>", bootstrapperExtensionDatas[0].GetTestXml()); |
380 | 381 | ||
@@ -394,7 +395,7 @@ namespace WixToolsetTest.Util | |||
394 | } | 395 | } |
395 | } | 396 | } |
396 | 397 | ||
397 | [Fact] | 398 | [TestMethod] |
398 | public void CanCreateUserGroupWithComment() | 399 | public void CanCreateUserGroupWithComment() |
399 | { | 400 | { |
400 | var folder = TestData.Get(@"TestData\CreateGroup"); | 401 | var folder = TestData.Get(@"TestData\CreateGroup"); |
@@ -550,7 +551,7 @@ namespace WixToolsetTest.Util | |||
550 | }, results.OrderBy(s => s).ToArray()); | 551 | }, results.OrderBy(s => s).ToArray()); |
551 | } | 552 | } |
552 | 553 | ||
553 | [Fact] | 554 | [TestMethod] |
554 | public void CanCreateUserAccountWithComment() | 555 | public void CanCreateUserAccountWithComment() |
555 | { | 556 | { |
556 | var folder = TestData.Get(@"TestData\CreateUser"); | 557 | var folder = TestData.Get(@"TestData\CreateUser"); |
@@ -626,7 +627,7 @@ namespace WixToolsetTest.Util | |||
626 | }, results.OrderBy(s => s).ToArray()); | 627 | }, results.OrderBy(s => s).ToArray()); |
627 | } | 628 | } |
628 | 629 | ||
629 | [Fact] | 630 | [TestMethod] |
630 | public void CannotBuildBundleWithSearchesUsingBuiltinVariableNames() | 631 | public void CannotBuildBundleWithSearchesUsingBuiltinVariableNames() |
631 | { | 632 | { |
632 | var folder = TestData.Get("TestData", "BundleWithSearches"); | 633 | var folder = TestData.Get("TestData", "BundleWithSearches"); |