summaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-web/archiva-webapp/src/test
diff options
context:
space:
mode:
authorJames William Dumay <jdumay@apache.org>2008-11-24 03:16:29 +0000
committerJames William Dumay <jdumay@apache.org>2008-11-24 03:16:29 +0000
commite92550d80f0b4eed196433a61a2a9cda5d8c418a (patch)
tree0227781c998309d8a4fc458242aa907604f89683 /archiva-modules/archiva-web/archiva-webapp/src/test
parentba4bf4402d46713eb4b36b61e053db6c3a6494bc (diff)
downloadarchiva-e92550d80f0b4eed196433a61a2a9cda5d8c418a.tar.gz
archiva-e92550d80f0b4eed196433a61a2a9cda5d8c418a.zip
MRM-1020 - Fix the crazy alpaca on Windows. Submitted by Martin Cooper
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@720105 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-webapp/src/test')
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/startup/BannerTest.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/startup/BannerTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/startup/BannerTest.java
index 2c5b5fc77..8db84ea35 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/startup/BannerTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/startup/BannerTest.java
@@ -36,6 +36,8 @@ import junit.framework.TestCase;
public class BannerTest
extends TestCase
{
+ private static final String eol = System.getProperty("line.separator");
+
private void assertEncodeDecode( String encoded, String decoded )
{
assertEquals( "Encoding: ", encoded, Banner.encode( decoded ) );
@@ -45,7 +47,7 @@ public class BannerTest
public void testEncodeDecode()
{
assertEncodeDecode( "[$10 ]", "[ ]" );
- assertEncodeDecode( "$$$5_$n$5_", "$_____\n_____" );
+ assertEncodeDecode( "$$$5_$n$5_", "$_____"+eol+"_____" );
assertEncodeDecode( "$${Refgjuvyr}", "${Erstwhile}" );
}
@@ -54,8 +56,8 @@ public class BannerTest
assertEquals( "[ 1.0 ]", Banner.injectVersion( "[#####]", "1.0" ) );
assertEquals( ".\\ 1.0-SNAPSHOT \\._____", Banner.injectVersion( ".\\################\\._____",
"1.0-SNAPSHOT" ) );
- assertEquals( "Archiva:\n ( 1.0-alpha-1 )", Banner
- .injectVersion( "Archiva:\n (##############)", "1.0-alpha-1" ) );
+ assertEquals( "Archiva:\"+eol+\" ( 1.0-alpha-1 )", Banner
+ .injectVersion( "Archiva:\"+eol+\" (##############)", "1.0-alpha-1" ) );
}
public void testGetBanner()