diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-06-15 17:07:46 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-06-15 18:27:22 -0500 |
| commit | 09501680d4fcef277b33200c702ce409e9f9c1ef (patch) | |
| tree | c355a88295eaedd8992561c7f4c3bf374520afb2 /src/ext/Bal | |
| parent | ec61ceb6b2bc0b6cf12259e08c1f8db2a9335773 (diff) | |
| download | wix-09501680d4fcef277b33200c702ce409e9f9c1ef.tar.gz wix-09501680d4fcef277b33200c702ce409e9f9c1ef.tar.bz2 wix-09501680d4fcef277b33200c702ce409e9f9c1ef.zip | |
Use WixAssert in more places.
Diffstat (limited to 'src/ext/Bal')
| -rw-r--r-- | src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs index 43484855..d8197467 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs +++ b/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs | |||
| @@ -41,9 +41,11 @@ namespace WixToolsetTest.Bal | |||
| 41 | var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); | 41 | var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); |
| 42 | extractResult.AssertSuccess(); | 42 | extractResult.AssertSuccess(); |
| 43 | 43 | ||
| 44 | var balPackageInfos = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo"); | 44 | var balPackageInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo"); |
| 45 | var balPackageInfo = (XmlNode)Assert.Single(balPackageInfos); | 45 | WixAssert.CompareLineByLine(new string[] |
| 46 | Assert.Equal("<WixBalPackageInfo PackageId='test.msi' DisplayInternalUICondition='1' />", balPackageInfo.GetTestXml()); | 46 | { |
| 47 | "<WixBalPackageInfo PackageId='test.msi' DisplayInternalUICondition='1' />", | ||
| 48 | }, balPackageInfos); | ||
| 47 | 49 | ||
| 48 | Assert.True(File.Exists(Path.Combine(baFolderPath, "thm.wxl"))); | 50 | Assert.True(File.Exists(Path.Combine(baFolderPath, "thm.wxl"))); |
| 49 | } | 51 | } |
| @@ -76,9 +78,11 @@ namespace WixToolsetTest.Bal | |||
| 76 | var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); | 78 | var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); |
| 77 | extractResult.AssertSuccess(); | 79 | extractResult.AssertSuccess(); |
| 78 | 80 | ||
| 79 | var balOverridableVariables = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixStdbaOverridableVariable"); | 81 | var balOverridableVariables = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixStdbaOverridableVariable"); |
| 80 | var balOverridableVariable = (XmlNode)Assert.Single(balOverridableVariables); | 82 | WixAssert.CompareLineByLine(new[] |
| 81 | Assert.Equal("<WixStdbaOverridableVariable Name='TEST1' />", balOverridableVariable.GetTestXml()); | 83 | { |
| 84 | "<WixStdbaOverridableVariable Name='TEST1' />", | ||
| 85 | }, balOverridableVariables); | ||
| 82 | } | 86 | } |
| 83 | } | 87 | } |
| 84 | 88 | ||
| @@ -134,9 +138,11 @@ namespace WixToolsetTest.Bal | |||
| 134 | var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); | 138 | var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); |
| 135 | extractResult.AssertSuccess(); | 139 | extractResult.AssertSuccess(); |
| 136 | 140 | ||
| 137 | var wixMbaPrereqOptionsElements = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixMbaPrereqOptions"); | 141 | var wixMbaPrereqOptionsElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixMbaPrereqOptions"); |
| 138 | var wixMbaPrereqOptions = (XmlNode)Assert.Single(wixMbaPrereqOptionsElements); | 142 | WixAssert.CompareLineByLine(new[] |
| 139 | Assert.Equal("<WixMbaPrereqOptions AlwaysInstallPrereqs='1' />", wixMbaPrereqOptions.GetTestXml()); | 143 | { |
| 144 | "<WixMbaPrereqOptions AlwaysInstallPrereqs='1' />", | ||
| 145 | }, wixMbaPrereqOptionsElements); | ||
| 140 | } | 146 | } |
| 141 | } | 147 | } |
| 142 | 148 | ||
| @@ -159,7 +165,7 @@ namespace WixToolsetTest.Bal | |||
| 159 | "-o", bundleFile, | 165 | "-o", bundleFile, |
| 160 | }); | 166 | }); |
| 161 | Assert.Equal(6802, compileResult.ExitCode); | 167 | Assert.Equal(6802, compileResult.ExitCode); |
| 162 | Assert.Equal("There must be at least one PrereqPackage when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups.", compileResult.Messages[0].ToString()); | 168 | WixAssert.StringEqual("There must be at least one PrereqPackage when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups.", compileResult.Messages[0].ToString()); |
| 163 | 169 | ||
| 164 | Assert.False(File.Exists(bundleFile)); | 170 | Assert.False(File.Exists(bundleFile)); |
| 165 | Assert.False(File.Exists(Path.Combine(intermediateFolder, "test.exe"))); | 171 | Assert.False(File.Exists(Path.Combine(intermediateFolder, "test.exe"))); |