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/LinkerFixture.cs | |
| 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/LinkerFixture.cs')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs | 12 |
1 files changed, 6 insertions, 6 deletions
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 | } |
