aboutsummaryrefslogtreecommitdiff
path: root/src/test/burn/WixTestTools/BundleVerifier.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/burn/WixTestTools/BundleVerifier.cs')
-rw-r--r--src/test/burn/WixTestTools/BundleVerifier.cs12
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
62 public string GetExpectedCachedBundlePath() 62 public string GetExpectedCachedBundlePath()
63 { 63 {
64 var bundleSymbol = this.GetBundleSymbol(); 64 var bundleSymbol = this.GetBundleSymbol();
65 var cachePath = this.GetPackageCachePathForCacheId(bundleSymbol.BundleId, bundleSymbol.PerMachine); 65 var cachePath = this.GetPackageCachePathForCacheId(bundleSymbol.BundleCode, bundleSymbol.PerMachine);
66 return Path.Combine(cachePath, Path.GetFileName(this.Bundle)); 66 return Path.Combine(cachePath, Path.GetFileName(this.Bundle));
67 } 67 }
68 68
@@ -107,14 +107,14 @@ namespace WixTestTools
107 { 107 {
108 var bundleSymbol = this.GetBundleSymbol(); 108 var bundleSymbol = this.GetBundleSymbol();
109 var x64 = bundleSymbol.Platform != Platform.X86; 109 var x64 = bundleSymbol.Platform != Platform.X86;
110 var bundleId = bundleSymbol.BundleId; 110 var bundleCode = bundleSymbol.BundleCode;
111 if (bundleSymbol.PerMachine) 111 if (bundleSymbol.PerMachine)
112 { 112 {
113 return BundleRegistration.TryGetPerMachineBundleRegistrationById(bundleId, x64, out registration); 113 return BundleRegistration.TryGetPerMachineBundleRegistrationById(bundleCode, x64, out registration);
114 } 114 }
115 else 115 else
116 { 116 {
117 return BundleRegistration.TryGetPerUserBundleRegistrationById(bundleId, out registration); 117 return BundleRegistration.TryGetPerUserBundleRegistrationById(bundleCode, out registration);
118 } 118 }
119 } 119 }
120 120
@@ -141,8 +141,8 @@ namespace WixTestTools
141 141
142 public void VerifyUnregisteredAndRemovedFromPackageCache(string cachedBundlePath) 142 public void VerifyUnregisteredAndRemovedFromPackageCache(string cachedBundlePath)
143 { 143 {
144 Assert.False(this.TryGetRegistration(out _)); 144 Assert.False(this.TryGetRegistration(out _), $"Bundle cached at '{cachedBundlePath}' should not still be registered.");
145 Assert.False(File.Exists(cachedBundlePath)); 145 Assert.False(File.Exists(cachedBundlePath), $"Cached bundle should have been removed from package cache at '{cachedBundlePath}'.");
146 } 146 }
147 147
148 public void RemovePackageFromCache(string packageId) 148 public void RemovePackageFromCache(string packageId)