From 0ec925dbf8359629e6d4f71fb142118a05f07298 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 7 Jun 2020 08:14:46 -0700 Subject: Move WixCop to "wix.exe convert" command --- .../TestData/PermissionEx/v3.wxs | 27 --- .../TestData/PermissionEx/v4_expected.wxs | 27 --- .../Preprocessor/ConvertedPreprocessor.wxs | 62 ------ .../TestData/Preprocessor/Preprocessor.wxs | 63 ------ .../TestData/Preprocessor/wixcop.settings.xml | 9 - .../TestData/QtExec.bad/v3.wxs | 65 ------ .../TestData/QtExec.bad/v4_expected.wxs | 64 ------ .../WixToolsetTest.WixCop/TestData/QtExec/v3.wxs | 64 ------ .../TestData/QtExec/v4_expected.wxs | 63 ------ .../TestData/SingleFile/ConvertedSingleFile.wxs | 60 ----- .../TestData/SingleFile/SingleFile.wxs | 61 ------ src/test/WixToolsetTest.WixCop/WixCopFixture.cs | 242 --------------------- src/test/WixToolsetTest.WixCop/WixCopRunner.cs | 68 ------ .../WixToolsetTest.WixCop/WixCopRunnerResult.cs | 22 -- .../WixToolsetTest.WixCop.csproj | 51 ----- .../WixToolsetTest.WixCop.v3.ncrunchproject | 6 - 16 files changed, 954 deletions(-) delete mode 100644 src/test/WixToolsetTest.WixCop/TestData/PermissionEx/v3.wxs delete mode 100644 src/test/WixToolsetTest.WixCop/TestData/PermissionEx/v4_expected.wxs delete mode 100644 src/test/WixToolsetTest.WixCop/TestData/Preprocessor/ConvertedPreprocessor.wxs delete mode 100644 src/test/WixToolsetTest.WixCop/TestData/Preprocessor/Preprocessor.wxs delete mode 100644 src/test/WixToolsetTest.WixCop/TestData/Preprocessor/wixcop.settings.xml delete mode 100644 src/test/WixToolsetTest.WixCop/TestData/QtExec.bad/v3.wxs delete mode 100644 src/test/WixToolsetTest.WixCop/TestData/QtExec.bad/v4_expected.wxs delete mode 100644 src/test/WixToolsetTest.WixCop/TestData/QtExec/v3.wxs delete mode 100644 src/test/WixToolsetTest.WixCop/TestData/QtExec/v4_expected.wxs delete mode 100644 src/test/WixToolsetTest.WixCop/TestData/SingleFile/ConvertedSingleFile.wxs delete mode 100644 src/test/WixToolsetTest.WixCop/TestData/SingleFile/SingleFile.wxs delete mode 100644 src/test/WixToolsetTest.WixCop/WixCopFixture.cs delete mode 100644 src/test/WixToolsetTest.WixCop/WixCopRunner.cs delete mode 100644 src/test/WixToolsetTest.WixCop/WixCopRunnerResult.cs delete mode 100644 src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj delete mode 100644 src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.v3.ncrunchproject (limited to 'src/test') diff --git a/src/test/WixToolsetTest.WixCop/TestData/PermissionEx/v3.wxs b/src/test/WixToolsetTest.WixCop/TestData/PermissionEx/v3.wxs deleted file mode 100644 index 0e241544..00000000 --- a/src/test/WixToolsetTest.WixCop/TestData/PermissionEx/v3.wxs +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.WixCop/TestData/PermissionEx/v4_expected.wxs b/src/test/WixToolsetTest.WixCop/TestData/PermissionEx/v4_expected.wxs deleted file mode 100644 index 375b70d3..00000000 --- a/src/test/WixToolsetTest.WixCop/TestData/PermissionEx/v4_expected.wxs +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/ConvertedPreprocessor.wxs b/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/ConvertedPreprocessor.wxs deleted file mode 100644 index dcd43e35..00000000 --- a/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/ConvertedPreprocessor.wxs +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/Preprocessor.wxs b/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/Preprocessor.wxs deleted file mode 100644 index 2eb908c2..00000000 --- a/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/Preprocessor.wxs +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/wixcop.settings.xml b/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/wixcop.settings.xml deleted file mode 100644 index 9d3ad496..00000000 --- a/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/wixcop.settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/test/WixToolsetTest.WixCop/TestData/QtExec.bad/v3.wxs b/src/test/WixToolsetTest.WixCop/TestData/QtExec.bad/v3.wxs deleted file mode 100644 index b0630f65..00000000 --- a/src/test/WixToolsetTest.WixCop/TestData/QtExec.bad/v3.wxs +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.WixCop/TestData/QtExec.bad/v4_expected.wxs b/src/test/WixToolsetTest.WixCop/TestData/QtExec.bad/v4_expected.wxs deleted file mode 100644 index b28c94e4..00000000 --- a/src/test/WixToolsetTest.WixCop/TestData/QtExec.bad/v4_expected.wxs +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.WixCop/TestData/QtExec/v3.wxs b/src/test/WixToolsetTest.WixCop/TestData/QtExec/v3.wxs deleted file mode 100644 index 8d81a758..00000000 --- a/src/test/WixToolsetTest.WixCop/TestData/QtExec/v3.wxs +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.WixCop/TestData/QtExec/v4_expected.wxs b/src/test/WixToolsetTest.WixCop/TestData/QtExec/v4_expected.wxs deleted file mode 100644 index 99cc2151..00000000 --- a/src/test/WixToolsetTest.WixCop/TestData/QtExec/v4_expected.wxs +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.WixCop/TestData/SingleFile/ConvertedSingleFile.wxs b/src/test/WixToolsetTest.WixCop/TestData/SingleFile/ConvertedSingleFile.wxs deleted file mode 100644 index aacb68fa..00000000 --- a/src/test/WixToolsetTest.WixCop/TestData/SingleFile/ConvertedSingleFile.wxs +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.WixCop/TestData/SingleFile/SingleFile.wxs b/src/test/WixToolsetTest.WixCop/TestData/SingleFile/SingleFile.wxs deleted file mode 100644 index 310ae811..00000000 --- a/src/test/WixToolsetTest.WixCop/TestData/SingleFile/SingleFile.wxs +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.WixCop/WixCopFixture.cs b/src/test/WixToolsetTest.WixCop/WixCopFixture.cs deleted file mode 100644 index 72a36dd6..00000000 --- a/src/test/WixToolsetTest.WixCop/WixCopFixture.cs +++ /dev/null @@ -1,242 +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.WixCop -{ - using System.IO; - using System.Linq; - using WixBuildTools.TestSupport; - using Xunit; - - public class WixCopFixture - { - [Fact] - public void CanConvertPermissionExFile() - { - const string beforeFileName = "v3.wxs"; - const string afterFileName = "v4_expected.wxs"; - var folder = TestData.Get(@"TestData\PermissionEx"); - - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(true); - var targetFile = Path.Combine(baseFolder, beforeFileName); - File.Copy(Path.Combine(folder, beforeFileName), Path.Combine(baseFolder, beforeFileName)); - - var runner = new WixCopRunner - { - FixErrors = true, - SearchPatterns = - { - targetFile, - }, - }; - - var result = runner.Execute(); - - Assert.Equal(2, result.ExitCode); - - var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n"); - var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n"); - Assert.Equal(expected, actual); - - var runner2 = new WixCopRunner - { - FixErrors = true, - SearchPatterns = - { - targetFile, - }, - }; - - var result2 = runner2.Execute(); - - Assert.Equal(0, result2.ExitCode); - } - } - - [Fact] - public void CanConvertSingleFile() - { - const string beforeFileName = "SingleFile.wxs"; - const string afterFileName = "ConvertedSingleFile.wxs"; - var folder = TestData.Get(@"TestData\SingleFile"); - - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(true); - var targetFile = Path.Combine(baseFolder, beforeFileName); - File.Copy(Path.Combine(folder, beforeFileName), Path.Combine(baseFolder, beforeFileName)); - - var runner = new WixCopRunner - { - FixErrors = true, - SearchPatterns = - { - targetFile, - }, - }; - - var result = runner.Execute(); - - Assert.Equal(2, result.ExitCode); - - var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n"); - var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n"); - Assert.Equal(expected, actual); - - var runner2 = new WixCopRunner - { - FixErrors = true, - SearchPatterns = - { - targetFile, - }, - }; - - var result2 = runner2.Execute(); - - Assert.Equal(0, result2.ExitCode); - } - } - - [Fact] - public void RetainsPreprocessorInstructions() - { - const string beforeFileName = "Preprocessor.wxs"; - const string afterFileName = "ConvertedPreprocessor.wxs"; - var folder = TestData.Get(@"TestData\Preprocessor"); - - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(true); - var targetFile = Path.Combine(baseFolder, beforeFileName); - File.Copy(Path.Combine(folder, beforeFileName), Path.Combine(baseFolder, beforeFileName)); - - var runner = new WixCopRunner - { - FixErrors = true, - SettingFile1 = Path.Combine(folder, "wixcop.settings.xml"), - SearchPatterns = - { - targetFile, - }, - }; - - var result = runner.Execute(); - - Assert.Equal(2, result.ExitCode); - - var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n"); - var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n"); - Assert.Equal(expected, actual); - - var runner2 = new WixCopRunner - { - FixErrors = true, - SettingFile1 = Path.Combine(folder, "wixcop.settings.xml"), - SearchPatterns = - { - targetFile, - }, - }; - - var result2 = runner2.Execute(); - - Assert.Equal(0, result2.ExitCode); - } - } - - [Fact] - public void CanConvertQtExec() - { - const string beforeFileName = "v3.wxs"; - const string afterFileName = "v4_expected.wxs"; - var folder = TestData.Get(@"TestData\QtExec"); - - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(true); - var targetFile = Path.Combine(baseFolder, beforeFileName); - File.Copy(Path.Combine(folder, beforeFileName), Path.Combine(baseFolder, beforeFileName)); - - var runner = new WixCopRunner - { - FixErrors = true, - SearchPatterns = - { - targetFile, - }, - }; - - var result = runner.Execute(); - - Assert.Equal(2, result.ExitCode); - - var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n"); - var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n"); - Assert.Equal(expected, actual); - - var runner2 = new WixCopRunner - { - FixErrors = true, - SearchPatterns = - { - targetFile, - }, - }; - - var result2 = runner2.Execute(); - - Assert.Equal(0, result2.ExitCode); - } - } - - [Fact] - public void DetectUnconvertableQtExecCmdTimeout() - { - const string beforeFileName = "v3.wxs"; - const string afterFileName = "v4_expected.wxs"; - var folder = TestData.Get(@"TestData\QtExec.bad"); - - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(true); - var targetFile = Path.Combine(baseFolder, beforeFileName); - File.Copy(Path.Combine(folder, beforeFileName), Path.Combine(baseFolder, beforeFileName)); - - var runner = new WixCopRunner - { - FixErrors = true, - SearchPatterns = - { - targetFile, - }, - }; - - var result = runner.Execute(); - - Assert.Equal(2, result.ExitCode); - - Assert.Single(result.Messages.Where(message => message.ToString().EndsWith("(QtExecCmdTimeoutAmbiguous)"))); - - var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n"); - var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n"); - Assert.Equal(expected, actual); - - // still fails because QtExecCmdTimeoutAmbiguous is unfixable - var runner2 = new WixCopRunner - { - FixErrors = true, - SearchPatterns = - { - targetFile, - }, - }; - - var result2 = runner2.Execute(); - - Assert.Equal(2, result2.ExitCode); - } - } - } -} diff --git a/src/test/WixToolsetTest.WixCop/WixCopRunner.cs b/src/test/WixToolsetTest.WixCop/WixCopRunner.cs deleted file mode 100644 index d2a0abbe..00000000 --- a/src/test/WixToolsetTest.WixCop/WixCopRunner.cs +++ /dev/null @@ -1,68 +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.WixCop -{ - using System; - using System.Collections.Generic; - using WixToolset.Core; - using WixToolset.Core.TestPackage; - using WixToolset.Extensibility; - using WixToolset.Extensibility.Services; - using WixToolset.Tools.WixCop; - using WixToolset.Tools.WixCop.CommandLine; - using WixToolset.Tools.WixCop.Interfaces; - - public class WixCopRunner - { - public bool FixErrors { get; set; } - - public List SearchPatterns { get; } = new List(); - - public string SettingFile1 { get; set; } - - public WixCopRunnerResult Execute() - { - var argList = new List(); - - if (this.FixErrors) - { - argList.Add("-f"); - } - - if (!String.IsNullOrEmpty(this.SettingFile1)) - { - argList.Add($"-set1{this.SettingFile1}"); - } - - foreach (var searchPattern in this.SearchPatterns) - { - argList.Add(searchPattern); - } - - return WixCopRunner.Execute(argList.ToArray()); - } - - public static WixCopRunnerResult Execute(string[] args) - { - var listener = new TestMessageListener(); - - var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider(); - serviceProvider.AddService((x, y) => listener); - serviceProvider.AddService((x, y) => new WixCopCommandLineParser(x)); - - var exitCode = Execute(serviceProvider, args); - - return new WixCopRunnerResult - { - ExitCode = exitCode, - Messages = listener.Messages.ToArray() - }; - } - - public static int Execute(IWixToolsetServiceProvider serviceProvider, string[] args) - { - var wixcop = new Program(); - return wixcop.Run(serviceProvider, args); - } - } -} diff --git a/src/test/WixToolsetTest.WixCop/WixCopRunnerResult.cs b/src/test/WixToolsetTest.WixCop/WixCopRunnerResult.cs deleted file mode 100644 index 1b35e491..00000000 --- a/src/test/WixToolsetTest.WixCop/WixCopRunnerResult.cs +++ /dev/null @@ -1,22 +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.WixCop -{ - using System; - using System.Linq; - using WixToolset.Data; - using Xunit; - - public class WixCopRunnerResult - { - public int ExitCode { get; set; } - - public Message[] Messages { get; set; } - - public WixCopRunnerResult AssertSuccess() - { - Assert.True(0 == this.ExitCode, $"WixCop failed unexpectedly. Output:\r\n{String.Join("\r\n", this.Messages.Select(m => m.ToString()).ToArray())}"); - return this; - } - } -} diff --git a/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj b/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj deleted file mode 100644 index 3ea4dae5..00000000 --- a/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - net461 - false - embedded - win-x86 - - - - NU1603 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.v3.ncrunchproject b/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.v3.ncrunchproject deleted file mode 100644 index 8f3624cb..00000000 --- a/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.v3.ncrunchproject +++ /dev/null @@ -1,6 +0,0 @@ - - - True - - - \ No newline at end of file -- cgit v1.2.3-55-g6feb