diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2023-03-20 18:16:42 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2023-03-30 20:03:07 -0500 |
commit | f5bda6af2abbcf7e4792d299b86bfcec713fc6c2 (patch) | |
tree | 00ee96cb6090b83ce2d91dd960b8d0da161e376d /src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs | |
parent | 648b838dfcc8f6ed269964fc3791f9f8a27561c4 (diff) | |
download | wix-f5bda6af2abbcf7e4792d299b86bfcec713fc6c2.tar.gz wix-f5bda6af2abbcf7e4792d299b86bfcec713fc6c2.tar.bz2 wix-f5bda6af2abbcf7e4792d299b86bfcec713fc6c2.zip |
Fix bug when parsing bal prereq attributes.
7287
Diffstat (limited to 'src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs')
-rw-r--r-- | src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs b/src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs index b7609d19..314bcd35 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs +++ b/src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs | |||
@@ -51,6 +51,51 @@ namespace WixToolsetTest.Bal | |||
51 | } | 51 | } |
52 | 52 | ||
53 | [Fact] | 53 | [Fact] |
54 | public void CanBuildUsingWixIuiBaWithUrlPrereqPackage() | ||
55 | { | ||
56 | using (var fs = new DisposableFileSystem()) | ||
57 | { | ||
58 | var baseFolder = fs.GetFolder(); | ||
59 | var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); | ||
60 | var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); | ||
61 | var intermediateFolder = Path.Combine(baseFolder, "obj"); | ||
62 | var baFolderPath = Path.Combine(baseFolder, "ba"); | ||
63 | var extractFolderPath = Path.Combine(baseFolder, "extract"); | ||
64 | |||
65 | var compileResult = WixRunner.Execute(new[] | ||
66 | { | ||
67 | "build", | ||
68 | Path.Combine(bundleSourceFolder, "UrlPrereqPackage.wxs"), | ||
69 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | ||
70 | "-intermediateFolder", intermediateFolder, | ||
71 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), | ||
72 | "-o", bundleFile, | ||
73 | }); | ||
74 | compileResult.AssertSuccess(); | ||
75 | |||
76 | Assert.True(File.Exists(bundleFile)); | ||
77 | |||
78 | var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); | ||
79 | extractResult.AssertSuccess(); | ||
80 | |||
81 | var balPackageInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo"); | ||
82 | WixAssert.CompareLineByLine(new string[] | ||
83 | { | ||
84 | "<WixBalPackageInfo PackageId='test.msi' PrimaryPackageType='default' />", | ||
85 | }, balPackageInfos); | ||
86 | |||
87 | var mbaPrereqInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixMbaPrereqInformation"); | ||
88 | WixAssert.CompareLineByLine(new[] | ||
89 | { | ||
90 | "<WixMbaPrereqInformation PackageId='wixnative.exe' LicenseUrl='https://www.mysite.com/prereqterms' />", | ||
91 | }, mbaPrereqInfos); | ||
92 | |||
93 | Assert.True(File.Exists(Path.Combine(baFolderPath, "mbapreq.thm"))); | ||
94 | Assert.True(File.Exists(Path.Combine(baFolderPath, "mbapreq.wxl"))); | ||
95 | } | ||
96 | } | ||
97 | |||
98 | [Fact] | ||
54 | public void CanBuildUsingWixIuiBaWithImplicitPrimaryPackage() | 99 | public void CanBuildUsingWixIuiBaWithImplicitPrimaryPackage() |
55 | { | 100 | { |
56 | using (var fs = new DisposableFileSystem()) | 101 | using (var fs = new DisposableFileSystem()) |