aboutsummaryrefslogtreecommitdiff
path: root/src/burn/test/BurnUnitTest
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-03-04 17:55:17 -0600
committerSean Hall <r.sean.hall@gmail.com>2022-03-05 16:22:04 -0600
commite027c6c571a4bc8c818244e2b0c5015eb4ef3110 (patch)
tree8149aa491766bfe8a883f921831a52133abceea5 /src/burn/test/BurnUnitTest
parentbaf09c19c5a0f0d3f9533f9084f094066c1be7d9 (diff)
downloadwix-e027c6c571a4bc8c818244e2b0c5015eb4ef3110.tar.gz
wix-e027c6c571a4bc8c818244e2b0c5015eb4ef3110.tar.bz2
wix-e027c6c571a4bc8c818244e2b0c5015eb4ef3110.zip
Change ARP property Installed to 0 when registrationType is InProgress.
Being registered in ARP and "installed" were always separate concepts, and some things like fEligibleForCleanup were looking at the wrong thing. This also allows the BA to tell the difference.
Diffstat (limited to 'src/burn/test/BurnUnitTest')
-rw-r--r--src/burn/test/BurnUnitTest/PlanTest.cpp6
-rw-r--r--src/burn/test/BurnUnitTest/RegistrationTest.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/burn/test/BurnUnitTest/PlanTest.cpp b/src/burn/test/BurnUnitTest/PlanTest.cpp
index ba28713f..685d2ca9 100644
--- a/src/burn/test/BurnUnitTest/PlanTest.cpp
+++ b/src/burn/test/BurnUnitTest/PlanTest.cpp
@@ -792,7 +792,7 @@ namespace Bootstrapper
792 InitializeEngineStateForCorePlan(wzSingleMsiManifestFileName, pEngineState); 792 InitializeEngineStateForCorePlan(wzSingleMsiManifestFileName, pEngineState);
793 DetectPackagesAsAbsent(pEngineState); 793 DetectPackagesAsAbsent(pEngineState);
794 794
795 pEngineState->registration.fInstalled = TRUE; 795 pEngineState->registration.detectedRegistrationType = BOOTSTRAPPER_REGISTRATION_TYPE_FULL;
796 796
797 hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_MODIFY); 797 hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_MODIFY);
798 NativeAssert::Succeeded(hr, "CorePlan failed"); 798 NativeAssert::Succeeded(hr, "CorePlan failed");
@@ -1457,7 +1457,7 @@ namespace Bootstrapper
1457 { 1457 {
1458 PlanTestDetect(pEngineState); 1458 PlanTestDetect(pEngineState);
1459 1459
1460 pEngineState->registration.fInstalled = TRUE; 1460 pEngineState->registration.detectedRegistrationType = BOOTSTRAPPER_REGISTRATION_TYPE_FULL;
1461 1461
1462 for (DWORD i = 0; i < pEngineState->packages.cPackages; ++i) 1462 for (DWORD i = 0; i < pEngineState->packages.cPackages; ++i)
1463 { 1463 {
@@ -1486,7 +1486,7 @@ namespace Bootstrapper
1486 { 1486 {
1487 PlanTestDetect(pEngineState); 1487 PlanTestDetect(pEngineState);
1488 1488
1489 pEngineState->registration.fInstalled = TRUE; 1489 pEngineState->registration.detectedRegistrationType = BOOTSTRAPPER_REGISTRATION_TYPE_FULL;
1490 1490
1491 for (DWORD i = 0; i < pEngineState->packages.cPackages; ++i) 1491 for (DWORD i = 0; i < pEngineState->packages.cPackages; ++i)
1492 { 1492 {
diff --git a/src/burn/test/BurnUnitTest/RegistrationTest.cpp b/src/burn/test/BurnUnitTest/RegistrationTest.cpp
index 6a10961d..86ea86b0 100644
--- a/src/burn/test/BurnUnitTest/RegistrationTest.cpp
+++ b/src/burn/test/BurnUnitTest/RegistrationTest.cpp
@@ -218,7 +218,7 @@ namespace Bootstrapper
218 218
219 // verify that registration was updated 219 // verify that registration was updated
220 this->ValidateUninstallKeyResume(Int32(BURN_RESUME_MODE_ARP)); 220 this->ValidateUninstallKeyResume(Int32(BURN_RESUME_MODE_ARP));
221 this->ValidateUninstallKeyInstalled(1); 221 this->ValidateUninstallKeyInstalled(0);
222 this->ValidateRunOnceKeyString(TEST_BUNDLE_ID, nullptr); 222 this->ValidateRunOnceKeyString(TEST_BUNDLE_ID, nullptr);
223 223
224 // 224 //
@@ -231,7 +231,7 @@ namespace Bootstrapper
231 231
232 // verify that registration was updated 232 // verify that registration was updated
233 this->ValidateUninstallKeyResume(Int32(BURN_RESUME_MODE_ACTIVE)); 233 this->ValidateUninstallKeyResume(Int32(BURN_RESUME_MODE_ACTIVE));
234 this->ValidateUninstallKeyInstalled(1); 234 this->ValidateUninstallKeyInstalled(0);
235 this->ValidateRunOnceKeyEntry(cacheExePath); 235 this->ValidateRunOnceKeyEntry(cacheExePath);
236 236
237 // delete registration 237 // delete registration
@@ -337,7 +337,7 @@ namespace Bootstrapper
337 337
338 // verify that registration variables were updated 338 // verify that registration variables were updated
339 this->ValidateUninstallKeyDisplayName(L"Product1"); 339 this->ValidateUninstallKeyDisplayName(L"Product1");
340 registration.fInstalled = TRUE; 340 registration.detectedRegistrationType = BOOTSTRAPPER_REGISTRATION_TYPE_FULL;
341 341
342 hr = RegistrationSetVariables(&registration, &variables); 342 hr = RegistrationSetVariables(&registration, &variables);
343 TestThrowOnFailure(hr, L"Failed to set registration variables."); 343 TestThrowOnFailure(hr, L"Failed to set registration variables.");