Add more burn E2E tests.

Fix bug where first splash screen wasn't closed.
Fix bug where billboard only started the first time.
Fix bug where the restart status was lost when the exit code was an error.
Fix bug where the hash byte array length was compared to the hash string length (string is twice as long).
Fix bug where Burn didn't give update hash if the first byte was 0.

9 files changed, 186 insertions, 3 deletions

diff --git a/src/test/burn/TestData/ExePackageTests/CustomExitCodeExePackage/CustomExitCodeExePackage.wixproj b/src/test/burn/TestData/ExePackageTests/CustomExitCodeExePackage/CustomExitCodeExePackage.wixproj
new file mode 100644
index 00000000..403f3320
--- /dev/null
+++ b/src/test/burn/TestData/ExePackageTests/CustomExitCodeExePackage/CustomExitCodeExePackage.wixproj
@@ -0,0 +1,17 @@
+<!-- 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>{9BB4F6D3-4EE3-40BF-879F-90E78440EAE8}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.NetFx.wixext" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/ExePackageTests/CustomExitCodeExePackage/CustomExitCodeExePackage.wxs b/src/test/burn/TestData/ExePackageTests/CustomExitCodeExePackage/CustomExitCodeExePackage.wxs
new file mode 100644
index 00000000..a02e48d1
--- /dev/null
+++ b/src/test/burn/TestData/ExePackageTests/CustomExitCodeExePackage/CustomExitCodeExePackage.wxs
@@ -0,0 +1,34 @@
+<!-- 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" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <ExePackage Id="TestExe" Cache="remove" PerMachine="yes"
+                  DetectCondition="" Permanent="yes" InstallArguments="/ec [EXEEXITCODE]">
+        <PayloadGroupRef Id="TestExePayloads" />
+
+        <ExitCode Value="0" Behavior="error" />
+        <ExitCode Value="3" Behavior="scheduleReboot" />
+        <ExitCode Value="4" Behavior="forceReboot" />
+        <ExitCode Value="5" Behavior="errorScheduleReboot" />
+        <ExitCode Value="-2147024891" Behavior="errorScheduleReboot" />
+        <ExitCode Value="6" Behavior="errorForceReboot" />
+        <ExitCode Value="-2147024890" Behavior="errorForceReboot" />
+        <ExitCode Value="3010" Behavior="error" />
+        <ExitCode Value="-2147021886" Behavior="error" />
+        <ExitCode Value="3011" Behavior="error" />
+        <ExitCode Value="-2147021885" Behavior="error" />
+        <ExitCode Value="1641" Behavior="error" />
+        <ExitCode Value="-2147023255" Behavior="error" />
+        <ExitCode Value="3017" Behavior="error" />
+        <ExitCode Value="-2147021879" Behavior="error" />
+        <ExitCode Value="3018" Behavior="error" />
+        <ExitCode Value="-2147021878" Behavior="error" />
+        <ExitCode Value="-2147483647" Behavior="error" />
+        <ExitCode Value="-2147483648" Behavior="error" />
+        <ExitCode Behavior="success" />
+      </ExePackage>
+    </PackageGroup>
+    <Variable Name="EXEEXITCODE" bal:Overridable="yes" Value="1" />
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingTheme.xml b/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingTheme.xml
index 4c117506..c890d7df 100644
--- a/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingTheme.xml
+++ b/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingTheme.xml
@@ -132,7 +132,7 @@ There are currently four states for a button: default, focus, hover, and selecte
         </Page>
         <Page Name="Billboard">
             <Label X="6" Y="6" Width="-6" Height="43" FontId="Default">
-                This page has a billboard. It loops between two panels every 1.5 seconds.
+                This page has a billboard. It loops between two panels every 1.5 seconds. Press Back to go to another page, and then come back and make sure it still loops.
             </Label>
             <Billboard Name="FirstBillboard" X="11" Y="59" Width="-11" Height="-39" Interval="1500" Loop="yes">
                 <Panel>
diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingThemeLoose.xml b/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingThemeLoose.xml
index b2b0dcb3..37757e64 100644
--- a/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingThemeLoose.xml
+++ b/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingThemeLoose.xml
@@ -132,7 +132,7 @@ There are currently four states for a button: default, focus, hover, and selecte
         </Page>
         <Page Name="Billboard">
             <Label X="6" Y="6" Width="-6" Height="43" FontId="Default">
-                This page has a billboard. It loops between two panels every 1.5 seconds.
+                This page has a billboard. It loops between two panels every 1.5 seconds. Press Back to go to another page, and then come back and make sure it still loops.
             </Label>
             <Billboard Name="FirstBillboard" X="11" Y="59" Width="-11" Height="-39" Interval="1500" Loop="yes">
                 <Panel>
