You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/06/08 16:46:24 UTC

[maven-checkstyle-plugin] branch MCHECKSTYLE-54 updated: [MCHECKSTYLE-54] Do rewrite every sourcefile

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

rfscholte pushed a commit to branch MCHECKSTYLE-54
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git


The following commit(s) were added to refs/heads/MCHECKSTYLE-54 by this push:
     new 3570694  [MCHECKSTYLE-54] Do rewrite every sourcefile
3570694 is described below

commit 3570694d9059a0b9b3356444eb8b2a81f00eee29
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Jun 8 18:46:09 2019 +0200

    [MCHECKSTYLE-54] Do rewrite every sourcefile
---
 src/it/MCHECKSTYLE-54/setup.groovy  | 2 +-
 src/it/MCHECKSTYLE-54/verify.groovy | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/it/MCHECKSTYLE-54/setup.groovy b/src/it/MCHECKSTYLE-54/setup.groovy
index d9447ec..e51047b 100644
--- a/src/it/MCHECKSTYLE-54/setup.groovy
+++ b/src/it/MCHECKSTYLE-54/setup.groovy
@@ -20,6 +20,6 @@
 def srcDir = new File(basedir, 'src/main/java')
 
 srcDir.eachFileRecurse (groovy.io.FileType.FILES) { 
-    it.text.replaceAll( ~ /(\r\n|\r|\n)/, System.lineSeparator() )
+  it.text = it.text.replaceAll( ~ /(\r\n|\r|\n)/, System.lineSeparator() )
 }
 return true;
\ No newline at end of file
diff --git a/src/it/MCHECKSTYLE-54/verify.groovy b/src/it/MCHECKSTYLE-54/verify.groovy
index 05ca34a..81e714d 100644
--- a/src/it/MCHECKSTYLE-54/verify.groovy
+++ b/src/it/MCHECKSTYLE-54/verify.groovy
@@ -21,6 +21,6 @@ def eol = System.lineSeparator().bytes
 def srcFile = new File(basedir, 'src/main/java/org/apache/maven/plugins/checkstyle/mcheckstyle54/Mcheckstyle54.java').text
 
 def matcher = srcFile =~ /(\r\n|\r|\n)/ 
-assert matcher[0][0].bytes == eol
+assert matcher[0][0].bytes == eol : "EOL in file should have been ${eol} but was ${matcher[0][0].bytes}"
 
 assert new File(basedir,'build.log').text.contains('BUILD SUCCESS')
\ No newline at end of file