From 8f67ce3ce8a248b7421e14ec3dd6f65e9b53ea08 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Thu, 3 Nov 2022 17:34:39 -0400 Subject: Failing test for bug #6977. https://github.com/wixtoolset/issues/issues/6977 --- .../DirectoryFixture.cs | 51 ++++++++++++++++++++++ .../TestData/Directory/DefaultName.wxs | 2 + 2 files changed, 53 insertions(+) (limited to 'src') diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs index d3fc5a86..f2ace1d0 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs @@ -135,6 +135,57 @@ namespace WixToolsetTest.CoreIntegration } } + [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6977")] + public void CanGetEmptyStandardDirectory() + { + var folder = TestData.Get(@"TestData"); + + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + var msiPath = Path.Combine(baseFolder, @"bin\test.msi"); + + var result = WixRunner.Execute(new[] + { + "build", + Path.Combine(folder, "Directory", "DefaultName.wxs"), + Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"), + "-bindpath", Path.Combine(folder, "SingleFile", "data"), + "-intermediateFolder", intermediateFolder, + "-o", msiPath + }); + + result.AssertSuccess(); + + var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); + var section = intermediate.Sections.Single(); + + var dirSymbols = section.Symbols.OfType().ToList(); + WixAssert.CompareLineByLine(new[] + { + "BinFolder\tCompanyFolder\t.", + "CompanyFolder\tProgramFilesFolder\tExample Corporation", + "DesktopFolder\tTARGETDIR\t.", + "ProgramFilesFolder\tTARGETDIR\tPFiles", + "ProgramMenuFolder\tTARGETDIR\t.", + "TARGETDIR\t\tSourceDir" + }, dirSymbols.OrderBy(d => d.Id.Id).Select(d => String.Join('\t', d.Id.Id, d.ParentDirectoryRef, d.Name)).ToArray()); + + var data = WindowsInstallerData.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); + var directoryRows = data.Tables["Directory"].Rows; + WixAssert.CompareLineByLine(new[] + { + "BinFolder\tCompanyFolder\t.", + "CompanyFolder\tProgramFilesFolder\tu7-b4gch|Example Corporation", + "DesktopFolder\tTARGETDIR\t.", + "ProgramFilesFolder\tTARGETDIR\tPFiles", + "ProgramMenuFolder\tTARGETDIR\t.", + "TARGETDIR\t\tSourceDir" + }, directoryRows.Select(r => String.Join('\t', r.FieldAsString(0), r.FieldAsString(1), r.FieldAsString(2))).ToArray()); + } + } + [Fact] public void CanGetDuplicateDir() { diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Directory/DefaultName.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Directory/DefaultName.wxs index 3e7887c4..5707e677 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Directory/DefaultName.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Directory/DefaultName.wxs @@ -4,6 +4,8 @@ + + -- cgit v1.2.3-55-g6feb