From f6a736c4cbb800904c216ce5730ab02ab7fd4373 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Mon, 1 Oct 2018 15:52:53 -0400 Subject: Add failing test for wixtoolset/issues#5883. --- .../Preprocessor/ConvertedPreprocessor.wxs | 62 +++++++++++++++++++++ .../wixcop/TestData/Preprocessor/Preprocessor.wxs | 63 ++++++++++++++++++++++ .../TestData/Preprocessor/wixcop.settings.xml | 9 ++++ src/test/wixcop/WixCopFixture.cs | 59 +++++++++++++++++++- src/test/wixcop/WixCopTests.csproj | 11 ++-- 5 files changed, 196 insertions(+), 8 deletions(-) create mode 100644 src/test/wixcop/TestData/Preprocessor/ConvertedPreprocessor.wxs create mode 100644 src/test/wixcop/TestData/Preprocessor/Preprocessor.wxs create mode 100644 src/test/wixcop/TestData/Preprocessor/wixcop.settings.xml (limited to 'src') diff --git a/src/test/wixcop/TestData/Preprocessor/ConvertedPreprocessor.wxs b/src/test/wixcop/TestData/Preprocessor/ConvertedPreprocessor.wxs new file mode 100644 index 00000000..d6280185 --- /dev/null +++ b/src/test/wixcop/TestData/Preprocessor/ConvertedPreprocessor.wxs @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/wixcop/TestData/Preprocessor/Preprocessor.wxs b/src/test/wixcop/TestData/Preprocessor/Preprocessor.wxs new file mode 100644 index 00000000..2eb908c2 --- /dev/null +++ b/src/test/wixcop/TestData/Preprocessor/Preprocessor.wxs @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/wixcop/TestData/Preprocessor/wixcop.settings.xml b/src/test/wixcop/TestData/Preprocessor/wixcop.settings.xml new file mode 100644 index 00000000..9d3ad496 --- /dev/null +++ b/src/test/wixcop/TestData/Preprocessor/wixcop.settings.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/test/wixcop/WixCopFixture.cs b/src/test/wixcop/WixCopFixture.cs index d11865f1..1fa49be9 100644 --- a/src/test/wixcop/WixCopFixture.cs +++ b/src/test/wixcop/WixCopFixture.cs @@ -15,7 +15,7 @@ namespace WixCopTests { public class WixCopFixture { - [Fact(Skip = "Problematic at the moment.")] + [Fact] public void CanConvertSingleFile() { const string beforeFileName = "SingleFile.wxs"; @@ -38,7 +38,53 @@ namespace WixCopTests }; var result = runner.Execute(out var messages); - + + Assert.Equal(2, result); + + var actualLines = File.ReadAllLines(targetFile); + var expectedLines = File.ReadAllLines(Path.Combine(folder, afterFileName)); + Assert.Equal(expectedLines, actualLines); + + var runner2 = new WixCopRunner + { + FixErrors = true, + SearchPatterns = + { + targetFile, + }, + }; + + var result2 = runner2.Execute(out var messages2); + + Assert.Equal(0, result2); + } + } + + [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(out var messages); + Assert.Equal(2, result); var actualLines = File.ReadAllLines(targetFile); @@ -48,6 +94,7 @@ namespace WixCopTests var runner2 = new WixCopRunner { FixErrors = true, + SettingFile1 = Path.Combine(folder, "wixcop.settings.xml"), SearchPatterns = { targetFile, @@ -66,14 +113,22 @@ namespace WixCopTests public List SearchPatterns { get; } = new List(); + public string SettingFile1 { get; set; } + public int Execute(out List messages) { var argList = new List(); + if (this.FixErrors) { argList.Add("-f"); } + if (!String.IsNullOrEmpty(this.SettingFile1)) + { + argList.Add($"-set1{this.SettingFile1}"); + } + foreach (string searchPattern in this.SearchPatterns) { argList.Add(searchPattern); diff --git a/src/test/wixcop/WixCopTests.csproj b/src/test/wixcop/WixCopTests.csproj index 0ae50dc8..012ef4db 100644 --- a/src/test/wixcop/WixCopTests.csproj +++ b/src/test/wixcop/WixCopTests.csproj @@ -12,12 +12,11 @@ - - PreserveNewest - - - PreserveNewest - + + + + + -- cgit v1.2.3-55-g6feb