From e1d974378d049004c73d65dbb43a405f67ececd4 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Tue, 12 Nov 2019 13:33:23 +1000
Subject: Update DefaultDir test for duplicate ShortName and Name.

---
 src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs             | 3 ++-
 .../WixToolsetTest.CoreIntegration/TestData/DefaultDir/DefaultDir.wxs  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index 48d16ac1..83f53aca 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -384,7 +384,7 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
-        [Fact]
+        [Fact(Skip = "Test demonstrates failure")]
         public void PopulatesDirectoryTableWithValidDefaultDir()
         {
             var folder = TestData.Get(@"TestData");
@@ -411,6 +411,7 @@ namespace WixToolsetTest.CoreIntegration
                 var results = Query.QueryDatabase(msiPath, new[] { "Directory" });
                 Assert.Equal(new[]
                 {
+                    "Directory:DUPLICATENAMEANDSHORTNAME\tINSTALLFOLDER\tduplicat",
                     "Directory:INSTALLFOLDER\tProgramFilesFolder\toekcr5lq|MsiPackage",
                     "Directory:NAMEANDSHORTNAME\tINSTALLFOLDER\tSHORTNAM|NameAndShortName",
                     "Directory:NAMEANDSHORTSOURCENAME\tINSTALLFOLDER\tNAMEASSN|NameAndShortSourceName",
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DefaultDir/DefaultDir.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DefaultDir/DefaultDir.wxs
index aeb3d554..a217fa34 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DefaultDir/DefaultDir.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/DefaultDir/DefaultDir.wxs
@@ -8,6 +8,7 @@
         </ComponentGroup>
 
         <DirectoryRef Id="INSTALLFOLDER">
+            <Directory Id="DUPLICATENAMEANDSHORTNAME" Name="duplicat" ShortName="duplicat"></Directory>
             <Directory Id="NAMEWITHSHORTVALUE" Name="SHORTVAL"></Directory>
             <Directory Id="NAMEANDSHORTNAME" Name="NameAndShortName" ShortName="SHORTNAM"></Directory>
             <Directory Id="SHORTNAMEONLY" Name="SHORTONL"></Directory>
-- 
cgit v1.2.3-55-g6feb