From be163ecb92398a8d569a7e97aaf25bc7e5fb9eec Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 29 Dec 2017 03:57:03 -0800 Subject: Move to WixBuildTools.TestSupport --- .../ExtensionFixture.cs | 30 +++++++++++++++------- 1 file changed, 21 insertions(+), 9 deletions(-) (limited to 'src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs') diff --git a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs index 3714f9e7..5de61368 100644 --- a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs @@ -6,14 +6,27 @@ namespace WixToolsetTest.CoreIntegration using System.IO; using System.Linq; using Example.Extension; + using WixBuildTools.TestSupport; using WixToolset.Core; using WixToolset.Data; using WixToolset.Data.Tuples; - using WixToolsetTest.CoreIntegration.Utility; using Xunit; public class ExtensionFixture { + [Fact] + public void CanBuildAndQuery() + { + var folder = TestData.Get(@"TestData\ExampleExtension"); + var build = new Builder(folder, typeof(ExampleExtensionFactory), new[] { Path.Combine(folder, "data") }); + + var results = build.BuildAndQuery(Build, "Example"); + Assert.Equal(new[] + { + "Example:Foo\tBar" + }, results); + } + [Fact] public void CanBuildWithExampleExtension() { @@ -83,21 +96,20 @@ namespace WixToolsetTest.CoreIntegration Assert.Equal(0, result); - Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\extest.msi"))); - Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\extest.wixpdb"))); - Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\MsiPackage\example.txt"))); - var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\extest.wir")); var section = intermediate.Sections.Single(); - var wixFile = section.Tuples.OfType().Single(); - Assert.Equal(Path.Combine(folder, @"data\example.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path); - Assert.Equal(@"example.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); - var property = section.Tuples.OfType().Where(p => p.Id.Id == "ExampleProperty").Single(); Assert.Equal("ExampleProperty", property.Property); Assert.Equal("test", property.Value); } } + + private static void Build(string[] args) + { + var program = new Program(); + var result = program.Run(new WixToolsetServiceProvider(), null, args); + Assert.Equal(0, result); + } } } -- cgit v1.2.3-55-g6feb