diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2019-01-06 20:09:31 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2019-01-06 20:09:31 -0600 |
commit | 3ff6c0bc2c613b7db6c2732661050c94d36eeb37 (patch) | |
tree | eef586cb72d38524daffa09a746113696333cfc2 /src/test | |
parent | 8f70bee13a22cc8b8b1a76825c5051100c9bdd2f (diff) | |
download | wix-3ff6c0bc2c613b7db6c2732661050c94d36eeb37.tar.gz wix-3ff6c0bc2c613b7db6c2732661050c94d36eeb37.tar.bz2 wix-3ff6c0bc2c613b7db6c2732661050c94d36eeb37.zip |
Add messages, add tuple definitions, and fix test.
Diffstat (limited to 'src/test')
3 files changed, 6 insertions, 3 deletions
diff --git a/src/test/WixToolsetTest.Iis/IisExtensionFixture.cs b/src/test/WixToolsetTest.Iis/IisExtensionFixture.cs index 2adb2e93..5aa3f866 100644 --- a/src/test/WixToolsetTest.Iis/IisExtensionFixture.cs +++ b/src/test/WixToolsetTest.Iis/IisExtensionFixture.cs | |||
@@ -11,7 +11,7 @@ namespace WixToolsetTest.Iis | |||
11 | public class IisExtensionFixture | 11 | public class IisExtensionFixture |
12 | { | 12 | { |
13 | [Fact] | 13 | [Fact] |
14 | public void CanBuildUsingFileShare() | 14 | public void CanBuildUsingIIsWebAddress() |
15 | { | 15 | { |
16 | var folder = TestData.Get(@"TestData\UsingIis"); | 16 | var folder = TestData.Get(@"TestData\UsingIis"); |
17 | var build = new Builder(folder, typeof(IisExtensionFactory), new[] { folder }); | 17 | var build = new Builder(folder, typeof(IisExtensionFactory), new[] { folder }); |
@@ -19,7 +19,7 @@ namespace WixToolsetTest.Iis | |||
19 | var results = build.BuildAndQuery(Build, "IIsWebAddress"); | 19 | var results = build.BuildAndQuery(Build, "IIsWebAddress"); |
20 | Assert.Equal(new[] | 20 | Assert.Equal(new[] |
21 | { | 21 | { |
22 | "IIsWebAddress:", | 22 | "IIsWebAddress:TestAddress\tTest\t\t[PORT]\t\t0", |
23 | }, results.OrderBy(s => s).ToArray()); | 23 | }, results.OrderBy(s => s).ToArray()); |
24 | } | 24 | } |
25 | 25 | ||
diff --git a/src/test/WixToolsetTest.Iis/TestData/UsingIis/Package.wxs b/src/test/WixToolsetTest.Iis/TestData/UsingIis/Package.wxs index 68ff98fd..7ae8f082 100644 --- a/src/test/WixToolsetTest.Iis/TestData/UsingIis/Package.wxs +++ b/src/test/WixToolsetTest.Iis/TestData/UsingIis/Package.wxs | |||
@@ -15,7 +15,9 @@ | |||
15 | <Fragment> | 15 | <Fragment> |
16 | <Directory Id="TARGETDIR" Name="SourceDir"> | 16 | <Directory Id="TARGETDIR" Name="SourceDir"> |
17 | <Directory Id="ProgramFilesFolder"> | 17 | <Directory Id="ProgramFilesFolder"> |
18 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 18 | <Directory Id="INSTALLFOLDER" Name="MsiPackage"> |
19 | <Directory Id="TestWebSiteProductDirectory" /> | ||
20 | </Directory> | ||
19 | </Directory> | 21 | </Directory> |
20 | </Directory> | 22 | </Directory> |
21 | </Fragment> | 23 | </Fragment> |
diff --git a/src/test/WixToolsetTest.Iis/TestData/UsingIis/PackageComponents.wxs b/src/test/WixToolsetTest.Iis/TestData/UsingIis/PackageComponents.wxs index 29c6956d..03203b50 100644 --- a/src/test/WixToolsetTest.Iis/TestData/UsingIis/PackageComponents.wxs +++ b/src/test/WixToolsetTest.Iis/TestData/UsingIis/PackageComponents.wxs | |||
@@ -11,5 +11,6 @@ | |||
11 | </iis:WebSite> | 11 | </iis:WebSite> |
12 | </Component> | 12 | </Component> |
13 | </ComponentGroup> | 13 | </ComponentGroup> |
14 | <iis:WebDirProperties Id="ReadAndExecute" /> | ||
14 | </Fragment> | 15 | </Fragment> |
15 | </Wix> | 16 | </Wix> |