diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-07-21 16:29:56 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-07-21 18:26:06 -0500 |
commit | 339fc1d2148e6b7fe8cd664e81ee65e51405aa23 (patch) | |
tree | 3e62be0e273811521eff3ab497f76facaad0ed40 /src/burn/test/BurnUnitTest/PlanTest.cpp | |
parent | 9fc43c11d3b006e42c4d3ff9a19d06fd9ac58d51 (diff) | |
download | wix-339fc1d2148e6b7fe8cd664e81ee65e51405aa23.tar.gz wix-339fc1d2148e6b7fe8cd664e81ee65e51405aa23.tar.bz2 wix-339fc1d2148e6b7fe8cd664e81ee65e51405aa23.zip |
Remove support for uninstalling MSU package.
Fixes 6749
Diffstat (limited to 'src/burn/test/BurnUnitTest/PlanTest.cpp')
-rw-r--r-- | src/burn/test/BurnUnitTest/PlanTest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/burn/test/BurnUnitTest/PlanTest.cpp b/src/burn/test/BurnUnitTest/PlanTest.cpp index 7998f837..a98484c1 100644 --- a/src/burn/test/BurnUnitTest/PlanTest.cpp +++ b/src/burn/test/BurnUnitTest/PlanTest.cpp | |||
@@ -2249,6 +2249,7 @@ namespace Bootstrapper | |||
2249 | void SingleMsuInstallTest() | 2249 | void SingleMsuInstallTest() |
2250 | { | 2250 | { |
2251 | HRESULT hr = S_OK; | 2251 | HRESULT hr = S_OK; |
2252 | LONGLONG llPlannedAction = 0; | ||
2252 | BURN_ENGINE_STATE engineState = { }; | 2253 | BURN_ENGINE_STATE engineState = { }; |
2253 | BURN_ENGINE_STATE* pEngineState = &engineState; | 2254 | BURN_ENGINE_STATE* pEngineState = &engineState; |
2254 | BURN_PLAN* pPlan = &engineState.plan; | 2255 | BURN_PLAN* pPlan = &engineState.plan; |
@@ -2260,7 +2261,10 @@ namespace Bootstrapper | |||
2260 | hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL); | 2261 | hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL); |
2261 | NativeAssert::Succeeded(hr, "CorePlan failed"); | 2262 | NativeAssert::Succeeded(hr, "CorePlan failed"); |
2262 | 2263 | ||
2264 | llPlannedAction = VariableGetNumericHelper(&engineState.variables, BURN_BUNDLE_ACTION); | ||
2265 | |||
2263 | Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action); | 2266 | Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action); |
2267 | Assert::Equal<LONGLONG>(BOOTSTRAPPER_ACTION_INSTALL, llPlannedAction); | ||
2264 | NativeAssert::StringEqual(L"{06077C60-DC46-4F4A-8D3C-05F869187191}", pPlan->wzBundleId); | 2268 | NativeAssert::StringEqual(L"{06077C60-DC46-4F4A-8D3C-05F869187191}", pPlan->wzBundleId); |
2265 | NativeAssert::StringEqual(L"{06077C60-DC46-4F4A-8D3C-05F869187191}", pPlan->wzBundleProviderKey); | 2269 | NativeAssert::StringEqual(L"{06077C60-DC46-4F4A-8D3C-05F869187191}", pPlan->wzBundleProviderKey); |
2266 | Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle); | 2270 | Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle); |
@@ -2302,7 +2306,6 @@ namespace Bootstrapper | |||
2302 | ValidateExecuteRollbackBoundaryStart(pPlan, fRollback, dwIndex++, L"WixDefaultBoundary", TRUE, FALSE); | 2306 | ValidateExecuteRollbackBoundaryStart(pPlan, fRollback, dwIndex++, L"WixDefaultBoundary", TRUE, FALSE); |
2303 | ValidateExecuteCheckpoint(pPlan, fRollback, dwIndex++, dwExecuteCheckpointId++); | 2307 | ValidateExecuteCheckpoint(pPlan, fRollback, dwIndex++, dwExecuteCheckpointId++); |
2304 | ValidateExecuteWaitCachePackage(pPlan, fRollback, dwIndex++, L"test.msu"); | 2308 | ValidateExecuteWaitCachePackage(pPlan, fRollback, dwIndex++, L"test.msu"); |
2305 | ValidateExecuteCheckpoint(pPlan, fRollback, dwIndex++, dwExecuteCheckpointId++); | ||
2306 | ValidateExecuteMsuPackage(pPlan, fRollback, dwIndex++, L"test.msu", BOOTSTRAPPER_ACTION_STATE_INSTALL); | 2309 | ValidateExecuteMsuPackage(pPlan, fRollback, dwIndex++, L"test.msu", BOOTSTRAPPER_ACTION_STATE_INSTALL); |
2307 | ValidateExecuteCheckpoint(pPlan, fRollback, dwIndex++, dwExecuteCheckpointId++); | 2310 | ValidateExecuteCheckpoint(pPlan, fRollback, dwIndex++, dwExecuteCheckpointId++); |
2308 | ValidateExecuteCheckpoint(pPlan, fRollback, dwIndex++, dwExecuteCheckpointId++); | 2311 | ValidateExecuteCheckpoint(pPlan, fRollback, dwIndex++, dwExecuteCheckpointId++); |
@@ -2315,8 +2318,6 @@ namespace Bootstrapper | |||
2315 | ValidateExecuteRollbackBoundaryStart(pPlan, fRollback, dwIndex++, L"WixDefaultBoundary", TRUE, FALSE); | 2318 | ValidateExecuteRollbackBoundaryStart(pPlan, fRollback, dwIndex++, L"WixDefaultBoundary", TRUE, FALSE); |
2316 | ValidateExecuteUncachePackage(pPlan, fRollback, dwIndex++, L"test.msu"); | 2319 | ValidateExecuteUncachePackage(pPlan, fRollback, dwIndex++, L"test.msu"); |
2317 | ValidateExecuteCheckpoint(pPlan, fRollback, dwIndex++, dwExecuteCheckpointId++); | 2320 | ValidateExecuteCheckpoint(pPlan, fRollback, dwIndex++, dwExecuteCheckpointId++); |
2318 | ValidateExecuteMsuPackage(pPlan, fRollback, dwIndex++, L"test.msu", BOOTSTRAPPER_ACTION_STATE_UNINSTALL); | ||
2319 | ValidateExecuteCheckpoint(pPlan, fRollback, dwIndex++, dwExecuteCheckpointId++); | ||
2320 | ValidateExecuteCheckpoint(pPlan, fRollback, dwIndex++, dwExecuteCheckpointId++); | 2321 | ValidateExecuteCheckpoint(pPlan, fRollback, dwIndex++, dwExecuteCheckpointId++); |
2321 | ValidateExecuteCheckpoint(pPlan, fRollback, dwIndex++, dwExecuteCheckpointId++); | 2322 | ValidateExecuteCheckpoint(pPlan, fRollback, dwIndex++, dwExecuteCheckpointId++); |
2322 | ValidateExecuteRollbackBoundaryEnd(pPlan, fRollback, dwIndex++); | 2323 | ValidateExecuteRollbackBoundaryEnd(pPlan, fRollback, dwIndex++); |
@@ -2336,7 +2337,6 @@ namespace Bootstrapper | |||
2336 | Assert::Equal(uIndex, pPlan->cPlannedProviders); | 2337 | Assert::Equal(uIndex, pPlan->cPlannedProviders); |
2337 | 2338 | ||
2338 | Assert::Equal(1ul, pEngineState->packages.cPackages); | 2339 | Assert::Equal(1ul, pEngineState->packages.cPackages); |
2339 | ValidateNonPermanentPackageExpectedStates(&pEngineState->packages.rgPackages[0], L"test.msu", BURN_PACKAGE_REGISTRATION_STATE_PRESENT, BURN_PACKAGE_REGISTRATION_STATE_PRESENT); | ||
2340 | } | 2340 | } |
2341 | 2341 | ||
2342 | [Fact] | 2342 | [Fact] |