aboutsummaryrefslogtreecommitdiff
path: root/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs76
1 files changed, 38 insertions, 38 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
index fbfebc5b..740d58c7 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
@@ -9,7 +9,7 @@ namespace WixToolsetTest.CoreIntegration
9 using WixBuildTools.TestSupport; 9 using WixBuildTools.TestSupport;
10 using WixToolset.Core.TestPackage; 10 using WixToolset.Core.TestPackage;
11 using WixToolset.Data; 11 using WixToolset.Data;
12 using WixToolset.Data.Tuples; 12 using WixToolset.Data.Symbols;
13 using WixToolset.Data.WindowsInstaller; 13 using WixToolset.Data.WindowsInstaller;
14 using Xunit; 14 using Xunit;
15 15
@@ -51,9 +51,9 @@ namespace WixToolsetTest.CoreIntegration
51 51
52 var section = intermediate.Sections.Single(); 52 var section = intermediate.Sections.Single();
53 53
54 var fileTuple = section.Tuples.OfType<FileTuple>().First(); 54 var fileSymbol = section.Symbols.OfType<FileSymbol>().First();
55 Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path); 55 Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
56 Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); 56 Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
57 } 57 }
58 } 58 }
59 59
@@ -86,9 +86,9 @@ namespace WixToolsetTest.CoreIntegration
86 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); 86 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
87 var section = intermediate.Sections.Single(); 87 var section = intermediate.Sections.Single();
88 88
89 var fileTuple = section.Tuples.OfType<FileTuple>().Single(); 89 var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
90 Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path); 90 Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
91 Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); 91 Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
92 } 92 }
93 } 93 }
94 94
@@ -244,14 +244,14 @@ namespace WixToolsetTest.CoreIntegration
244 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); 244 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
245 var section = intermediate.Sections.Single(); 245 var section = intermediate.Sections.Single();
246 246
247 var errors = section.Tuples.OfType<ErrorTuple>().ToDictionary(t => t.Id.Id); 247 var errors = section.Symbols.OfType<ErrorSymbol>().ToDictionary(t => t.Id.Id);
248 Assert.Equal("Category 55 Emergency Doomsday Crisis", errors["1234"].Message.Trim()); 248 Assert.Equal("Category 55 Emergency Doomsday Crisis", errors["1234"].Message.Trim());
249 Assert.Equal(" ", errors["5678"].Message); 249 Assert.Equal(" ", errors["5678"].Message);
250 250
251 var customAction1 = section.Tuples.OfType<CustomActionTuple>().Where(t => t.Id.Id == "CanWeReferenceAnError_YesWeCan").Single(); 251 var customAction1 = section.Symbols.OfType<CustomActionSymbol>().Where(t => t.Id.Id == "CanWeReferenceAnError_YesWeCan").Single();
252 Assert.Equal("1234", customAction1.Target); 252 Assert.Equal("1234", customAction1.Target);
253 253
254 var customAction2 = section.Tuples.OfType<CustomActionTuple>().Where(t => t.Id.Id == "TextErrorsWorkOKToo").Single(); 254 var customAction2 = section.Symbols.OfType<CustomActionSymbol>().Where(t => t.Id.Id == "TextErrorsWorkOKToo").Single();
255 Assert.Equal("If you see this, something went wrong.", customAction2.Target); 255 Assert.Equal("If you see this, something went wrong.", customAction2.Target);
256 } 256 }
257 } 257 }
@@ -353,10 +353,10 @@ namespace WixToolsetTest.CoreIntegration
353 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); 353 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
354 var section = intermediate.Sections.Single(); 354 var section = intermediate.Sections.Single();
355 355
356 var fileTuple = section.Tuples.OfType<FileTuple>().Single(); 356 var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
357 Assert.Equal("filyIq8rqcxxf903Hsn5K9L0SWV73g", fileTuple.Id.Id); 357 Assert.Equal("filyIq8rqcxxf903Hsn5K9L0SWV73g", fileSymbol.Id.Id);
358 Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path); 358 Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
359 Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); 359 Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
360 360
361 var data = WindowsInstallerData.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); 361 var data = WindowsInstallerData.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
362 var fileRows = data.Tables["File"].Rows; 362 var fileRows = data.Tables["File"].Rows;
@@ -405,15 +405,15 @@ namespace WixToolsetTest.CoreIntegration
405 var intermediate = Intermediate.Load(pdbPath); 405 var intermediate = Intermediate.Load(pdbPath);
406 var section = intermediate.Sections.Single(); 406 var section = intermediate.Sections.Single();
407 407
408 var upgradeTuple = section.Tuples.OfType<UpgradeTuple>().Single(); 408 var upgradeSymbol = section.Symbols.OfType<UpgradeSymbol>().Single();
409 Assert.False(upgradeTuple.ExcludeLanguages); 409 Assert.False(upgradeSymbol.ExcludeLanguages);
410 Assert.True(upgradeTuple.IgnoreRemoveFailures); 410 Assert.True(upgradeSymbol.IgnoreRemoveFailures);
411 Assert.False(upgradeTuple.VersionMaxInclusive); 411 Assert.False(upgradeSymbol.VersionMaxInclusive);
412 Assert.True(upgradeTuple.VersionMinInclusive); 412 Assert.True(upgradeSymbol.VersionMinInclusive);
413 Assert.Equal("13.0.0", upgradeTuple.VersionMax); 413 Assert.Equal("13.0.0", upgradeSymbol.VersionMax);
414 Assert.Equal("12.0.0", upgradeTuple.VersionMin); 414 Assert.Equal("12.0.0", upgradeSymbol.VersionMin);
415 Assert.False(upgradeTuple.OnlyDetect); 415 Assert.False(upgradeSymbol.OnlyDetect);
416 Assert.Equal("BLAHBLAHBLAH", upgradeTuple.ActionProperty); 416 Assert.Equal("BLAHBLAHBLAH", upgradeSymbol.ActionProperty);
417 417
418 var pdb = WindowsInstallerData.Load(pdbPath, suppressVersionCheck: false); 418 var pdb = WindowsInstallerData.Load(pdbPath, suppressVersionCheck: false);
419 var secureProperties = pdb.Tables["Property"].Rows.Where(row => row.GetKey() == "SecureCustomProperties").Single(); 419 var secureProperties = pdb.Tables["Property"].Rows.Where(row => row.GetKey() == "SecureCustomProperties").Single();
@@ -581,9 +581,9 @@ namespace WixToolsetTest.CoreIntegration
581 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); 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 fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
585 Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path); 585 Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
586 Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); 586 Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
587 } 587 }
588 } 588 }
589 589
@@ -617,11 +617,11 @@ namespace WixToolsetTest.CoreIntegration
617 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); 617 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
618 var section = intermediate.Sections.Single(); 618 var section = intermediate.Sections.Single();
619 619
620 var fileTuple = section.Tuples.OfType<FileTuple>().Single(); 620 var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
621 Assert.Equal(Path.Combine(folder, @"data\candle.exe"), fileTuple[FileTupleFields.Source].AsPath().Path); 621 Assert.Equal(Path.Combine(folder, @"data\candle.exe"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
622 Assert.Equal(@"candle.exe", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); 622 Assert.Equal(@"candle.exe", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
623 623
624 var msiAssemblyNameTuples = section.Tuples.OfType<MsiAssemblyNameTuple>(); 624 var msiAssemblyNameSymbols = section.Symbols.OfType<MsiAssemblyNameSymbol>();
625 Assert.Equal(new[] 625 Assert.Equal(new[]
626 { 626 {
627 "culture", 627 "culture",
@@ -630,7 +630,7 @@ namespace WixToolsetTest.CoreIntegration
630 "processorArchitecture", 630 "processorArchitecture",
631 "publicKeyToken", 631 "publicKeyToken",
632 "version" 632 "version"
633 }, msiAssemblyNameTuples.OrderBy(a => a.Name).Select(a => a.Name).ToArray()); 633 }, msiAssemblyNameSymbols.OrderBy(a => a.Name).Select(a => a.Name).ToArray());
634 634
635 Assert.Equal(new[] 635 Assert.Equal(new[]
636 { 636 {
@@ -640,7 +640,7 @@ namespace WixToolsetTest.CoreIntegration
640 "x86", 640 "x86",
641 "256B3414DFA97718", 641 "256B3414DFA97718",
642 "3.0.0.0" 642 "3.0.0.0"
643 }, msiAssemblyNameTuples.OrderBy(a => a.Name).Select(a => a.Value).ToArray()); 643 }, msiAssemblyNameSymbols.OrderBy(a => a.Name).Select(a => a.Value).ToArray());
644 } 644 }
645 } 645 }
646 646
@@ -671,7 +671,7 @@ namespace WixToolsetTest.CoreIntegration
671 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); 671 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
672 var section = intermediate.Sections.Single(); 672 var section = intermediate.Sections.Single();
673 673
674 var platformSummary = section.Tuples.OfType<SummaryInformationTuple>().Single(s => s.PropertyId == SummaryInformationType.PlatformAndLanguage); 674 var platformSummary = section.Symbols.OfType<SummaryInformationSymbol>().Single(s => s.PropertyId == SummaryInformationType.PlatformAndLanguage);
675 Assert.Equal("x64;1033", platformSummary.Value); 675 Assert.Equal("x64;1033", platformSummary.Value);
676 } 676 }
677 } 677 }
@@ -704,12 +704,12 @@ namespace WixToolsetTest.CoreIntegration
704 var section = intermediate.Sections.Single(); 704 var section = intermediate.Sections.Single();
705 705
706 // Only one component is shared. 706 // Only one component is shared.
707 var sharedComponentTuples = section.Tuples.OfType<ComponentTuple>(); 707 var sharedComponentSymbols = section.Symbols.OfType<ComponentSymbol>();
708 Assert.Equal(1, sharedComponentTuples.Sum(t => t.Shared ? 1 : 0)); 708 Assert.Equal(1, sharedComponentSymbols.Sum(t => t.Shared ? 1 : 0));
709 709
710 // And it is this one. 710 // And it is this one.
711 var sharedComponentTuple = sharedComponentTuples.Single(t => t.Id.Id == "Shared.dll"); 711 var sharedComponentSymbol = sharedComponentSymbols.Single(t => t.Id.Id == "Shared.dll");
712 Assert.True(sharedComponentTuple.Shared); 712 Assert.True(sharedComponentSymbol.Shared);
713 } 713 }
714 } 714 }
715 715
@@ -775,7 +775,7 @@ namespace WixToolsetTest.CoreIntegration
775 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); 775 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
776 var section = intermediate.Sections.Single(); 776 var section = intermediate.Sections.Single();
777 777
778 var progids = section.Tuples.OfType<ProgIdTuple>().OrderBy(tuple => tuple.ProgId).ToList(); 778 var progids = section.Symbols.OfType<ProgIdSymbol>().OrderBy(symbol => symbol.ProgId).ToList();
779 Assert.Equal(new[] 779 Assert.Equal(new[]
780 { 780 {
781 "Foo.File.hol", 781 "Foo.File.hol",