This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch fixing-prop-tests-on-windows in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
commit 2807e5fdb8635860422a6a71175d671342324976 Author: Romain Manni-Bucau <rmannibu...@apache.org> AuthorDate: Thu Aug 8 18:51:13 2019 +0200 [MSHADE-322] - fixing windows tests --- .../plugins/shade/resource/properties/PropertiesTransformerTest.java | 2 +- .../apache/maven/plugins/shade/resource/rule/TransformerTesterRule.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/apache/maven/plugins/shade/resource/properties/PropertiesTransformerTest.java b/src/test/java/org/apache/maven/plugins/shade/resource/properties/PropertiesTransformerTest.java index bd5f0e1..e0d105c 100644 --- a/src/test/java/org/apache/maven/plugins/shade/resource/properties/PropertiesTransformerTest.java +++ b/src/test/java/org/apache/maven/plugins/shade/resource/properties/PropertiesTransformerTest.java @@ -62,7 +62,7 @@ public class PropertiesTransformerTest assertEquals( "# Merged by maven-shade-plugin\n" + "b=2\n" + - "a=1\n", os.toString("UTF-8")); + "a=1\n", os.toString("UTF-8").replace( System.lineSeparator(), "\n" ) ); } @Test diff --git a/src/test/java/org/apache/maven/plugins/shade/resource/rule/TransformerTesterRule.java b/src/test/java/org/apache/maven/plugins/shade/resource/rule/TransformerTesterRule.java index 88d3e93..f520d7c 100644 --- a/src/test/java/org/apache/maven/plugins/shade/resource/rule/TransformerTesterRule.java +++ b/src/test/java/org/apache/maven/plugins/shade/resource/rule/TransformerTesterRule.java @@ -107,7 +107,7 @@ public class TransformerTesterRule implements TestRule assertNotNull( expected.path(), content ); assertTrue( expected.path() + ", expected=" + expected.content() + ", actual=" + content, - content.matches( expected.content() ) ); + content.replace( System.lineSeparator(), "\n" ) .matches( expected.content() ) ); } }