diff options
author | Rob Mensching <rob@firegiant.com> | 2020-06-25 14:43:50 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2020-06-25 14:50:31 -0700 |
commit | 38afa9e7bc7eacc021f8805f607368a05751e3c3 (patch) | |
tree | 803b0a8d9a06a7d6f7c4df408437017ae21a883e /src/test/WixToolsetTest.CoreIntegration | |
parent | 8968578d50858721317d410549a9f9b5c62bf1f7 (diff) | |
download | wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.tar.gz wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.tar.bz2 wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.zip |
The Great Tuple to Symbol Rename (tm)
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration')
9 files changed, 103 insertions, 103 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs index b86e67ff..cf57eae1 100644 --- a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs | |||
@@ -12,7 +12,7 @@ namespace WixToolsetTest.CoreIntegration | |||
12 | using WixToolset.Core.TestPackage; | 12 | using WixToolset.Core.TestPackage; |
13 | using WixToolset.Data; | 13 | using WixToolset.Data; |
14 | using WixToolset.Data.Burn; | 14 | using WixToolset.Data.Burn; |
15 | using WixToolset.Data.Tuples; | 15 | using WixToolset.Data.Symbols; |
16 | using Xunit; | 16 | using Xunit; |
17 | 17 | ||
18 | public class BundleFixture | 18 | public class BundleFixture |
@@ -81,14 +81,14 @@ namespace WixToolsetTest.CoreIntegration | |||
81 | var intermediate = Intermediate.Load(wixOutput); | 81 | var intermediate = Intermediate.Load(wixOutput); |
82 | var section = intermediate.Sections.Single(); | 82 | var section = intermediate.Sections.Single(); |
83 | 83 | ||
84 | var bundleTuple = section.Tuples.OfType<WixBundleTuple>().Single(); | 84 | var bundleSymbol = section.Symbols.OfType<WixBundleSymbol>().Single(); |
85 | Assert.Equal("1.0.0.0", bundleTuple.Version); | 85 | Assert.Equal("1.0.0.0", bundleSymbol.Version); |
86 | 86 | ||
87 | var previousVersion = bundleTuple.Fields[(int)WixBundleTupleFields.Version].PreviousValue; | 87 | var previousVersion = bundleSymbol.Fields[(int)WixBundleSymbolFields.Version].PreviousValue; |
88 | Assert.Equal("!(bind.packageVersion.test.msi)", previousVersion.AsString()); | 88 | Assert.Equal("!(bind.packageVersion.test.msi)", previousVersion.AsString()); |
89 | 89 | ||
90 | var msiTuple = section.Tuples.OfType<WixBundlePackageTuple>().Single(); | 90 | var msiSymbol = section.Symbols.OfType<WixBundlePackageSymbol>().Single(); |
91 | Assert.Equal("test.msi", msiTuple.Id.Id); | 91 | Assert.Equal("test.msi", msiSymbol.Id.Id); |
92 | 92 | ||
93 | var extractResult = BundleExtractor.ExtractBAContainer(null, exePath, baFolderPath, extractFolderPath); | 93 | var extractResult = BundleExtractor.ExtractBAContainer(null, exePath, baFolderPath, extractFolderPath); |
94 | extractResult.AssertSuccess(); | 94 | extractResult.AssertSuccess(); |
@@ -111,7 +111,7 @@ namespace WixToolsetTest.CoreIntegration | |||
111 | 111 | ||
112 | var registrationElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Registration"); | 112 | var registrationElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Registration"); |
113 | var registrationElement = (XmlNode)Assert.Single(registrationElements); | 113 | var registrationElement = (XmlNode)Assert.Single(registrationElements); |
114 | Assert.Equal($"<Registration Id='{bundleTuple.BundleId}' ExecutableName='test.exe' PerMachine='yes' Tag='' Version='1.0.0.0' ProviderKey='{bundleTuple.BundleId}'>" + | 114 | Assert.Equal($"<Registration Id='{bundleSymbol.BundleId}' ExecutableName='test.exe' PerMachine='yes' Tag='' Version='1.0.0.0' ProviderKey='{bundleSymbol.BundleId}'>" + |
115 | "<Arp Register='yes' DisplayName='~TestBundle' DisplayVersion='1.0.0.0' Publisher='Example Corporation' />" + | 115 | "<Arp Register='yes' DisplayName='~TestBundle' DisplayVersion='1.0.0.0' Publisher='Example Corporation' />" + |
116 | "</Registration>", registrationElement.GetTestXml()); | 116 | "</Registration>", registrationElement.GetTestXml()); |
117 | } | 117 | } |
diff --git a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs index bad7f3ef..ff0c3258 100644 --- a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.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 Xunit; | 13 | using Xunit; |
14 | 14 | ||
15 | public class ExtensionFixture | 15 | public class ExtensionFixture |
@@ -58,11 +58,11 @@ namespace WixToolsetTest.CoreIntegration | |||
58 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\extest.wixpdb")); | 58 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\extest.wixpdb")); |
59 | var section = intermediate.Sections.Single(); | 59 | var section = intermediate.Sections.Single(); |
60 | 60 | ||
61 | var fileTuple = section.Tuples.OfType<FileTuple>().Single(); | 61 | var fileSymbol = section.Symbols.OfType<FileSymbol>().Single(); |
62 | Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileTuple[FileTupleFields.Source].AsPath().Path); | 62 | Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); |
63 | Assert.Equal(@"example.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); | 63 | Assert.Equal(@"example.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); |
64 | 64 | ||
65 | var example = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).Single(); | 65 | var example = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).Single(); |
66 | Assert.Equal("Foo", example.Id?.Id); | 66 | Assert.Equal("Foo", example.Id?.Id); |
67 | Assert.Equal("Bar", example[0].AsString()); | 67 | Assert.Equal("Bar", example[0].AsString()); |
68 | } | 68 | } |
@@ -96,7 +96,7 @@ namespace WixToolsetTest.CoreIntegration | |||
96 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\extest.wixpdb")); | 96 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\extest.wixpdb")); |
97 | var section = intermediate.Sections.Single(); | 97 | var section = intermediate.Sections.Single(); |
98 | 98 | ||
99 | var property = section.Tuples.OfType<PropertyTuple>().Where(p => p.Id.Id == "ExampleProperty").Single(); | 99 | var property = section.Symbols.OfType<PropertySymbol>().Where(p => p.Id.Id == "ExampleProperty").Single(); |
100 | Assert.Equal("ExampleProperty", property.Id.Id); | 100 | Assert.Equal("ExampleProperty", property.Id.Id); |
101 | Assert.Equal("test", property.Value); | 101 | Assert.Equal("test", property.Value); |
102 | } | 102 | } |
@@ -111,7 +111,7 @@ namespace WixToolsetTest.CoreIntegration | |||
111 | { | 111 | { |
112 | var intermediateFolder = fs.GetFolder(); | 112 | var intermediateFolder = fs.GetFolder(); |
113 | 113 | ||
114 | var exception = Assert.Throws<WixException>(() => | 114 | var exception = Assert.Throws<WixException>(() => |
115 | WixRunner.Execute(new[] | 115 | WixRunner.Execute(new[] |
116 | { | 116 | { |
117 | "build", | 117 | "build", |
diff --git a/src/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs b/src/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs index 97e6bde9..5e08ca58 100644 --- a/src/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs | |||
@@ -9,7 +9,7 @@ namespace WixToolsetTest.CoreIntegration | |||
9 | using WixToolset.Core; | 9 | using WixToolset.Core; |
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.Extensibility.Data; | 13 | using WixToolset.Extensibility.Data; |
14 | using WixToolset.Extensibility.Services; | 14 | using WixToolset.Extensibility.Services; |
15 | using Xunit; | 15 | using Xunit; |
@@ -27,12 +27,12 @@ namespace WixToolsetTest.CoreIntegration | |||
27 | var messaging = serviceProvider.GetService<IMessaging>(); | 27 | var messaging = serviceProvider.GetService<IMessaging>(); |
28 | messaging.SetListener(listener); | 28 | messaging.SetListener(listener); |
29 | 29 | ||
30 | var creator = serviceProvider.GetService<ITupleDefinitionCreator>(); | 30 | var creator = serviceProvider.GetService<ISymbolDefinitionCreator>(); |
31 | var context = serviceProvider.GetService<ILinkContext>(); | 31 | var context = serviceProvider.GetService<ILinkContext>(); |
32 | context.Extensions = Enumerable.Empty<WixToolset.Extensibility.ILinkerExtension>(); | 32 | context.Extensions = Enumerable.Empty<WixToolset.Extensibility.ILinkerExtension>(); |
33 | context.ExtensionData = Enumerable.Empty<WixToolset.Extensibility.IExtensionData>(); | 33 | context.ExtensionData = Enumerable.Empty<WixToolset.Extensibility.IExtensionData>(); |
34 | context.Intermediates = new[] { intermediate1, intermediate2 }; | 34 | context.Intermediates = new[] { intermediate1, intermediate2 }; |
35 | context.TupleDefinitionCreator = creator; | 35 | context.SymbolDefinitionCreator = creator; |
36 | 36 | ||
37 | var linker = serviceProvider.GetService<ILinker>(); | 37 | var linker = serviceProvider.GetService<ILinker>(); |
38 | linker.Link(context); | 38 | linker.Link(context); |
@@ -72,10 +72,10 @@ namespace WixToolsetTest.CoreIntegration | |||
72 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); | 72 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); |
73 | var section = intermediate.Sections.Single(); | 73 | var section = intermediate.Sections.Single(); |
74 | 74 | ||
75 | var actions = section.Tuples.OfType<WixActionTuple>().Where(wat => wat.Action.StartsWith("Set")).ToList(); | 75 | var actions = section.Symbols.OfType<WixActionSymbol>().Where(wat => wat.Action.StartsWith("Set")).ToList(); |
76 | Assert.Equal(2, actions.Count); | 76 | Assert.Equal(2, actions.Count); |
77 | //Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path); | 77 | //Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileSymbolFields.Source].AsPath().Path); |
78 | //Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); | 78 | //Assert.Equal(@"test.txt", wixFile[WixFileSymbolFields.Source].PreviousValue.AsPath().Path); |
79 | } | 79 | } |
80 | } | 80 | } |
81 | } | 81 | } |
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", |
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs index c78b0c29..078a33d5 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.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 | ||
@@ -1074,7 +1074,7 @@ namespace WixToolsetTest.CoreIntegration | |||
1074 | 1074 | ||
1075 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); | 1075 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); |
1076 | var section = intermediate.Sections.Single(); | 1076 | var section = intermediate.Sections.Single(); |
1077 | Assert.Empty(section.Tuples.OfType<FileTuple>()); | 1077 | Assert.Empty(section.Symbols.OfType<FileSymbol>()); |
1078 | 1078 | ||
1079 | var data = WindowsInstallerData.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); | 1079 | var data = WindowsInstallerData.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); |
1080 | Assert.Null(data.Tables["File"]); | 1080 | Assert.Null(data.Tables["File"]); |
diff --git a/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs index afb93041..83f74a47 100644 --- a/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs | |||
@@ -5,7 +5,7 @@ namespace WixToolsetTest.CoreIntegration | |||
5 | using System.Linq; | 5 | using System.Linq; |
6 | using WixToolset.Core; | 6 | using WixToolset.Core; |
7 | using WixToolset.Data; | 7 | using WixToolset.Data; |
8 | using WixToolset.Data.Tuples; | 8 | using WixToolset.Data.Symbols; |
9 | using WixToolset.Extensibility.Data; | 9 | using WixToolset.Extensibility.Data; |
10 | using WixToolset.Extensibility.Services; | 10 | using WixToolset.Extensibility.Services; |
11 | using Xunit; | 11 | using Xunit; |
@@ -25,7 +25,7 @@ namespace WixToolsetTest.CoreIntegration | |||
25 | parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86 | CustomActionPlatforms.ARM); | 25 | parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86 | CustomActionPlatforms.ARM); |
26 | parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86 | CustomActionPlatforms.X64); | 26 | parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86 | CustomActionPlatforms.X64); |
27 | 27 | ||
28 | var simpleReferences = section.Tuples.OfType<WixSimpleReferenceTuple>(); | 28 | var simpleReferences = section.Symbols.OfType<WixSimpleReferenceSymbol>(); |
29 | Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomAction32_X86").FirstOrDefault()); | 29 | Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomAction32_X86").FirstOrDefault()); |
30 | Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomArmAction_X86").FirstOrDefault()); | 30 | Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomArmAction_X86").FirstOrDefault()); |
31 | Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomArmAction_A64").FirstOrDefault()); | 31 | Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomArmAction_A64").FirstOrDefault()); |
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs index 25067830..942f253f 100644 --- a/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs | |||
@@ -8,7 +8,7 @@ namespace WixToolsetTest.CoreIntegration | |||
8 | using WixBuildTools.TestSupport; | 8 | using WixBuildTools.TestSupport; |
9 | using WixToolset.Core.TestPackage; | 9 | using WixToolset.Core.TestPackage; |
10 | using WixToolset.Data; | 10 | using WixToolset.Data; |
11 | using WixToolset.Data.Tuples; | 11 | using WixToolset.Data.Symbols; |
12 | using Example.Extension; | 12 | using Example.Extension; |
13 | using Xunit; | 13 | using Xunit; |
14 | 14 | ||
@@ -62,9 +62,9 @@ namespace WixToolsetTest.CoreIntegration | |||
62 | 62 | ||
63 | var section = intermediate.Sections.Single(); | 63 | var section = intermediate.Sections.Single(); |
64 | 64 | ||
65 | var fileTuple = section.Tuples.OfType<FileTuple>().First(); | 65 | var fileSymbol = section.Symbols.OfType<FileSymbol>().First(); |
66 | Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path); | 66 | Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); |
67 | Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); | 67 | Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); |
68 | } | 68 | } |
69 | } | 69 | } |
70 | 70 | ||
@@ -132,14 +132,14 @@ namespace WixToolsetTest.CoreIntegration | |||
132 | var section = intermediate.Sections.Single(); | 132 | var section = intermediate.Sections.Single(); |
133 | 133 | ||
134 | { | 134 | { |
135 | var fileTuple = section.Tuples.OfType<FileTuple>().Single(); | 135 | var fileSymbol = section.Symbols.OfType<FileSymbol>().Single(); |
136 | Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path); | 136 | Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); |
137 | Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); | 137 | Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); |
138 | } | 138 | } |
139 | 139 | ||
140 | { | 140 | { |
141 | var binary = section.Tuples.OfType<BinaryTuple>().Single(); | 141 | var binary = section.Symbols.OfType<BinarySymbol>().Single(); |
142 | var path = binary[BinaryTupleFields.Data].AsPath().Path; | 142 | var path = binary[BinarySymbolFields.Data].AsPath().Path; |
143 | Assert.StartsWith(Path.Combine(baseFolder, @"obj\Example.Extension"), path); | 143 | Assert.StartsWith(Path.Combine(baseFolder, @"obj\Example.Extension"), path); |
144 | Assert.EndsWith(@"wix-ir\example.txt", path); | 144 | Assert.EndsWith(@"wix-ir\example.txt", path); |
145 | Assert.Equal(@"BinFromWir", binary.Id.Id); | 145 | Assert.Equal(@"BinFromWir", binary.Id.Id); |
@@ -187,14 +187,14 @@ namespace WixToolsetTest.CoreIntegration | |||
187 | var section = intermediate.Sections.Single(); | 187 | var section = intermediate.Sections.Single(); |
188 | 188 | ||
189 | { | 189 | { |
190 | var fileTuple = section.Tuples.OfType<FileTuple>().Single(); | 190 | var fileSymbol = section.Symbols.OfType<FileSymbol>().Single(); |
191 | Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path); | 191 | Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); |
192 | Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); | 192 | Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); |
193 | } | 193 | } |
194 | 194 | ||
195 | { | 195 | { |
196 | var binary = section.Tuples.OfType<BinaryTuple>().Single(); | 196 | var binary = section.Symbols.OfType<BinarySymbol>().Single(); |
197 | var path = binary[BinaryTupleFields.Data].AsPath().Path; | 197 | var path = binary[BinarySymbolFields.Data].AsPath().Path; |
198 | Assert.StartsWith(Path.Combine(baseFolder, @"obj\test"), path); | 198 | Assert.StartsWith(Path.Combine(baseFolder, @"obj\test"), path); |
199 | Assert.EndsWith(@"wix-ir\example.txt", path); | 199 | Assert.EndsWith(@"wix-ir\example.txt", path); |
200 | Assert.Equal(@"BinFromWir", binary.Id.Id); | 200 | Assert.Equal(@"BinFromWir", binary.Id.Id); |
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs index 63771248..6ae2c0b8 100644 --- a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.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 Xunit; | 13 | using Xunit; |
14 | 14 | ||
15 | public class WixlibFixture | 15 | public class WixlibFixture |
@@ -80,11 +80,11 @@ namespace WixToolsetTest.CoreIntegration | |||
80 | result.AssertSuccess(); | 80 | result.AssertSuccess(); |
81 | 81 | ||
82 | var wixlib = Intermediate.Load(wixlibPath); | 82 | var wixlib = Intermediate.Load(wixlibPath); |
83 | var binaryTuples = wixlib.Sections.SelectMany(s => s.Tuples).OfType<BinaryTuple>().ToList(); | 83 | var binarySymbols = wixlib.Sections.SelectMany(s => s.Symbols).OfType<BinarySymbol>().ToList(); |
84 | Assert.Equal(3, binaryTuples.Count); | 84 | Assert.Equal(3, binarySymbols.Count); |
85 | Assert.Single(binaryTuples.Where(t => t.Data.Path == "wix-ir/foo.dll")); | 85 | Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll")); |
86 | Assert.Single(binaryTuples.Where(t => t.Data.Path == "wix-ir/foo.dll-1")); | 86 | Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll-1")); |
87 | Assert.Single(binaryTuples.Where(t => t.Data.Path == "wix-ir/foo.dll-2")); | 87 | Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll-2")); |
88 | } | 88 | } |
89 | } | 89 | } |
90 | 90 | ||
@@ -138,9 +138,9 @@ namespace WixToolsetTest.CoreIntegration | |||
138 | 138 | ||
139 | var section = intermediate.Sections.Single(); | 139 | var section = intermediate.Sections.Single(); |
140 | 140 | ||
141 | var wixFile = section.Tuples.OfType<FileTuple>().First(); | 141 | var wixFile = section.Symbols.OfType<FileSymbol>().First(); |
142 | Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[FileTupleFields.Source].AsPath().Path); | 142 | Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[FileSymbolFields.Source].AsPath().Path); |
143 | Assert.Equal(@"test.txt", wixFile[FileTupleFields.Source].PreviousValue.AsPath().Path); | 143 | Assert.Equal(@"test.txt", wixFile[FileSymbolFields.Source].PreviousValue.AsPath().Path); |
144 | } | 144 | } |
145 | } | 145 | } |
146 | 146 | ||
@@ -183,11 +183,11 @@ namespace WixToolsetTest.CoreIntegration | |||
183 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); | 183 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); |
184 | var section = intermediate.Sections.Single(); | 184 | var section = intermediate.Sections.Single(); |
185 | 185 | ||
186 | var fileTuple = section.Tuples.OfType<FileTuple>().Single(); | 186 | var fileSymbol = section.Symbols.OfType<FileSymbol>().Single(); |
187 | Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileTuple[FileTupleFields.Source].AsPath().Path); | 187 | Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); |
188 | Assert.Equal(@"example.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); | 188 | Assert.Equal(@"example.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); |
189 | 189 | ||
190 | var example = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).Single(); | 190 | var example = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).Single(); |
191 | Assert.Equal("Foo", example.Id?.Id); | 191 | Assert.Equal("Foo", example.Id?.Id); |
192 | Assert.Equal("Bar", example[0].AsString()); | 192 | Assert.Equal("Bar", example[0].AsString()); |
193 | } | 193 | } |
@@ -244,13 +244,13 @@ namespace WixToolsetTest.CoreIntegration | |||
244 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); | 244 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); |
245 | var section = intermediate.Sections.Single(); | 245 | var section = intermediate.Sections.Single(); |
246 | 246 | ||
247 | var fileTuples = section.Tuples.OfType<FileTuple>().OrderBy(t => Path.GetFileName(t.Source.Path)).ToArray(); | 247 | var fileSymbols = section.Symbols.OfType<FileSymbol>().OrderBy(t => Path.GetFileName(t.Source.Path)).ToArray(); |
248 | Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileTuples[0][FileTupleFields.Source].AsPath().Path); | 248 | Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileSymbols[0][FileSymbolFields.Source].AsPath().Path); |
249 | Assert.Equal(@"example.txt", fileTuples[0][FileTupleFields.Source].PreviousValue.AsPath().Path); | 249 | Assert.Equal(@"example.txt", fileSymbols[0][FileSymbolFields.Source].PreviousValue.AsPath().Path); |
250 | Assert.Equal(Path.Combine(folder, @"data\other.txt"), fileTuples[1][FileTupleFields.Source].AsPath().Path); | 250 | Assert.Equal(Path.Combine(folder, @"data\other.txt"), fileSymbols[1][FileSymbolFields.Source].AsPath().Path); |
251 | Assert.Equal(@"other.txt", fileTuples[1][FileTupleFields.Source].PreviousValue.AsPath().Path); | 251 | Assert.Equal(@"other.txt", fileSymbols[1][FileSymbolFields.Source].PreviousValue.AsPath().Path); |
252 | 252 | ||
253 | var examples = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).ToArray(); | 253 | var examples = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).ToArray(); |
254 | Assert.Equal(new string[] { "Foo", "Other" }, examples.Select(t => t.Id?.Id).ToArray()); | 254 | Assert.Equal(new string[] { "Foo", "Other" }, examples.Select(t => t.Id?.Id).ToArray()); |
255 | Assert.Equal(new[] { "Bar", "Value" }, examples.Select(t => t[0].AsString()).ToArray()); | 255 | Assert.Equal(new[] { "Bar", "Value" }, examples.Select(t => t[0].AsString()).ToArray()); |
256 | } | 256 | } |
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs index 7f9b9686..57351b27 100644 --- a/src/test/WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs | |||
@@ -7,7 +7,7 @@ namespace WixToolsetTest.CoreIntegration | |||
7 | using WixBuildTools.TestSupport; | 7 | using WixBuildTools.TestSupport; |
8 | using WixToolset.Core.TestPackage; | 8 | using WixToolset.Core.TestPackage; |
9 | using WixToolset.Data; | 9 | using WixToolset.Data; |
10 | using WixToolset.Data.Tuples; | 10 | using WixToolset.Data.Symbols; |
11 | using Xunit; | 11 | using Xunit; |
12 | 12 | ||
13 | public class WixlibQueryFixture | 13 | public class WixlibQueryFixture |
@@ -34,9 +34,9 @@ namespace WixToolsetTest.CoreIntegration | |||
34 | result.AssertSuccess(); | 34 | result.AssertSuccess(); |
35 | 35 | ||
36 | var intermediate = Intermediate.Load(wixlibPath); | 36 | var intermediate = Intermediate.Load(wixlibPath); |
37 | var allTuples = intermediate.Sections.SelectMany(s => s.Tuples); | 37 | var allSymbols = intermediate.Sections.SelectMany(s => s.Symbols); |
38 | var wixSimpleRefTuples = allTuples.OfType<WixSimpleReferenceTuple>(); | 38 | var wixSimpleRefSymbols = allSymbols.OfType<WixSimpleReferenceSymbol>(); |
39 | var repRef = wixSimpleRefTuples.Where(t => t.Table == "WixAction" && | 39 | var repRef = wixSimpleRefSymbols.Where(t => t.Table == "WixAction" && |
40 | t.PrimaryKeys == "InstallExecuteSequence/RemoveExistingProducts") | 40 | t.PrimaryKeys == "InstallExecuteSequence/RemoveExistingProducts") |
41 | .SingleOrDefault(); | 41 | .SingleOrDefault(); |
42 | Assert.NotNull(repRef); | 42 | Assert.NotNull(repRef); |
@@ -65,12 +65,12 @@ namespace WixToolsetTest.CoreIntegration | |||
65 | result.AssertSuccess(); | 65 | result.AssertSuccess(); |
66 | 66 | ||
67 | var intermediate = Intermediate.Load(wixlibPath); | 67 | var intermediate = Intermediate.Load(wixlibPath); |
68 | var allTuples = intermediate.Sections.SelectMany(s => s.Tuples); | 68 | var allSymbols = intermediate.Sections.SelectMany(s => s.Symbols); |
69 | var typeLibTuple = allTuples.OfType<TypeLibTuple>() | 69 | var typeLibSymbol = allSymbols.OfType<TypeLibSymbol>() |
70 | .SingleOrDefault(); | 70 | .SingleOrDefault(); |
71 | Assert.NotNull(typeLibTuple); | 71 | Assert.NotNull(typeLibSymbol); |
72 | 72 | ||
73 | var fields = typeLibTuple.Fields.Select(field => field?.Type == IntermediateFieldType.Bool | 73 | var fields = typeLibSymbol.Fields.Select(field => field?.Type == IntermediateFieldType.Bool |
74 | ? field.AsNullableNumber()?.ToString() | 74 | ? field.AsNullableNumber()?.ToString() |
75 | : field?.AsString()) | 75 | : field?.AsString()) |
76 | .ToList(); | 76 | .ToList(); |