1 files changed, 57 insertions, 2 deletions

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<string> SearchPatterns { get; } = new List<string>();
 
+            public string SettingFile1 { get; set; }
+
             public int Execute(out List<string> messages)
             {
                 var argList = new List<string>();
+
                 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);