From eb4e0c543148f70a0c442d829848a3e3e1d33a91 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 4 Oct 2018 14:08:33 -0700
Subject: Update test to respect new WiX v4 public Id behavior

---
 .../TestData/Preprocessor/ConvertedPreprocessor.wxs     |  2 +-
 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 @@
             </Component>
 
             <Component Directory="BinFolder">
-                <File Source="common\wixtoolset.org.ico">
+                <File Id="wixtoolset.org.ico" Source="common\wixtoolset.org.ico">
                   <?include ComRegistration.wxi ?>
                 </File>
                 <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
 
                 Assert.Equal(2, result.ExitCode);
 
-                var actualLines = File.ReadAllLines(targetFile);
-                var expectedLines = File.ReadAllLines(Path.Combine(folder, afterFileName));
-
-                for (var i = 0; i < actualLines.Length && i < expectedLines.Length; ++i)
-                {
-                    Assert.Equal(expectedLines[i], actualLines[i]);
-                }
-                Assert.Equal(expectedLines.Length, actualLines.Length);
+                var expected = File.ReadAllText(Path.Combine(folder, afterFileName));
+                var actual = File.ReadAllText(targetFile);
+                Assert.Equal(expected, actual);
 
                 var runner2 = new WixCopRunner
                 {
@@ -85,9 +80,9 @@ namespace WixToolsetTest.WixCop
 
                 Assert.Equal(2, result.ExitCode);
 
-                var actualLines = File.ReadAllLines(targetFile);
-                var expectedLines = File.ReadAllLines(Path.Combine(folder, afterFileName));
-                Assert.Equal(expectedLines, actualLines);
+                var expected = File.ReadAllText(Path.Combine(folder, afterFileName));
+                var actual = File.ReadAllText(targetFile);
+                Assert.Equal(expected, actual);
 
                 var runner2 = new WixCopRunner
                 {
-- 
cgit v1.2.3-55-g6feb