Automatic merge from master

* origin/master:
  fix source viewer test
  Add search the ability to search for rules by profiles in RubyRuleService Needed to fix SQALE-269
  SONAR-5884 show ut and it coverage separately
  SONAR-5884 show ut and it coverage separately
  SONAR-5884 Apply feedback on unit test and field names
  SONAR-5884 Replace overall coverage with UT coverage, add IT coverage info
  Revert "SONAR-6202 Compute overall coverage on all files"
  SONAR-5077 Display ncloc of files with no language in size widget
  SONAR-6233 Searching for rules without debt characteristic is not working
  fix bug with extra duplicated line in the popup
  fix bug with extra duplicated line
  Fix quality flaws
  update events widget
  Update version of Git and SVN plugins to 1.0

5 files changed, 14 insertions, 204 deletions

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java
index 8dd1801b406..5a4962b256f 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java
@@ -281,7 +281,6 @@ public final class CorePlugin extends SonarPlugin {
       DirectoriesDecorator.class,
       FilesDecorator.class,
       ManualMeasureDecorator.class,
-      MissingOverallCoverageDecorator.class,
 
       // time machine
       TendencyDecorator.class,
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/MissingOverallCoverageDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/MissingOverallCoverageDecorator.java
deleted file mode 100644
index bdae925a865..00000000000
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/MissingOverallCoverageDecorator.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * SonarQube is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * SonarQube is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonar.plugins.core.sensors;
-
-import org.sonar.api.batch.Decorator;
-import org.sonar.api.batch.DecoratorContext;
-import org.sonar.api.batch.DependedUpon;
-import org.sonar.api.batch.DependsUpon;
-import org.sonar.api.measures.CoreMetrics;
-import org.sonar.api.measures.CoverageMeasuresBuilder;
-import org.sonar.api.measures.Measure;
-import org.sonar.api.measures.MeasureUtils;
-import org.sonar.api.measures.Metric;
-import org.sonar.api.resources.Project;
-import org.sonar.api.resources.Qualifiers;
-import org.sonar.api.resources.Resource;
-
-import java.util.List;
-
-/**
- * Compute overall coverage when it was not already saved by language plugin.
- */
-public final class MissingOverallCoverageDecorator implements Decorator {
-
-  @DependsUpon
-  public Metric dependsUpon() {
-    return CoreMetrics.LINES_TO_COVER;
-  }
-
-  @DependedUpon
-  public List<Metric> provides() {
-    return CoverageMeasuresBuilder.CoverageType.OVERALL.all();
-  }
-
-  @Override
-  public boolean shouldExecuteOnProject(Project project) {
-    return true;
-  }
-
-  @Override
-  public void decorate(Resource resource, DecoratorContext context) {
-    if (Qualifiers.isFile(resource) && !MeasureUtils.hasValue(context.getMeasure(CoreMetrics.OVERALL_LINES_TO_COVER))) {
-      copyMeasure(context, CoreMetrics.LINES_TO_COVER, CoreMetrics.OVERALL_LINES_TO_COVER);
-      copyMeasure(context, CoreMetrics.UNCOVERED_LINES, CoreMetrics.OVERALL_UNCOVERED_LINES);
-      copyMeasure(context, CoreMetrics.COVERAGE_LINE_HITS_DATA, CoreMetrics.OVERALL_COVERAGE_LINE_HITS_DATA);
-      copyMeasure(context, CoreMetrics.CONDITIONS_TO_COVER, CoreMetrics.OVERALL_CONDITIONS_TO_COVER);
-      copyMeasure(context, CoreMetrics.UNCOVERED_CONDITIONS, CoreMetrics.OVERALL_UNCOVERED_CONDITIONS);
-      copyMeasure(context, CoreMetrics.CONDITIONS_BY_LINE, CoreMetrics.OVERALL_CONDITIONS_BY_LINE);
-      copyMeasure(context, CoreMetrics.COVERED_CONDITIONS_BY_LINE, CoreMetrics.OVERALL_COVERED_CONDITIONS_BY_LINE);
-    }
-  }
-
-  private void copyMeasure(DecoratorContext context, Metric<?> from, Metric<?> to) {
-    Measure sourceMeasure = context.getMeasure(from);
-    if (sourceMeasure != null) {
-      Double value = sourceMeasure.getValue();
-      if (value != null) {
-        context.saveMeasure(to, value);
-      } else if (sourceMeasure.hasData()) {
-        context.saveMeasure(new Measure(to, sourceMeasure.getData()));
-      }
-    }
-
-  }
-}
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/events.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/events.html.erb
index 1ee56e96fcf..9f0381f48cb 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/events.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/events.html.erb
@@ -111,7 +111,7 @@
   <span class="empty_widget"><%= message('widget.events.no_event') -%></span>
 </div>
 
-<a href="#" onclick="showAllEvents(<%= widget.id -%>);" id="show_more_events_<%= widget.id -%>" class="action"><%= message('widget.events.show_more') -%></a>
+<a href="#" onclick="showAllEvents(<%= widget.id -%>);return false;" id="show_more_events_<%= widget.id -%>" class="action"><%= message('widget.events.show_all') -%></a>
 
 <script type="text/javascript">
   changeCategory('all', <%= widget.id -%>);
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/size.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/size.html.erb
index 0a28f86c05c..9e0797f8005 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/size.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/size.html.erb
@@ -49,8 +49,12 @@
               %>
                 <tr>
                   <td>
-                    <% language = languages.find { |l| l.getKey()==language_key.to_s } -%>
-                    <%= language ? language.getName() : language_key -%>
+                    <% if  language_key.eql? '<null>' %>
+                      <%= message('other') -%>
+                    <% else %>
+                      <% language = languages.find { |l| l.getKey()==language_key.to_s } -%>
+                      <%= language ? language.getName() : language_key -%>
+                    <% end %>
                   </td>
                   <td class="thin right nowrap">
                     <%= ncloc.format_numeric_value(language_ncloc) %>
@@ -73,11 +77,14 @@
               });
             </script>
           <% else %>
