diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-10-25 01:41:25 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-10-25 01:41:25 -0700 |
| commit | 98bdcfac8bd4f699bc6865abd283f710943e77bc (patch) | |
| tree | 1823623e090e5b79d369699e0481ea4dd92b3568 /src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs | |
| parent | 9c714a8f1baa6e0130e5cd00cbdca649cebaf6a5 (diff) | |
| download | wix-98bdcfac8bd4f699bc6865abd283f710943e77bc.tar.gz wix-98bdcfac8bd4f699bc6865abd283f710943e77bc.tar.bz2 wix-98bdcfac8bd4f699bc6865abd283f710943e77bc.zip | |
Remove explicit intermediate file provided for testing
We have a real WixOutput now that officially provides all the necessary
information, so use that instead.
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs index e201b61f..1be60587 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs | |||
| @@ -40,7 +40,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 40 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); | 40 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); |
| 41 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\test.txt"))); | 41 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\test.txt"))); |
| 42 | 42 | ||
| 43 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); | 43 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); |
| 44 | var section = intermediate.Sections.Single(); | 44 | var section = intermediate.Sections.Single(); |
| 45 | 45 | ||
| 46 | var fileTuple = section.Tuples.OfType<FileTuple>().First(); | 46 | var fileTuple = section.Tuples.OfType<FileTuple>().First(); |
| @@ -75,7 +75,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 75 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\example.cab"))); | 75 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\example.cab"))); |
| 76 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb"))); | 76 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb"))); |
| 77 | 77 | ||
| 78 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); | 78 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); |
| 79 | var section = intermediate.Sections.Single(); | 79 | var section = intermediate.Sections.Single(); |
| 80 | 80 | ||
| 81 | var fileTuple = section.Tuples.OfType<FileTuple>().Single(); | 81 | var fileTuple = section.Tuples.OfType<FileTuple>().Single(); |
| @@ -274,7 +274,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 274 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); | 274 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); |
| 275 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\test.txt"))); | 275 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\test.txt"))); |
| 276 | 276 | ||
| 277 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); | 277 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); |
| 278 | var section = intermediate.Sections.Single(); | 278 | var section = intermediate.Sections.Single(); |
| 279 | 279 | ||
| 280 | var error = section.Tuples.OfType<ErrorTuple>().Single(); | 280 | var error = section.Tuples.OfType<ErrorTuple>().Single(); |
| @@ -341,7 +341,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 341 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msm"))); | 341 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msm"))); |
| 342 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb"))); | 342 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb"))); |
| 343 | 343 | ||
| 344 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); | 344 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); |
| 345 | var section = intermediate.Sections.Single(); | 345 | var section = intermediate.Sections.Single(); |
| 346 | 346 | ||
| 347 | var fileTuple = section.Tuples.OfType<FileTuple>().Single(); | 347 | var fileTuple = section.Tuples.OfType<FileTuple>().Single(); |
| @@ -376,7 +376,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 376 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb"))); | 376 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb"))); |
| 377 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\MsiPackage\test.txt"))); | 377 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\MsiPackage\test.txt"))); |
| 378 | 378 | ||
| 379 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); | 379 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); |
| 380 | var section = intermediate.Sections.Single(); | 380 | var section = intermediate.Sections.Single(); |
| 381 | 381 | ||
| 382 | var fileTuple = section.Tuples.OfType<FileTuple>().Single(); | 382 | var fileTuple = section.Tuples.OfType<FileTuple>().Single(); |
| @@ -542,7 +542,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 542 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); | 542 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); |
| 543 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\test.txt"))); | 543 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\test.txt"))); |
| 544 | 544 | ||
| 545 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); | 545 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); |
| 546 | var section = intermediate.Sections.Single(); | 546 | var section = intermediate.Sections.Single(); |
| 547 | 547 | ||
| 548 | var fileTuple = section.Tuples.OfType<FileTuple>().Single(); | 548 | var fileTuple = section.Tuples.OfType<FileTuple>().Single(); |
| @@ -578,7 +578,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 578 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); | 578 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); |
| 579 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\AssemblyMsiPackage\candle.exe"))); | 579 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\AssemblyMsiPackage\candle.exe"))); |
| 580 | 580 | ||
| 581 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); | 581 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); |
| 582 | var section = intermediate.Sections.Single(); | 582 | var section = intermediate.Sections.Single(); |
| 583 | 583 | ||
| 584 | var fileTuple = section.Tuples.OfType<FileTuple>().Single(); | 584 | var fileTuple = section.Tuples.OfType<FileTuple>().Single(); |
| @@ -632,7 +632,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 632 | 632 | ||
| 633 | result.AssertSuccess(); | 633 | result.AssertSuccess(); |
| 634 | 634 | ||
| 635 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); | 635 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); |
| 636 | var section = intermediate.Sections.Single(); | 636 | var section = intermediate.Sections.Single(); |
| 637 | 637 | ||
| 638 | var platformSummary = section.Tuples.OfType<SummaryInformationTuple>().Single(s => s.PropertyId == SumaryInformationType.PlatformAndLanguage); | 638 | var platformSummary = section.Tuples.OfType<SummaryInformationTuple>().Single(s => s.PropertyId == SumaryInformationType.PlatformAndLanguage); |
| @@ -664,7 +664,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 664 | 664 | ||
| 665 | result.AssertSuccess(); | 665 | result.AssertSuccess(); |
| 666 | 666 | ||
| 667 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); | 667 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); |
| 668 | var section = intermediate.Sections.Single(); | 668 | var section = intermediate.Sections.Single(); |
| 669 | 669 | ||
| 670 | // Only one component is shared. | 670 | // Only one component is shared. |
| @@ -736,7 +736,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 736 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); | 736 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); |
| 737 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\Foo.exe"))); | 737 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\Foo.exe"))); |
| 738 | 738 | ||
| 739 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); | 739 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); |
| 740 | var section = intermediate.Sections.Single(); | 740 | var section = intermediate.Sections.Single(); |
| 741 | 741 | ||
| 742 | var progids = section.Tuples.OfType<ProgIdTuple>().OrderBy(tuple => tuple.ProgId).ToList(); | 742 | var progids = section.Tuples.OfType<ProgIdTuple>().OrderBy(tuple => tuple.ProgId).ToList(); |
