@joebigelow / wix-1 / commits / e1d97437

Update DefaultDir test for duplicate ShortName and Name.

Sean Hall committed Nov 12, 2019 at 13:33 UTC e1d974378d049004c73d65dbb43a405f67ececd4
2 files changed +3 -1
src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+2 -1
@@ -384,7 +384,7 @@ namespace WixToolsetTest.CoreIntegration
384 }
385 }
386
387 - [Fact]
387 + [Fact(Skip = "Test demonstrates failure")]
388 public void PopulatesDirectoryTableWithValidDefaultDir()
389 {
390 var folder = TestData.Get(@"TestData");
@@ -411,6 +411,7 @@ namespace WixToolsetTest.CoreIntegration
411 var results = Query.QueryDatabase(msiPath, new[] { "Directory" });
412 Assert.Equal(new[]
413 {
414 + "Directory:DUPLICATENAMEANDSHORTNAME\tINSTALLFOLDER\tduplicat",
415 "Directory:INSTALLFOLDER\tProgramFilesFolder\toekcr5lq|MsiPackage",
416 "Directory:NAMEANDSHORTNAME\tINSTALLFOLDER\tSHORTNAM|NameAndShortName",
417 "Directory:NAMEANDSHORTSOURCENAME\tINSTALLFOLDER\tNAMEASSN|NameAndShortSourceName",
src/test/WixToolsetTest.CoreIntegration/TestData/DefaultDir/DefaultDir.wxs
+1
@@ -8,6 +8,7 @@
8 </ComponentGroup>
9
10 <DirectoryRef Id="INSTALLFOLDER">
11 + <Directory Id="DUPLICATENAMEANDSHORTNAME" Name="duplicat" ShortName="duplicat"></Directory>
12 <Directory Id="NAMEWITHSHORTVALUE" Name="SHORTVAL"></Directory>
13 <Directory Id="NAMEANDSHORTNAME" Name="NameAndShortName" ShortName="SHORTNAM"></Directory>
14 <Directory Id="SHORTNAMEONLY" Name="SHORTONL"></Directory>