You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2019/07/01 10:34:42 UTC

[maven-site-plugin] branch MSITE-842 updated: Normalize line endings

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch MSITE-842
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git


The following commit(s) were added to refs/heads/MSITE-842 by this push:
     new b05d199  Normalize line endings
b05d199 is described below

commit b05d199d32a7a6eb6733190243280eb4444507ca
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jul 1 12:34:37 2019 +0200

    Normalize line endings
---
 src/it/projects/MSITE-842/verify.groovy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/it/projects/MSITE-842/verify.groovy b/src/it/projects/MSITE-842/verify.groovy
index 956ddf4..d9c4001 100644
--- a/src/it/projects/MSITE-842/verify.groovy
+++ b/src/it/projects/MSITE-842/verify.groovy
@@ -26,19 +26,19 @@ resultFile = new File(basedir, "target/site/MSITE-842.html");
 expectedFile = new File(basedir, "src/it/MSITE-842.html");
 
 assert resultFile.exists() && resultFile.isFile()
-assert resultFile.text.equals(expectedFile.text)
+assert resultFile.text.replaceAll("\r?\n", "\n").equals(expectedFile.text.replaceAll("\r?\n", "\n"))
 
 // Check another-page.html (must exist and be exactly like the model
 resultFile = new File(basedir, "target/site/another-page.html");
 expectedFile = new File(basedir, "src/it/another-page.html");
 
 assert resultFile.exists() && resultFile.isFile()
-assert resultFile.text.equals(expectedFile.text)
+assert resultFile.text.replaceAll("\r?\n", "\n").equals(expectedFile.text.replaceAll("\r?\n", "\n"))
 
 // Check sub/sub.html (must exist and be exactly like the model
 resultFile = new File(basedir, "target/site/sub/sub.html");
 expectedFile = new File(basedir, "src/it/sub/sub.html");
 
 assert resultFile.exists() && resultFile.isFile()
-assert resultFile.text.equals(expectedFile.text)
+assert resultFile.text.replaceAll("\r?\n", "\n").equals(expectedFile.text.replaceAll("\r?\n", "\n"))