From 11112ebcdf97d4fa53e34d9dfe48410ff2378435 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 3 Apr 2020 11:38:20 +1000 Subject: Use TupleIdIsPrimaryKey. --- src/test/Example.Extension/ExampleCompilerExtension.cs | 5 ++--- src/test/Example.Extension/ExampleTuple.cs | 3 +-- src/test/Example.Extension/ExampleTupleDefinitions.cs | 1 - src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs | 5 ++--- src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs | 10 ++++------ 5 files changed, 9 insertions(+), 15 deletions(-) (limited to 'src/test') diff --git a/src/test/Example.Extension/ExampleCompilerExtension.cs b/src/test/Example.Extension/ExampleCompilerExtension.cs index 52168adc..e821b7b6 100644 --- a/src/test/Example.Extension/ExampleCompilerExtension.cs +++ b/src/test/Example.Extension/ExampleCompilerExtension.cs @@ -88,9 +88,8 @@ namespace Example.Extension if (!this.Messaging.EncounteredError) { - var tuple = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "Example"); - tuple.Set(0, id.Id); - tuple.Set(1, value); + var tuple = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "Example", id); + tuple.Set(0, value); } } diff --git a/src/test/Example.Extension/ExampleTuple.cs b/src/test/Example.Extension/ExampleTuple.cs index 0fc0d82c..f2bcb925 100644 --- a/src/test/Example.Extension/ExampleTuple.cs +++ b/src/test/Example.Extension/ExampleTuple.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. +// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. namespace Example.Extension { @@ -6,7 +6,6 @@ namespace Example.Extension public enum ExampleTupleFields { - Example, Value, } diff --git a/src/test/Example.Extension/ExampleTupleDefinitions.cs b/src/test/Example.Extension/ExampleTupleDefinitions.cs index a9771509..dd8b5bbf 100644 --- a/src/test/Example.Extension/ExampleTupleDefinitions.cs +++ b/src/test/Example.Extension/ExampleTupleDefinitions.cs @@ -13,7 +13,6 @@ namespace Example.Extension ExampleName, new[] { - new IntermediateFieldDefinition(nameof(ExampleTupleFields.Example), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(ExampleTupleFields.Value), IntermediateFieldType.String), }, typeof(ExampleTuple)); diff --git a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs index b75e8ad9..3103f94f 100644 --- a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs @@ -63,9 +63,8 @@ namespace WixToolsetTest.CoreIntegration Assert.Equal(@"example.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); var example = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).Single(); - Assert.Null(example.Id?.Id); - Assert.Equal("Foo", example[0].AsString()); - Assert.Equal("Bar", example[1].AsString()); + Assert.Equal("Foo", example.Id?.Id); + Assert.Equal("Bar", example[0].AsString()); } } diff --git a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs index c7af6439..0e740554 100644 --- a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs @@ -168,9 +168,8 @@ namespace WixToolsetTest.CoreIntegration Assert.Equal(@"example.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); var example = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).Single(); - Assert.Null(example.Id?.Id); - Assert.Equal("Foo", example[0].AsString()); - Assert.Equal("Bar", example[1].AsString()); + Assert.Equal("Foo", example.Id?.Id); + Assert.Equal("Bar", example[0].AsString()); } } @@ -232,9 +231,8 @@ namespace WixToolsetTest.CoreIntegration Assert.Equal(@"other.txt", fileTuples[1][FileTupleFields.Source].PreviousValue.AsPath().Path); var examples = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).ToArray(); - Assert.Equal(new string[] { null, null }, examples.Select(t => t.Id?.Id).ToArray()); - Assert.Equal(new[] { "Foo", "Other" }, examples.Select(t => t.AsString(0)).ToArray()); - Assert.Equal(new[] { "Bar", "Value" }, examples.Select(t => t[1].AsString()).ToArray()); + Assert.Equal(new string[] { "Foo", "Other" }, examples.Select(t => t.Id?.Id).ToArray()); + Assert.Equal(new[] { "Bar", "Value" }, examples.Select(t => t[0].AsString()).ToArray()); } } } -- cgit v1.2.3-55-g6feb