Port the rest of the FailureTests from the old repo.

6 files changed, 369 insertions, 0 deletions

diff --git a/src/TestData/FailureTests/BundleB/Bundle.wxs b/src/TestData/FailureTests/BundleB/Bundle.wxs
new file mode 100644
index 00000000..ea3d029e
--- /dev/null
+++ b/src/TestData/FailureTests/BundleB/Bundle.wxs
@@ -0,0 +1,26 @@
+<!-- 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. -->
+
+<?ifndef Version?>
+<?define Version = 1.0.0.0?>
+<?endif?>
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
+    <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
+
+    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
+
+    <!-- ParallelCache="yes" should be the only thing different from the template -->
+    <Chain ParallelCache="yes">
+      <PackageGroupRef Id="TestBA" />
+
+      <PackageGroupRef Id="BundlePackages" />
+    </Chain>
+  </Bundle>
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
+      <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/FailureTests/BundleB/BundleB.wixproj b/src/TestData/FailureTests/BundleB/BundleB.wixproj
new file mode 100644
index 00000000..6d36d120
--- /dev/null
+++ b/src/TestData/FailureTests/BundleB/BundleB.wixproj
@@ -0,0 +1,16 @@
+<!-- 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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <UpgradeCode>{C60B9483-CE87-4FDA-AE5A-B39A52E956E8}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
+    <ProjectReference Include="..\PackageB\PackageB.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/FailureTests/BundleC/BundleC.wixproj b/src/TestData/FailureTests/BundleC/BundleC.wixproj
new file mode 100644
index 00000000..03f611fc
--- /dev/null
+++ b/src/TestData/FailureTests/BundleC/BundleC.wixproj
@@ -0,0 +1,19 @@
+<!-- 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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <UpgradeCode>{9E9964D0-2120-4358-8136-D4A8727E0C59}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
+    <ProjectReference Include="..\PackageB\PackageB.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/FailureTests/BundleC/BundleC.wxs b/src/TestData/FailureTests/BundleC/BundleC.wxs
new file mode 100644
index 00000000..48c4ab72
--- /dev/null
+++ b/src/TestData/FailureTests/BundleC/BundleC.wxs
@@ -0,0 +1,11 @@
+<!-- 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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" Name="MissingNonVital.msi" Vital="no" Compressed="no" />
+      <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/WixTestTools/LogVerifier.cs b/src/WixTestTools/LogVerifier.cs
new file mode 100644
index 00000000..0252a9f9
--- /dev/null
+++ b/src/WixTestTools/LogVerifier.cs
@@ -0,0 +1,252 @@
+// 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 WixTestTools
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Text.RegularExpressions;
+    using Xunit;
+
+    /// <summary>
+    /// The LogVerifier can verify a log file for given regular expressions.
+    /// </summary>
+    public class LogVerifier
+    {
+        // Member Variables
+        private string logFile;
+
+        /// <summary>
+        /// Prevent creation of LogVerifier without log file
+        /// </summary>
+        private LogVerifier()
+        { }
+
+        /// <summary>
+        /// Constructor for log files where the exact file name is known.
+        /// </summary>
+        /// <param name="fileName">The full path to the log file</param>
+        public LogVerifier(string fileName)
+        {
+            if (null == fileName)
+                throw new ArgumentNullException("fileName");
+
+            if (!File.Exists(fileName))
+                throw new ArgumentException(String.Format(@"File doesn't exist:{0}", fileName), "fileName");
+
+            logFile = fileName;
+        }
+
+        /// <summary>
+        /// Constructor for log files where the exact file name is known.
+        /// </summary>
+        /// <param name="directory">The directory in which the log file is located.</param>
+        /// <param name="fileName">The name of the log file.</param>
+        public LogVerifier(string directory, string fileName)
+            : this(Path.Combine(directory, fileName))
+        { }
+
+        /// <summary>
+        /// Scans a log file line by line until the regex pattern is matched or eof is reached.
+        /// This method would be used in the case where the log file is very large, the regex doesn't
+        /// span multiple lines, and only one match is required.
+        /// </summary>
+        /// <param name="regex">A regular expression</param>
+        /// <returns>True if a match is found, False otherwise.</returns>
+        public bool LineByLine(Regex regex)
+        {
+            string line = string.Empty;
+            StreamReader sr = new StreamReader(logFile);
+
+            // Read from a file stream line by line.
+            while ((line = sr.ReadLine()) != null)
+            {
+                if (regex.Match(line).Success)
+                {
+                    sr.Close();
+                    sr.Dispose();
+                    return true;
+                }
+            }
+            return false;
+        }
+
+
+        /// <summary>
+        /// Scans a log file line by line until the regex pattern is matched or eof is reached.
+        /// This method would be used in the case where the log file is very large, the regex doesn't
+        /// span multiple lines, and only one match is required.
+        /// No RegexOptions are used and matches are case sensitive.
+        /// </summary>
+        /// <param name="regex">A regular expression string.</param>
+        /// <returns>True if a match is found, False otherwise.</returns>
+        public bool LineByLine(string regex)
+        {
+            return LineByLine(new Regex(regex));
+        }
+
+
+        /// <summary>
+        /// Scans a log file for matches to the regex.
+        /// </summary>
+        /// <param name="regex">A regular expression</param>
+        /// <returns>The number of matches</returns>
+        public int EntireFileAtOnce(Regex regex)
+        {
+            string logFileText = this.ReadLogFile();
+            return regex.Matches(logFileText).Count;
+        }
+
+        /// <summary>
+        /// Scans a log file for matches to the regex.
+        /// </summary>
+        /// <param name="regex">A regular expression</param>
+        /// <returns>The number of matches</returns>
+        public bool EntireFileAtOncestr(string regex)
+        {
+            string logFileText = this.ReadLogFile();
+            return logFileText.Contains(regex);
+        }
+        /// <summary>
+        /// Scans a log file for matches to the regex string.
+        /// Only the Multiline RegexOption is used and matches are case sensitive.
+        /// </summary>
+        /// <param name="regex">A regular expression</param>
+        /// <returns>The number of matches</returns>
+        public int EntireFileAtOnce(string regex)
+        {
+            return EntireFileAtOnce(new Regex(regex, RegexOptions.Multiline));
+        }
+
+        /// <summary>
+        /// Scans a log file for matches to the regex string.
+        /// </summary>
+        /// <param name="regex">A regular expression</param>
+        /// <param name="ignoreCase">Specify whether to perform case sensitive matches</param>
+        /// <returns>The number of matches</returns>
+        public int EntireFileAtOnce(string regex, bool ignoreCase)
+        {
+            if (!ignoreCase)
+                return EntireFileAtOnce(new Regex(regex, RegexOptions.Multiline));
+            else
+                return EntireFileAtOnce(new Regex(regex, RegexOptions.Multiline | RegexOptions.IgnoreCase));
+        }
+
+        /// <summary>
+        /// Search through the log and Assert.Fail() if a specified string is not found.
+        /// </summary>
+        /// <param name="regex">Search expression</param>
+        /// <param name="ignoreCase">Perform case insensitive match</param>
+        public void AssertTextInLog(string regex, bool ignoreCase)
+        {
+            Assert.True(EntireFileAtOncestr(regex),
+                String.Format("The log does not contain a match to the regular expression \"{0}\" ", regex));
+        }
+
+        /// <summary>
+        /// Search through the log and Assert.Fail() if a specified string is not found.
+        /// </summary>
+        /// <param name="regex">Search expression</param>
+        /// <param name="ignoreCase">Perform case insensitive match</param>
+        public void AssertTextInLog(Regex regex, bool ignoreCase)
+        {
+            Assert.True(EntireFileAtOnce(regex) >= 1,
+                String.Format("The log does not contain a match to the regular expression \"{0}\" ", regex.ToString()));
+        }
+
+        /// <summary>
+        /// Search through the log and Assert.Fail() if a specified string is not found.
+        /// </summary>
+        /// <param name="regex">Search expression</param>
+        /// <param name="ignoreCase">Perform case insensitive match</param>
+        public void AssertTextInLog(string regex)
+        {
+            AssertTextInLog(regex, true);
+        }
+
+        /// <summary>
+        /// Search through the log and Assert.Fail() if a specified string is not found.
+        /// </summary>
+        /// <param name="regex">Search expression</param>
+        /// <param name="ignoreCase">Perform case insensitive match</param>
+        public void AssertTextInLog(Regex regex)
+        {
+            AssertTextInLog(regex, true);
+        }
+
+
+        /// <summary>
+        /// Search through the log and Assert.Fail() if a specified string is  found.
+        /// </summary>
+        /// <param name="regex">Search expression</param>
+        /// <param name="ignoreCase">Perform case insensitive match</param>
+        public void AssertTextNotInLog(Regex regex, bool ignoreCase)
+        {
+            Assert.True(EntireFileAtOnce(regex) < 1,
+                String.Format("The log contain a match to the regular expression \"{0}\" ", regex.ToString()));
+        }
+
+        /// <summary>
+        /// Search through the log and Assert.Fail() if a specified string is not found.
+        /// </summary>
+        /// <param name="regex">Search expression</param>
+        /// <param name="ignoreCase">Perform case insensitive match</param>
+        public void AssertTextNotInLog(string regex, bool ignoreCase)
+        {
+            Assert.False(EntireFileAtOncestr(regex),
+                String.Format("The log does not contain a match to the regular expression \"{0}\" ", regex));
+        }
+
+        /// <summary>
+        /// Checks if a meesage is in a file
+        /// </summary>
+        /// <param name="logFileName">The full path to the log file</param>
+        /// <param name="message">Search expression</param>
+        /// <returns>True if the message was found, false otherwise</returns>
+        public static bool MessageInLogFile(string logFileName, string message)
+        {
+            LogVerifier logVerifier = new LogVerifier(logFileName);
+            return logVerifier.EntireFileAtOncestr(message);
+        }
+
+        /// <summary>
+        /// Checks if a meesage is in a file
+        /// </summary>
+        /// <param name="logFileName">The full path to the log file</param>
+        /// <param name="message">Search expression (regex)</param>
+        /// <returns>True if the message was found, false otherwise</returns>
+        public static bool MessageInLogFileRegex(string logFileName, string regexMessage)
+        {
+            LogVerifier logVerifier = new LogVerifier(logFileName);
+            return logVerifier.EntireFileAtOnce(regexMessage) > 0;
+        }
+
+        /// <summary>
+        /// Read in the entire log file at once.
+        /// </summary>
+        /// <returns>Contents of log file.</returns>
+        private string ReadLogFile()
+        {
+            // Retry a few times.
+            for (int retry = 0; ; ++retry)
+            {
+                try
+                {
+                    using (StreamReader sr = new StreamReader(this.logFile))
+                    {
+                        return sr.ReadToEnd();
+                    }
+                }
+                catch // we'll catch everything a few times until we give up.
+                {
+                    if (retry > 4)
+                    {
+                        throw;
+                    }
+
+                    System.Threading.Thread.Sleep(1000);
+                }
+            }
+        }
+    }
+}
diff --git a/src/WixToolsetTest.BurnE2E/FailureTests.cs b/src/WixToolsetTest.BurnE2E/FailureTests.cs
index bc505527..a11a5eb6 100644
--- a/src/WixToolsetTest.BurnE2E/FailureTests.cs
+++ b/src/WixToolsetTest.BurnE2E/FailureTests.cs
@@ -63,5 +63,50 @@ namespace WixToolsetTest.BurnE2E
             packageA.VerifyInstalled(false);
             packageB.VerifyInstalled(false);
         }
