From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Wed, 15 Apr 2015 12:21:33 +0000 (+0200)
Subject: SONAR-6303 Fix issue with JaCoCo (and simplify code)
X-Git-Tag: 5.2-RC1~2266
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1ed423756675550bb540020e7aa087c1751e45d4;p=sonarqube.git

SONAR-6303 Fix issue with JaCoCo (and simplify code)
---

diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java
index b37bcc0eef7..fc9a2c33a63 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java
@@ -90,12 +90,8 @@ public class QProfileComparison implements ServerComponent {
     } else {
       ActiveRuleDiff diff = new ActiveRuleDiff();
 
-      if (leftRule.severity().equals(rightRule.severity())) {
-        diff.leftSeverity = diff.rightSeverity = leftRule.severity();
-      } else {
-        diff.leftSeverity = leftRule.severity();
-        diff.rightSeverity = rightRule.severity();
-      }
+      diff.leftSeverity = leftRule.severity();
+      diff.rightSeverity = rightRule.severity();
 
       diff.paramDifference = Maps.difference(leftRule.params(), rightRule.params());
       result.modified.put(key, diff);
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonMediumTest.java
index 2034d966e70..12ba968260e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonMediumTest.java
@@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class QProfileComparisonMediumTest {
 
   @ClassRule
-  public static ServerTester tester = new ServerTester();
+  public static ServerTester tester = new ServerTester().addXoo();
 
   DbClient db;
   DbSession dbSession;