Exclude null output from report of extracted files.
Bob Arnson committed
Dec 11, 2019 at 21:52 UTC
c53d0d1cc57ce3ed1450adb2c469e2b747584159
2 files changed
+10
-6
src/WixToolset.Core.Native/Cabinet.cs
+1
-1
@@ -108,7 +108,7 @@ namespace WixToolset.Core.Native
108
}
109
110
var wixnative = new WixNativeExe("extractcab", this.Path, outputFolder);
111
- return wixnative.Run();
111
+ return wixnative.Run().Where(output => !String.IsNullOrWhiteSpace(output));
112
}
113
114
#if TOOD_ERROR_HANDLING
src/test/WixToolsetTest.Core.Native/CabinetFixture.cs
+9
-5
@@ -56,9 +56,9 @@ namespace WixToolsetTest.CoreNative
56
var extractFolder = fs.GetFolder(true);
57
58
var cabinet = new Cabinet(cabinetPath);
59
- cabinet.Extract(extractFolder);
60
-
59
+ var reportedFiles = cabinet.Extract(extractFolder);
60
var files = Directory.EnumerateFiles(extractFolder);
61
+ Assert.Equal(reportedFiles, files.Select(f => Path.GetFileName(f)));
62
63
var file = new FileInfo(files.Single());
64
CabInterop.DateTimeToCabDateAndTime(file.CreationTime, out var date, out var time);
@@ -81,7 +81,10 @@ namespace WixToolsetTest.CoreNative
81
82
// Compress.
83
{
84
- var files = new[] { new CabinetCompressFile(TestData.Get(@"TestData\test.txt"), "test.txt") };
84
+ var files = new[] {
85
+ new CabinetCompressFile(TestData.Get(@"TestData\test.txt"), "test1.txt"),
86
+ new CabinetCompressFile(TestData.Get(@"TestData\test.txt"), "test2.txt"),
87
+ };
88
89
var cabinet = new Cabinet(cabinetPath);
90
cabinet.Compress(files, CompressionLevel.Low);
@@ -90,7 +93,8 @@ namespace WixToolsetTest.CoreNative
93
// Extract.
94
{
95
var cabinet = new Cabinet(cabinetPath);
93
- cabinet.Extract(extractFolder);
96
+ var reportedFiles = cabinet.Extract(extractFolder);
97
+ Assert.Equal(2, reportedFiles.Count());
98
}
99
100
// Enumerate to compare cabinet to extracted files.
@@ -100,7 +104,7 @@ namespace WixToolsetTest.CoreNative
104
105
var files = Directory.EnumerateFiles(extractFolder).OrderBy(f => f).ToArray();
106
103
- for (var i =0; i < enumerated.Length; ++i)
107
+ for (var i = 0; i < enumerated.Length; ++i)
108
{
109
var cabFileInfo = enumerated[i];
110
var fileInfo = new FileInfo(files[i]);