+
+        [Fact(Skip = "https://github.com/wixtoolset/issues/issues/5750")]
+        public void CanCancelExecuteWhileCaching()
+        {
+            var packageA = this.CreatePackageInstaller("PackageA");
+            var packageB = this.CreatePackageInstaller("PackageB");
+            var bundleB = this.CreateBundleInstaller("BundleB");
+            var testBAController = this.CreateTestBAController();
+
+            // Slow the caching of package B to ensure that package A starts installing and cancels.
+            testBAController.SetPackageCancelExecuteAtProgress("PackageA", 50);
+            testBAController.SetPackageSlowCache("PackageB", 2000);
+
+            bundleB.Install((int)MSIExec.MSIExecReturnCode.ERROR_INSTALL_USEREXIT);
+            bundleB.VerifyUnregisteredAndRemovedFromPackageCache();
+
+            packageA.VerifyInstalled(false);
+            packageB.VerifyInstalled(false);
+        }
+
+        /// <summary>
+        /// BundleC has non-vital PackageA and vital PackageB.
+        /// PackageA is not compressed in the bundle and has a Name different from the source file. The Name points to a file that does not exist.
+        /// BundleC should be able to install successfully by ignoring the missing PackageA and installing PackageB.
+        /// </summary>
+        [Fact]
+        public void CanInstallWhenMissingNonVitalPackage()
+        {
+            var packageA = this.CreatePackageInstaller("PackageA");
+            var packageB = this.CreatePackageInstaller("PackageB");
+            var bundleC = this.CreateBundleInstaller("BundleC");
+
+            var bundleCInstallLogFilePath = bundleC.Install();
+            bundleC.VerifyRegisteredAndInPackageCache();
+            Assert.True(LogVerifier.MessageInLogFileRegex(bundleCInstallLogFilePath, "Skipping apply of package: PackageA due to cache error: 0x80070002. Continuing..."));
+
+            packageA.VerifyInstalled(false);
+            packageB.VerifyInstalled(true);
+
+            bundleC.Uninstall();
+            bundleC.VerifyUnregisteredAndRemovedFromPackageCache();
+
+            packageA.VerifyInstalled(false);
+            packageB.VerifyInstalled(false);
+        }
     }
 }