diff options
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/burn/TestData/DependencyTests/PackageB/ProductComponents.wxs | 2 | ||||
-rw-r--r-- | src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/src/test/burn/TestData/DependencyTests/PackageB/ProductComponents.wxs b/src/test/burn/TestData/DependencyTests/PackageB/ProductComponents.wxs index b59e53e1..65ae1e44 100644 --- a/src/test/burn/TestData/DependencyTests/PackageB/ProductComponents.wxs +++ b/src/test/burn/TestData/DependencyTests/PackageB/ProductComponents.wxs | |||
@@ -11,7 +11,7 @@ | |||
11 | <Component Id="FileComponent2" Guid="A1866388-65B4-4215-A8FB-9A7AADBE4E8E" Directory="INSTALLFOLDER"> | 11 | <Component Id="FileComponent2" Guid="A1866388-65B4-4215-A8FB-9A7AADBE4E8E" Directory="INSTALLFOLDER"> |
12 | <File Source="$(sys.SOURCEFILEPATH)" /> | 12 | <File Source="$(sys.SOURCEFILEPATH)" /> |
13 | <Provides> | 13 | <Provides> |
14 | <Requires ProviderKey="WiX.$(var.TestGroupName).A,v1.0" Minimum="1.0.0.0" IncludeMinimum="yes" dep:Enforce="yes" /> | 14 | <Requires ProviderKey="WiX.$(var.TestGroupName).A,v1.0" Minimum="1.0.0-alpha.420" IncludeMinimum="yes" dep:Enforce="yes" /> |
15 | </Provides> | 15 | </Provides> |
16 | </Component> | 16 | </Component> |
17 | </Fragment> | 17 | </Fragment> |
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs index 3437bf00..f4bc6ba9 100644 --- a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs +++ b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs | |||
@@ -1086,5 +1086,24 @@ namespace WixToolsetTest.BurnE2E | |||
1086 | packageA.UninstallProduct(); | 1086 | packageA.UninstallProduct(); |
1087 | packageA.VerifyInstalled(false); | 1087 | packageA.VerifyInstalled(false); |
1088 | } | 1088 | } |
1089 | |||
1090 | [Fact] | ||
1091 | public void CannotInstallWhenDependencyUnsatisfied() | ||
1092 | { | ||
1093 | var packageA = this.CreatePackageInstaller("PackageAv1"); | ||
1094 | var packageB = this.CreatePackageInstaller("PackageB"); | ||
1095 | var bundleB = this.CreateBundleInstaller("BundleB"); | ||
1096 | var testBAController = this.CreateTestBAController(); | ||
1097 | |||
1098 | packageA.VerifyInstalled(false); | ||
1099 | packageB.VerifyInstalled(false); | ||
1100 | |||
1101 | // Prevent install of PackageA to cause PackageB's enforced dependency | ||
1102 | // to fail the install. | ||
1103 | testBAController.SetPackageRequestedState("PackageA", RequestState.None); | ||
1104 | |||
1105 | var bundleBInstallLogFilePath = bundleB.Install((int)MSIExec.MSIExecReturnCode.ERROR_INSTALL_FAILURE); | ||
1106 | Assert.True(LogVerifier.MessageInLogFileRegex(bundleBInstallLogFilePath, @"Applied execute package: PackageB, result: 0x80070643, restart: None")); | ||
1107 | } | ||
1089 | } | 1108 | } |
1090 | } | 1109 | } |