Fix build on windows

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 ec198929714000ff68ba8a0547928e09b66cd76b..7814c072c732d9abafdd573eb418bd542a95f519 100644 (file)
--- 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);
   }