diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/WixToolsetTest.WixCop/TestData/Preprocessor/ConvertedPreprocessor.wxs | 2 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.WixCop/WixCopFixture.cs | 17 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/ConvertedPreprocessor.wxs b/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/ConvertedPreprocessor.wxs index d6280185..dcd43e35 100644 --- a/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/ConvertedPreprocessor.wxs +++ b/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/ConvertedPreprocessor.wxs | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | </Component> | 41 | </Component> |
| 42 | 42 | ||
| 43 | <Component Directory="BinFolder"> | 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 ?> | 45 | <?include ComRegistration.wxi ?> |
| 46 | </File> | 46 | </File> |
| 47 | <util:InternetShortcut Id="wixtoolset.org" Directory="ShortcutFolder" Name="WiX Home Page" Target="http://wixtoolset.org/" IconFile="file://[#wixtoolset.org.ico]" /> | 47 | <util:InternetShortcut Id="wixtoolset.org" Directory="ShortcutFolder" Name="WiX Home Page" Target="http://wixtoolset.org/" IconFile="file://[#wixtoolset.org.ico]" /> |
diff --git a/src/test/WixToolsetTest.WixCop/WixCopFixture.cs b/src/test/WixToolsetTest.WixCop/WixCopFixture.cs index 1025eac8..2bbc3d9f 100644 --- a/src/test/WixToolsetTest.WixCop/WixCopFixture.cs +++ b/src/test/WixToolsetTest.WixCop/WixCopFixture.cs | |||
| @@ -34,14 +34,9 @@ namespace WixToolsetTest.WixCop | |||
| 34 | 34 | ||
| 35 | Assert.Equal(2, result.ExitCode); | 35 | Assert.Equal(2, result.ExitCode); |
| 36 | 36 | ||
| 37 | var actualLines = File.ReadAllLines(targetFile); | 37 | var expected = File.ReadAllText(Path.Combine(folder, afterFileName)); |
| 38 | var expectedLines = File.ReadAllLines(Path.Combine(folder, afterFileName)); | 38 | var actual = File.ReadAllText(targetFile); |
| 39 | 39 | Assert.Equal(expected, actual); | |
| 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); | ||
| 45 | 40 | ||
| 46 | var runner2 = new WixCopRunner | 41 | var runner2 = new WixCopRunner |
| 47 | { | 42 | { |
| @@ -85,9 +80,9 @@ namespace WixToolsetTest.WixCop | |||
| 85 | 80 | ||
| 86 | Assert.Equal(2, result.ExitCode); | 81 | Assert.Equal(2, result.ExitCode); |
| 87 | 82 | ||
| 88 | var actualLines = File.ReadAllLines(targetFile); | 83 | var expected = File.ReadAllText(Path.Combine(folder, afterFileName)); |
| 89 | var expectedLines = File.ReadAllLines(Path.Combine(folder, afterFileName)); | 84 | var actual = File.ReadAllText(targetFile); |
| 90 | Assert.Equal(expectedLines, actualLines); | 85 | Assert.Equal(expected, actual); |
| 91 | 86 | ||
| 92 | var runner2 = new WixCopRunner | 87 | var runner2 = new WixCopRunner |
| 93 | { | 88 | { |
