1 files changed, 94 insertions, 0 deletions

diff --git a/src/test/WixToolsetTest.WixCop/WixCopFixture.cs b/src/test/WixToolsetTest.WixCop/WixCopFixture.cs
index 9877f9c8..207782b7 100644
--- a/src/test/WixToolsetTest.WixCop/WixCopFixture.cs
+++ b/src/test/WixToolsetTest.WixCop/WixCopFixture.cs
@@ -3,6 +3,7 @@
 namespace WixToolsetTest.WixCop
 {
     using System.IO;
+    using System.Linq;
     using WixBuildTools.TestSupport;
     using Xunit;
 
@@ -99,5 +100,98 @@ namespace WixToolsetTest.WixCop
                 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);
+            }
+        }
     }
 }