SONAR-5329 Activate Medium Test to search profile by keys having dashes

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb
index 97240a5b2778e8d24a18a226d0ea5a2401a6261a..69d86d036e0a7d8afeb609fede31d4daf6485545 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb
@@ -44,7 +44,7 @@
             <br/>
           <% end %>
           <% change.parameters().each do |param_key, param_value| %>
-            <% if param_value %>
+            <% unless param_value.empty? %>
               <%= message('quality_profiles.parameter_set_to_x', :params => [param_key, param_value]) -%>
             <% else %>
               <%= message('quality_profiles.changelog.parameter_reset_to_default_value_x', :params => [param_key]) -%>

diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java
index 565e6c43d43fc6332b1f923229f192add99bd59a..72f743c0c8db1bb8dc6860aa21178c311ad8ce2f 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java
@@ -21,7 +21,10 @@ package org.sonar.server.qualityprofile;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.RuleStatus;
 import org.sonar.api.rule.Severity;
@@ -254,9 +257,7 @@ public class QProfileServiceMediumTest {
   }
 
   @Test
-  @Ignore
   public void search_activity_by_qprofile_having_dashes_in_keys() throws InterruptedException {
-
     tester.get(ActivityService.class).write(dbSession, Activity.Type.QPROFILE,
       ActiveRuleChange.createFor(ActiveRuleChange.Type.ACTIVATED, ActiveRuleKey.of("java-default", RuleTesting.XOO_X1)));
     tester.get(ActivityService.class).write(dbSession, Activity.Type.QPROFILE,