You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2016/05/15 08:05:33 UTC
svn commit: r1743889 -
/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java
Author: hboutemy
Date: Sun May 15 08:05:33 2016
New Revision: 1743889
URL: http://svn.apache.org/viewvc?rev=1743889&view=rev
Log:
fixed unit test failing under Windows
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java
Modified: maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java?rev=1743889&r1=1743888&r2=1743889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java Sun May 15 08:05:33 2016
@@ -73,7 +73,7 @@ public class ServiceResourceTransformerT
InputStream entryStream = jarFile.getInputStream( jarEntry );
try {
String xformedContent = IOUtils.toString(entryStream, "utf-8");
- assertEquals("borg.foo.Service\n", xformedContent);
+ assertEquals("borg.foo.Service" + System.getProperty( "line.separator" ), xformedContent);
} finally {
IOUtils.closeQuietly( entryStream );
jarFile.close();
@@ -124,7 +124,7 @@ public class ServiceResourceTransformerT
try {
String xformedContent = IOUtils.toString(entryStream, "utf-8");
// must be two lines, with our two classes.
- String[] classes = xformedContent.split("\n");
+ String[] classes = xformedContent.split("\r?\n");
boolean h1 = false;
boolean h2 = false;
for ( String name : classes )