Update test to respect new WiX v4 public Id behavior
Rob Mensching committed
Oct 4, 2018 at 14:08 UTC
eb4e0c543148f70a0c442d829848a3e3e1d33a91
2 files changed
+7
-12
src/test/WixToolsetTest.WixCop/TestData/Preprocessor/ConvertedPreprocessor.wxs
+1
-1
@@ -41,7 +41,7 @@
41
</Component>
42
43
<Component Directory="BinFolder">
44
- <File Source="common\wixtoolset.org.ico">
44
+ <File Id="wixtoolset.org.ico" Source="common\wixtoolset.org.ico">
45
<?include ComRegistration.wxi ?>
46
</File>
47
<util:InternetShortcut Id="wixtoolset.org" Directory="ShortcutFolder" Name="WiX Home Page" Target="http://wixtoolset.org/" IconFile="file://[#wixtoolset.org.ico]" />
src/test/WixToolsetTest.WixCop/WixCopFixture.cs
+6
-11
@@ -34,14 +34,9 @@ namespace WixToolsetTest.WixCop
34
35
Assert.Equal(2, result.ExitCode);
36
37
- var actualLines = File.ReadAllLines(targetFile);
38
- var expectedLines = File.ReadAllLines(Path.Combine(folder, afterFileName));
39
-
40
- for (var i = 0; i < actualLines.Length && i < expectedLines.Length; ++i)
41
- {
42
- Assert.Equal(expectedLines[i], actualLines[i]);
43
- }
44
- Assert.Equal(expectedLines.Length, actualLines.Length);
37
+ var expected = File.ReadAllText(Path.Combine(folder, afterFileName));
38
+ var actual = File.ReadAllText(targetFile);
39
+ Assert.Equal(expected, actual);
40
41
var runner2 = new WixCopRunner
42
{
@@ -85,9 +80,9 @@ namespace WixToolsetTest.WixCop
80
81
Assert.Equal(2, result.ExitCode);
82
88
- var actualLines = File.ReadAllLines(targetFile);
89
- var expectedLines = File.ReadAllLines(Path.Combine(folder, afterFileName));
90
- Assert.Equal(expectedLines, actualLines);
83
+ var expected = File.ReadAllText(Path.Combine(folder, afterFileName));
84
+ var actual = File.ReadAllText(targetFile);
85
+ Assert.Equal(expected, actual);
86
87
var runner2 = new WixCopRunner
88
{