From 8cf0427984a88b0b3ddfb2061e5be721afffe82e Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 22 Apr 2021 17:19:56 -0700 Subject: Move Core into wix --- .../PreprocessorFixture.cs | 181 --------------------- 1 file changed, 181 deletions(-) delete mode 100644 src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs (limited to 'src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs') diff --git a/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs b/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs deleted file mode 100644 index ae8a1bcc..00000000 --- a/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs +++ /dev/null @@ -1,181 +0,0 @@ -// 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 WixToolsetTest.CoreIntegration -{ - using System.IO; - using System.Linq; - using WixBuildTools.TestSupport; - using WixToolset.Core; - using WixToolset.Core.TestPackage; - using WixToolset.Data; - using WixToolset.Data.Symbols; - using WixToolset.Extensibility.Data; - using WixToolset.Extensibility.Services; - using Xunit; - - public class PreprocessorFixture - { - [Fact] - public void PreprocessDirectly() - { - var folder = TestData.Get(@"TestData\IncludePath"); - var sourcePath = Path.Combine(folder, "Package.wxs"); - var includeFolder = Path.Combine(folder, "data"); - var includeFile = Path.Combine(includeFolder, "Package.wxi"); - - var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider(); - - var context = serviceProvider.GetService(); - context.SourcePath = sourcePath; - context.IncludeSearchPaths = new[] { includeFolder }; - - var preprocessor = serviceProvider.GetService(); - var result = preprocessor.Preprocess(context); - - var includedFile = result.IncludedFiles.Single(); - Assert.NotNull(result.Document); - Assert.Equal(includeFile, includedFile.Path); - Assert.Equal(sourcePath, includedFile.SourceLineNumbers.FileName); - Assert.Equal(1, includedFile.SourceLineNumbers.LineNumber.Value); - Assert.Equal($"{sourcePath}*1", includedFile.SourceLineNumbers.QualifiedFileName); - Assert.Null(includedFile.SourceLineNumbers.Parent); - } - - [Fact] - public void IncludeSourceLineNumbersPreserved() - { - var folder = TestData.Get(@"TestData\IncludePath"); - - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var result = WixRunner.Execute(warningsAsErrors: false, new[] - { - "build", - Path.Combine(folder, "Package.wxs"), - Path.Combine(folder, "PackageComponents.wxs"), - "-loc", Path.Combine(folder, "Package.en-us.wxl"), - "-includepath", Path.Combine(folder, "data"), - "-bindpath", Path.Combine(folder, "data"), - "-intermediateFolder", intermediateFolder, - "-o", Path.Combine(baseFolder, @"bin\test.msi") - }); - - result.AssertSuccess(); - - using (var output = WixOutput.Read(Path.Combine(baseFolder, @"bin\test.wixpdb"))) - { - var intermediate = Intermediate.Load(output); - var component = intermediate.Sections.Single().Symbols.OfType().Single(); - Assert.Equal(3, component.SourceLineNumbers.LineNumber); - Assert.Equal(5, component.SourceLineNumbers.Parent.LineNumber); - - var encoded = component.SourceLineNumbers.GetEncoded(); - var decoded = SourceLineNumber.CreateFromEncoded(encoded); - Assert.Equal(3, decoded.LineNumber); - Assert.Equal(5, decoded.Parent.LineNumber); - } - } - } - - [Fact] - /// - /// This test will fail on 32-bit operating systems because it depends on "CommonProgramFiles(x86)" - /// which is only defined on 64-bit Windows. - /// - public void SupportParensInEnvironmentVariables() - { - var folder = TestData.Get(@"TestData", "Preprocessor"); - - var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider(); - var context = serviceProvider.GetService(); - context.SourcePath = Path.Combine(folder, "EnvParens.wxs"); - - var preprocessor = serviceProvider.GetService(); - var result = preprocessor.Preprocess(context); - Assert.NotNull(result.Document); - } - - [Fact] - public void VariableRedefinitionIsAWarning() - { - var folder = TestData.Get(@"TestData\Variables"); - - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var result = WixRunner.Execute(warningsAsErrors: false, new[] - { - "build", - Path.Combine(folder, "Package.wxs"), - Path.Combine(folder, "PackageComponents.wxs"), - "-loc", Path.Combine(folder, "Package.en-us.wxl"), - "-bindpath", Path.Combine(folder, "data"), - "-intermediateFolder", intermediateFolder, - "-o", Path.Combine(baseFolder, @"bin\test.msi") - }); - - result.AssertSuccess(); - - var warning = result.Messages.Where(message => message.Id == (int)WarningMessages.Ids.VariableDeclarationCollision); - Assert.Single(warning); - } - } - - [Fact] - public void ForEachLoopsWork() - { - var folder = TestData.Get(@"TestData\ForEach"); - - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var result = WixRunner.Execute(new[] - { - "build", - Path.Combine(folder, "Package.wxs"), - Path.Combine(folder, "PackageComponents.wxs"), - "-loc", Path.Combine(folder, "Package.en-us.wxl"), - "-bindpath", Path.Combine(folder, "data"), - "-intermediateFolder", intermediateFolder, - "-o", Path.Combine(baseFolder, @"bin\test.msi") - }); - - result.AssertSuccess(); - } - } - - [Fact] - public void NonterminatedPreprocessorInstructionShowsSourceLineNumber() - { - var folder = TestData.Get(@"TestData\BadIf"); - - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var result = WixRunner.Execute(new[] - { - "build", - Path.Combine(folder, "Package.wxs"), - Path.Combine(folder, "PackageComponents.wxs"), - "-loc", Path.Combine(folder, "Package.en-us.wxl"), - "-bindpath", Path.Combine(folder, "data"), - "-intermediateFolder", intermediateFolder, - "-o", Path.Combine(baseFolder, @"bin\test.msi") - }); - - Assert.Equal(147, result.ExitCode); - Assert.StartsWith("Found a ", result.Messages.Single().ToString()); - } - } - } -} - -- cgit v1.2.3-55-g6feb