-            <%
+            <% 
               language_key = ncloc_language_dist_hash.first[0]
-              language = languages.find { |l| l.getKey()==language_key.to_s }
-            -%>
-            <%= language ? language.getName() : language_key -%>
+              if  language_key.eql? '<null>' %>
+              <%= message('other') -%>
+            <% else %>
+              <% language = languages.find { |l| l.getKey()==language_key.to_s } -%>
+              <%= language ? language.getName() : language_key -%>
+            <% end %>
           <% end %>
         <% end %>
       <% else %>
diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/MissingOverallCoverageDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/MissingOverallCoverageDecoratorTest.java
deleted file mode 100644
index c94eb3bce52..00000000000
--- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/MissingOverallCoverageDecoratorTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * SonarQube is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * SonarQube is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonar.plugins.core.sensors;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.sonar.api.batch.DecoratorContext;
-import org.sonar.api.measures.CoreMetrics;
-import org.sonar.api.measures.Measure;
-import org.sonar.api.resources.Directory;
-import org.sonar.api.resources.File;
-import org.sonar.api.resources.Java;
-import org.sonar.api.resources.Project;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.anyDouble;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-public class MissingOverallCoverageDecoratorTest {
-
-  private MissingOverallCoverageDecorator decorator;
-
-  @Before
-  public void prepare() {
-    decorator = new MissingOverallCoverageDecorator();
-  }
-
-  @Test
-  public void increaseCoverage() {
-    assertThat(decorator.provides()).isNotEmpty();
-    assertThat(decorator.dependsUpon()).isEqualTo(CoreMetrics.LINES_TO_COVER);
-    assertThat(decorator.shouldExecuteOnProject(new Project("foo"))).isTrue();
-  }
-
-  @Test
-  public void testExecuteOnlyOnMainFile() {
-    DecoratorContext context = mock(DecoratorContext.class);
-    decorator.decorate(File.create("test/FooTest.java", Java.INSTANCE, true), context);
-    decorator.decorate(Directory.create("src"), context);
-    decorator.decorate(new Project("foo"), context);
-    verifyNoMoreInteractions(context);
-  }
-
-  @Test
-  public void dontDoAnythingIfOverallCoverageAlreadyDefined() {
-    DecoratorContext context = mock(DecoratorContext.class);
-    File file = File.create("src/Foo.java");
-
-    when(context.getMeasure(CoreMetrics.OVERALL_LINES_TO_COVER)).thenReturn(new Measure<>(CoreMetrics.OVERALL_LINES_TO_COVER, 0.0));
-
-    decorator.decorate(file, context);
-
-    verify(context, never()).saveMeasure(eq(CoreMetrics.OVERALL_LINES_TO_COVER), anyDouble());
-  }
-
-  @Test
-  public void testCopyUnitTestMeasures() {
-    DecoratorContext context = mock(DecoratorContext.class);
-    File file = File.create("src/Foo.java");
-
-    when(context.getMeasure(CoreMetrics.LINES_TO_COVER)).thenReturn(new Measure<>(CoreMetrics.LINES_TO_COVER, 10.0));
-    when(context.getMeasure(CoreMetrics.UNCOVERED_LINES)).thenReturn(new Measure<>(CoreMetrics.UNCOVERED_LINES, 5.0));
-    when(context.getMeasure(CoreMetrics.COVERAGE_LINE_HITS_DATA)).thenReturn(new Measure<>(CoreMetrics.COVERAGE_LINE_HITS_DATA, "1=1;2=2;"));
-    when(context.getMeasure(CoreMetrics.CONDITIONS_TO_COVER)).thenReturn(new Measure<>(CoreMetrics.CONDITIONS_TO_COVER, 2.0));
-    when(context.getMeasure(CoreMetrics.UNCOVERED_CONDITIONS)).thenReturn(new Measure<>(CoreMetrics.UNCOVERED_CONDITIONS, 1.0));
-    when(context.getMeasure(CoreMetrics.CONDITIONS_BY_LINE)).thenReturn(new Measure<>(CoreMetrics.CONDITIONS_BY_LINE, "1=4"));
-    when(context.getMeasure(CoreMetrics.COVERED_CONDITIONS_BY_LINE)).thenReturn(new Measure<>(CoreMetrics.COVERED_CONDITIONS_BY_LINE, "1=2"));
-
-    decorator.decorate(file, context);
-
-    verify(context).saveMeasure(CoreMetrics.OVERALL_LINES_TO_COVER, 10.0);
-    verify(context).saveMeasure(CoreMetrics.OVERALL_UNCOVERED_LINES, 5.0);
-    verify(context).saveMeasure(new Measure(CoreMetrics.OVERALL_COVERAGE_LINE_HITS_DATA, "1=1;2=2;"));
-    verify(context).saveMeasure(CoreMetrics.OVERALL_CONDITIONS_TO_COVER, 2.0);
-    verify(context).saveMeasure(CoreMetrics.OVERALL_UNCOVERED_CONDITIONS, 1.0);
-    verify(context).saveMeasure(new Measure(CoreMetrics.OVERALL_CONDITIONS_BY_LINE, "1=4"));
-    verify(context).saveMeasure(new Measure(CoreMetrics.OVERALL_COVERED_CONDITIONS_BY_LINE, "1=2"));
-  }
-
-  @Test
-  public void dontFailOnBrokenValues() {
-    DecoratorContext context = mock(DecoratorContext.class);
-    File file = File.create("src/Foo.java");
-
-    when(context.getMeasure(CoreMetrics.LINES_TO_COVER)).thenReturn(new Measure<>(CoreMetrics.LINES_TO_COVER, 10.0));
-    when(context.getMeasure(CoreMetrics.COVERAGE_LINE_HITS_DATA)).thenReturn(new Measure<>(CoreMetrics.COVERAGE_LINE_HITS_DATA));
-
-    decorator.decorate(file, context);
-
-    verify(context).saveMeasure(CoreMetrics.OVERALL_LINES_TO_COVER, 10.0);
-  }
-}