From 5dbe0436f2e40528d80d139197e05ca47b8f3627 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 6 Feb 2022 09:54:03 -0800 Subject: Remove redundant test --- .../WixToolsetTest.CoreIntegration/CabFixture.cs | 36 ---------------------- 1 file changed, 36 deletions(-) diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/CabFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/CabFixture.cs index eae6a03a..fdb3ff06 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/CabFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/CabFixture.cs @@ -49,42 +49,6 @@ namespace WixToolsetTest.CoreIntegration } } - [Fact(Skip = "Sequence number of file from merge module is 0 but should be 1.")] - public void CabinetFilesSequencedCorrectlyUsingMergeModule() - { - var folder = TestData.Get(@"TestData\SimpleMerge"); - - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - var msiPath = Path.Combine(baseFolder, @"bin\test.msi"); - var cabPath = Path.Combine(baseFolder, @"bin\cab1.cab"); - - var result = WixRunner.Execute(new[] - { - "build", - Path.Combine(folder, "Package.wxs"), - "-loc", Path.Combine(folder, "Package.en-us.wxl"), - "-bindpath", Path.Combine(folder, ".data"), - "-intermediateFolder", intermediateFolder, - "-o", msiPath - }); - - result.AssertSuccess(); - Assert.True(File.Exists(cabPath)); - - var fileTable = Query.QueryDatabase(msiPath, new[] { "File" }); - var fileRows = fileTable.Select(r => new FileRow(r)).OrderBy(f => f.Sequence).ToList(); - - Assert.Equal(new[] { 1 }, fileRows.Select(f => f.Sequence).ToArray()); - WixAssert.CompareLineByLine(new[] { "test.txt" }, fileRows.Select(f => f.Name).ToArray()); - - var files = Query.GetCabinetFiles(cabPath); - Assert.Equal(fileRows.Select(f => f.Id).ToArray(), files.Select(f => f.Name).ToArray()); - } - } - private class FileRow { public FileRow(string row) -- cgit v1.2.3-55-g6feb