aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2022-02-06 09:54:03 -0800
committerRob Mensching <rob@firegiant.com>2022-02-08 09:42:04 -0800
commit5dbe0436f2e40528d80d139197e05ca47b8f3627 (patch)
tree46285261140fa8059b9d0b55ba96dfc1aac44cc7
parent718dce937b6c8aa0abe309364d3f298d206f4aae (diff)
downloadwix-5dbe0436f2e40528d80d139197e05ca47b8f3627.tar.gz
wix-5dbe0436f2e40528d80d139197e05ca47b8f3627.tar.bz2
wix-5dbe0436f2e40528d80d139197e05ca47b8f3627.zip
Remove redundant test
-rw-r--r--src/wix/test/WixToolsetTest.CoreIntegration/CabFixture.cs36
1 files changed, 0 insertions, 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
49 } 49 }
50 } 50 }
51 51
52 [Fact(Skip = "Sequence number of file from merge module is 0 but should be 1.")]
53 public void CabinetFilesSequencedCorrectlyUsingMergeModule()
54 {
55 var folder = TestData.Get(@"TestData\SimpleMerge");
56
57 using (var fs = new DisposableFileSystem())
58 {
59 var baseFolder = fs.GetFolder();
60 var intermediateFolder = Path.Combine(baseFolder, "obj");
61 var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
62 var cabPath = Path.Combine(baseFolder, @"bin\cab1.cab");
63
64 var result = WixRunner.Execute(new[]
65 {
66 "build",
67 Path.Combine(folder, "Package.wxs"),
68 "-loc", Path.Combine(folder, "Package.en-us.wxl"),
69 "-bindpath", Path.Combine(folder, ".data"),
70 "-intermediateFolder", intermediateFolder,
71 "-o", msiPath
72 });
73
74 result.AssertSuccess();
75 Assert.True(File.Exists(cabPath));
76
77 var fileTable = Query.QueryDatabase(msiPath, new[] { "File" });
78 var fileRows = fileTable.Select(r => new FileRow(r)).OrderBy(f => f.Sequence).ToList();
79
80 Assert.Equal(new[] { 1 }, fileRows.Select(f => f.Sequence).ToArray());
81 WixAssert.CompareLineByLine(new[] { "test.txt" }, fileRows.Select(f => f.Name).ToArray());
82
83 var files = Query.GetCabinetFiles(cabPath);
84 Assert.Equal(fileRows.Select(f => f.Id).ToArray(), files.Select(f => f.Name).ToArray());
85 }
86 }
87
88 private class FileRow 52 private class FileRow
89 { 53 {
90 public FileRow(string row) 54 public FileRow(string row)