Rename "bundle id" concept to "bundle code"

The "bundle id" always had more in common with the PackageCode from the Windows
Installer. With the introduction of an actual Id attribute on the Bundle
element, there is potential for confusion, so there is finally real motivation
to rename "bundle id" to "bundle code".

1 files changed, 6 insertions, 6 deletions

diff --git a/src/test/burn/WixTestTools/BundleVerifier.cs b/src/test/burn/WixTestTools/BundleVerifier.cs
index b750c80c..da61d96e 100644
--- a/src/test/burn/WixTestTools/BundleVerifier.cs
+++ b/src/test/burn/WixTestTools/BundleVerifier.cs
@@ -62,7 +62,7 @@ namespace WixTestTools
         public string GetExpectedCachedBundlePath()
         {
             var bundleSymbol = this.GetBundleSymbol();
-            var cachePath = this.GetPackageCachePathForCacheId(bundleSymbol.BundleId, bundleSymbol.PerMachine);
+            var cachePath = this.GetPackageCachePathForCacheId(bundleSymbol.BundleCode, bundleSymbol.PerMachine);
             return Path.Combine(cachePath, Path.GetFileName(this.Bundle));
         }
 
@@ -107,14 +107,14 @@ namespace WixTestTools
         {
             var bundleSymbol = this.GetBundleSymbol();
             var x64 = bundleSymbol.Platform != Platform.X86;
-            var bundleId = bundleSymbol.BundleId;
+            var bundleCode = bundleSymbol.BundleCode;
             if (bundleSymbol.PerMachine)
             {
-                return BundleRegistration.TryGetPerMachineBundleRegistrationById(bundleId, x64, out registration);
+                return BundleRegistration.TryGetPerMachineBundleRegistrationById(bundleCode, x64, out registration);
             }
             else
             {
-                return BundleRegistration.TryGetPerUserBundleRegistrationById(bundleId, out registration);
+                return BundleRegistration.TryGetPerUserBundleRegistrationById(bundleCode, out registration);
             }
         }
 
@@ -141,8 +141,8 @@ namespace WixTestTools
 
         public void VerifyUnregisteredAndRemovedFromPackageCache(string cachedBundlePath)
         {
-            Assert.False(this.TryGetRegistration(out _));
-            Assert.False(File.Exists(cachedBundlePath));
+            Assert.False(this.TryGetRegistration(out _), $"Bundle cached at '{cachedBundlePath}' should not still be registered.");
+            Assert.False(File.Exists(cachedBundlePath), $"Cached bundle should have been removed from package cache at '{cachedBundlePath}'.");
         }
 
         public void RemovePackageFromCache(string packageId)