diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-03-01 10:14:38 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-03-01 12:23:34 -0800 |
| commit | 3eb3c26c796984b64365fda077f173af8bf31559 (patch) | |
| tree | 0912d69363973bc8db704a18b1b4bcede6a84360 /src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs | |
| parent | 697f2cdbdcd8198d06ebf14fc2b65f0ce3fa5a94 (diff) | |
| download | wix-3eb3c26c796984b64365fda077f173af8bf31559.tar.gz wix-3eb3c26c796984b64365fda077f173af8bf31559.tar.bz2 wix-3eb3c26c796984b64365fda077f173af8bf31559.zip | |
Fix handling of suppress modularization
Partially fixes wixtoolset/issues#5944
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs index e26e197f..a8ea0a18 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs | |||
| @@ -327,56 +327,6 @@ namespace WixToolsetTest.CoreIntegration | |||
| 327 | } | 327 | } |
| 328 | 328 | ||
| 329 | [Fact] | 329 | [Fact] |
| 330 | public void CanBuildSimpleModule() | ||
| 331 | { | ||
| 332 | var folder = TestData.Get(@"TestData\SimpleModule"); | ||
| 333 | |||
| 334 | using (var fs = new DisposableFileSystem()) | ||
| 335 | { | ||
| 336 | var intermediateFolder = fs.GetFolder(); | ||
| 337 | |||
| 338 | var result = WixRunner.Execute(new[] | ||
| 339 | { | ||
| 340 | "build", | ||
| 341 | Path.Combine(folder, "Module.wxs"), | ||
| 342 | "-loc", Path.Combine(folder, "Module.en-us.wxl"), | ||
| 343 | "-bindpath", Path.Combine(folder, "data"), | ||
| 344 | "-intermediateFolder", intermediateFolder, | ||
| 345 | "-o", Path.Combine(intermediateFolder, @"bin\test.msm") | ||
| 346 | }); | ||
| 347 | |||
| 348 | result.AssertSuccess(); | ||
| 349 | |||
| 350 | var msmPath = Path.Combine(intermediateFolder, @"bin\test.msm"); | ||
| 351 | Assert.True(File.Exists(msmPath)); | ||
| 352 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb"))); | ||
| 353 | |||
| 354 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); | ||
| 355 | var section = intermediate.Sections.Single(); | ||
| 356 | |||
| 357 | var fileSymbol = section.Symbols.OfType<FileSymbol>().Single(); | ||
| 358 | Assert.Equal("filyIq8rqcxxf903Hsn5K9L0SWV73g", fileSymbol.Id.Id); | ||
| 359 | Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); | ||
| 360 | Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); | ||
| 361 | |||
| 362 | var data = WindowsInstallerData.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); | ||
| 363 | var fileRows = data.Tables["File"].Rows; | ||
| 364 | Assert.Equal(new[] | ||
| 365 | { | ||
| 366 | "filyIq8rqcxxf903Hsn5K9L0SWV73g.243FB739_4D05_472F_9CFB_EF6B1017B6DE" | ||
| 367 | }, fileRows.Select(r => r.FieldAsString(0)).ToArray()); | ||
| 368 | |||
| 369 | var cabPath = Path.Combine(intermediateFolder, "msm-test.cab"); | ||
| 370 | Query.ExtractStream(msmPath, "MergeModule.CABinet", cabPath); | ||
| 371 | var files = Query.GetCabinetFiles(cabPath); | ||
| 372 | Assert.Equal(new[] | ||
| 373 | { | ||
| 374 | "filyIq8rqcxxf903Hsn5K9L0SWV73g.243FB739_4D05_472F_9CFB_EF6B1017B6DE" | ||
| 375 | }, files.Select(f => Path.Combine(f.Path, f.Name)).ToArray()); | ||
| 376 | } | ||
| 377 | } | ||
| 378 | |||
| 379 | [Fact] | ||
| 380 | public void CanBuildManualUpgrade() | 330 | public void CanBuildManualUpgrade() |
| 381 | { | 331 | { |
| 382 | var folder = TestData.Get(@"TestData\ManualUpgrade"); | 332 | var folder = TestData.Get(@"TestData\ManualUpgrade"); |