diff --git a/src/test/burn/TestData/Manual/BundleA/ManualTests.txt b/src/test/burn/TestData/Manual/BundleA/ManualTests.txt
index b8c6e74d..351f2c1f 100644
--- a/src/test/burn/TestData/Manual/BundleA/ManualTests.txt
+++ b/src/test/burn/TestData/Manual/BundleA/ManualTests.txt
@@ -152,3 +152,13 @@ CanRestartFromUnelevatedPerUserBundleWithShutdownPrivilege
 =======================================
 
 (10. Uninstall the bundle)
+
+CanShowSplashScreenQuicklyAndCacheThousandsOfFilesInLinearTime
+
+1. Run BundleB.exe.
+2. The splash screen should come up immediately (less than 1 second).
+3. After the wixstdba UI comes up, make sure the splash screen was closed (it might be hiding underneath windows).
+4. Click Install (accept elevation).
+5. This bundle contains 10000 loose files which needs to be cached, which used to take over 30 minutes. The exact timing can be different on different machines, but it should be closer to 30 seconds.
+6. Click Close.
+(7. Uninstall the bundle)
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleBv1/FeedBv2.0_wronghash.xml b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/FeedBv2.0_wronghash.xml
new file mode 100644
index 00000000..82ce6837
--- /dev/null
+++ b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/FeedBv2.0_wronghash.xml
@@ -0,0 +1,54 @@
+<?xml version='1.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. -->
+
+
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:as="http://appsyndication.org/2006/appsyn">
+  <title type="text">BundleB v2.0</title>
+  <subtitle type="text">Bundle Subtitle.</subtitle>
+  <as:application type="application/exe">1116353B-7C6E-4C29-BFA1-D4A972CD421D</as:application>
+  <updated>2014-07-14T12:39:00.000Z</updated>
+  <id>http://localhost:9999/e2e/BundleB/feed</id>
+  <link rel="self" type="application/atom+xml" href="http://localhost:9999/e2e/BundleB/feed"/>
+  <generator version="0.1">manual build</generator>
+  <entry>
+    <title>Bundle v2.0</title>
+    <id>v2.0</id>
+    <author>
+      <name>Bundle_Author</name>
+      <uri>http://mycompany.com/software</uri>
+      <email>Bundle_Author@mycompany.com</email>
+    </author>
+    <link rel="alternate" href="http://www.mycompany.com/content/view/software"/>
+    <link rel="enclosure" href="http://localhost:9999/e2e/BundleB/2.0/BundleB.exe" length="0" type="application/octet-stream">
+      <as:name>this hash is supposed to be wrong but has a tiny chance of actually being right</as:name>
+      <as:digest algorithm="sha512">00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000</as:digest>
+    </link>
+    <content type="html">
+      &lt;p&gt;Change list:&lt;/p&gt;&lt;ul&gt;
+      &lt;li&gt;Updated release.&lt;/li&gt;
+      &lt;/ul&gt;
+    </content>
+    <as:upgrade version="1.0" />
+    <as:version>2.0.0.0</as:version>
+    <updated>2014-11-10T12:39:00.000Z</updated>
+  </entry>
+  <entry>
+    <title>Bundle v1.0</title>
+    <id>v1.0</id>
+    <author>
+      <name>Bundle_Author</name>
+      <uri>http://mycompany.com/software</uri>
+      <email>Bundle_Author@mycompany.com</email>
+    </author>
+    <link rel="alternate" href="http://www.mycompany.com/content/view/software"/>
+    <link rel="enclosure" href="http://localhost:9999/e2e/BundleB/1.0/BundleB.exe" length="0" type="application/octet-stream"/>
+    <content type="html">
+      &lt;p&gt;Change list:&lt;/p&gt;&lt;ul&gt;
+      &lt;li&gt;Initial release.&lt;/li&gt;
+      &lt;/ul&gt;
+    </content>
+    <as:upgrade version="1.0.0.0-preview" />
+    <as:version>1.0.0.0</as:version>
+    <updated>2014-11-09T12:39:00.000Z</updated>
+  </entry>  
+</feed>
diff --git a/src/test/burn/WixTestTools/MSIExec.cs b/src/test/burn/WixTestTools/MSIExec.cs
index 5f57da7b..a905ec5a 100644
--- a/src/test/burn/WixTestTools/MSIExec.cs
+++ b/src/test/burn/WixTestTools/MSIExec.cs
@@ -666,7 +666,13 @@ namespace WixTestTools
             /// A restart is required to complete the install. This message is indicative of a success. 
             /// This does not include installs where the ForceReboot action is run. 
             /// </summary> 
