From 225567aecb0583a79ddc4d34de50527cf890d77f Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Tue, 4 Jun 2013 09:19:08 +0200 Subject: [PATCH] Fix build on windows --- .../core/issue/notification/IssueChangesEmailTemplateTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest.java index ec198929714..7814c072c73 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest.java @@ -19,6 +19,7 @@ */ package org.sonar.plugins.core.issue.notification; +import org.apache.commons.lang.StringUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -78,6 +79,7 @@ public class IssueChangesEmailTemplateTest { String message = email.getMessage(); String expectedMessage = TestUtils.getResourceContent("/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest/email_with_changes.txt"); + expectedMessage = StringUtils.remove(expectedMessage, '\r'); assertThat(message).isEqualTo(expectedMessage); assertThat(email.getFrom()).isNull(); } @@ -98,6 +100,7 @@ public class IssueChangesEmailTemplateTest { EmailMessage email = template.format(notification); String message = email.getMessage(); String expectedMessage = TestUtils.getResourceContent("/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest/email_with_issue_message_same_than_rule_name.txt"); + expectedMessage = StringUtils.remove(expectedMessage, '\r'); assertThat(message).isEqualTo(expectedMessage); } -- 2.39.5