From 38afa9e7bc7eacc021f8805f607368a05751e3c3 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 25 Jun 2020 14:43:50 -0700 Subject: The Great Tuple to Symbol Rename (tm) --- .../WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/test/WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs') 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 using WixBuildTools.TestSupport; using WixToolset.Core.TestPackage; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using Xunit; public class WixlibQueryFixture @@ -34,9 +34,9 @@ namespace WixToolsetTest.CoreIntegration result.AssertSuccess(); var intermediate = Intermediate.Load(wixlibPath); - var allTuples = intermediate.Sections.SelectMany(s => s.Tuples); - var wixSimpleRefTuples = allTuples.OfType(); - var repRef = wixSimpleRefTuples.Where(t => t.Table == "WixAction" && + var allSymbols = intermediate.Sections.SelectMany(s => s.Symbols); + var wixSimpleRefSymbols = allSymbols.OfType(); + var repRef = wixSimpleRefSymbols.Where(t => t.Table == "WixAction" && t.PrimaryKeys == "InstallExecuteSequence/RemoveExistingProducts") .SingleOrDefault(); Assert.NotNull(repRef); @@ -65,12 +65,12 @@ namespace WixToolsetTest.CoreIntegration result.AssertSuccess(); var intermediate = Intermediate.Load(wixlibPath); - var allTuples = intermediate.Sections.SelectMany(s => s.Tuples); - var typeLibTuple = allTuples.OfType() + var allSymbols = intermediate.Sections.SelectMany(s => s.Symbols); + var typeLibSymbol = allSymbols.OfType() .SingleOrDefault(); - Assert.NotNull(typeLibTuple); + Assert.NotNull(typeLibSymbol); - var fields = typeLibTuple.Fields.Select(field => field?.Type == IntermediateFieldType.Bool + var fields = typeLibSymbol.Fields.Select(field => field?.Type == IntermediateFieldType.Bool ? field.AsNullableNumber()?.ToString() : field?.AsString()) .ToList(); -- cgit v1.2.3-55-g6feb