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 b37bcc0eef718f891a47c8a7bb57bcae34f5b85e..fc9a2c33a63736a02c4823a1a75b985d3282d2ab 100644 (file)
--- 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 2034d966e70a32672936a16af08699fd7dcbdc2b..12ba968260e7cb0bf0cf2fef8487f6b93a1e75ab 100644 (file)
--- 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;