-            ERROR_SUCCESS_REBOOT_REQUIRED = 3010
+            ERROR_SUCCESS_REBOOT_REQUIRED = 3010,
+
+            /// <summary>
+            /// ERROR_SUCCESS_REBOOT_REQUIRED           3017
+            /// The requested operation failed. A system reboot is required to roll back changes made.
+            /// </summary>
+            ERROR_FAIL_REBOOT_REQUIRED = 3017,
         }
 
         /// <summary>
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs
index e76461f3..42301f30 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs
@@ -143,6 +143,32 @@ namespace WixToolsetTest.BurnE2E
         }
 
         [RuntimeFact]
+        public void CanUseLargeCustomExitCode()
+        {
+            var customExitCodeExePackageBundle = this.CreateBundleInstaller(@"CustomExitCodeExePackage");
+
+            var installLogPath = customExitCodeExePackageBundle.Install(5, "EXEEXITCODE=-2147024891");
+            customExitCodeExePackageBundle.VerifyUnregisteredAndRemovedFromPackageCache();
+
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, "TestExe.exe\" /ec -2147024891"));
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, "The process for package: TestExe exited with code: 0x80070005. The exit code has been translated to type: ErrorScheduleReboot and restart: Required."));
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, "Applied execute package: TestExe, result: 0x80070005, restart: Required"));
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, "Apply complete, result: 0x80070005, restart: Required, ba requested restart:  No"));
+        }
+
+        [RuntimeFact]
+        public void CanUseWildcardCustomExitCode()
+        {
+            var customExitCodeExePackageBundle = this.CreateBundleInstaller(@"CustomExitCodeExePackage");
+
+            var installLogPath = customExitCodeExePackageBundle.Install((int)MSIExec.MSIExecReturnCode.SUCCESS, "EXEEXITCODE=1");
+            customExitCodeExePackageBundle.VerifyUnregisteredAndRemovedFromPackageCache();
+
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, "TestExe.exe\" /ec 1"));
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, "The process for package: TestExe exited with code: 0x1. The exit code has been translated to type: Success and restart: None."));
+        }
+
+        [RuntimeFact]
         public void CanInstallAndUninstallPerUserArpEntryExePackage()
         {
             var perUserArpEntryExePackageBundle = this.CreateBundleInstaller(@"PerUserArpEntryExePackage");
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/UpdateBundleTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/UpdateBundleTests.cs
index df666833..f7ec8647 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/UpdateBundleTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/UpdateBundleTests.cs
@@ -242,5 +242,41 @@ namespace WixToolsetTest.BurnE2E
             packageBv1.VerifyInstalled(false);
             packageBv2.VerifyInstalled(false);
         }
+
+        // Installs bundle Bv1.0 then attempts an update to bundle Bv2.0 during modify (server exists, v2.0 feed with wrong hash).
+        [RuntimeFact]
+        public void CanBlockWrongUpdateBundleFromDownloadInsteadOfModify()
+        {
+            var packageBv1 = this.CreatePackageInstaller("PackageBv1");
+            var packageBv2 = this.CreatePackageInstaller("PackageBv2");
+            var bundleBv1 = this.CreateBundleInstaller("BundleBv1");
+            var bundleBv2 = this.CreateBundleInstaller("BundleBv2");
+            var webServer = this.CreateWebServer();
+
+            webServer.AddFiles(new Dictionary<string, string>
+            {
+                { "/BundleB/feed", Path.Combine(this.TestContext.TestDataFolder, "FeedBv2.0_wronghash.xml") },
+                { "/BundleB/2.0/BundleB.exe", bundleBv2.Bundle },
+            });
+            webServer.Start();
+
+            packageBv1.VerifyInstalled(false);
+            packageBv2.VerifyInstalled(false);
+
+            bundleBv1.Install();
+            bundleBv1.VerifyRegisteredAndInPackageCache();
+
+            packageBv1.VerifyInstalled(true);
+            packageBv2.VerifyInstalled(false);
+
+            // Run the v1 bundle requesting an update bundle.
+            bundleBv1.Modify(unchecked((int)0x80091007), arguments: "-checkupdate");
+
+            bundleBv1.VerifyRegisteredAndInPackageCache();
+            bundleBv2.VerifyUnregisteredAndRemovedFromPackageCache();
+
+            packageBv1.VerifyInstalled(true);
+            packageBv2.VerifyInstalled(false);
+        }
     }
 }