Fix quality flaws

6 files changed, 45 insertions, 24 deletions

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboard.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboard.java
index d58987ec998..c0719a2c898 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboard.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboard.java
@@ -46,34 +46,40 @@ public final class GlobalDefaultDashboard extends DashboardTemplate {
   @Override
   public Dashboard createDashboard() {
     Dashboard dashboard = Dashboard.create()
-        .setGlobal(true)
-        .setLayout(DashboardLayout.TWO_COLUMNS);
+      .setGlobal(true)
+      .setLayout(DashboardLayout.TWO_COLUMNS);
 
     dashboard.addWidget(WelcomeWidget.ID, 1);
+    addMyFavouritesWidget(dashboard);
+    addProjectsWidgets(dashboard);
 
+    return dashboard;
+  }
+
+  private void addMyFavouritesWidget(Dashboard dashboard) {
     MeasureFilterDto filter = findSystemFilter(MyFavouritesFilter.NAME);
     if (filter != null) {
       dashboard
-          .addWidget(MeasureFilterListWidget.ID, 1)
-          .setProperty(MeasureFilterListWidget.FILTER_PROPERTY, filter.getId().toString())
-          .setProperty(MeasureFilterListWidget.PAGE_SIZE_PROPERTY, "50");
+        .addWidget(MeasureFilterListWidget.ID, 1)
+        .setProperty(MeasureFilterListWidget.FILTER_PROPERTY, filter.getId().toString())
+        .setProperty(MeasureFilterListWidget.PAGE_SIZE_PROPERTY, "50");
     }
+  }
 
-    filter = findSystemFilter(ProjectFilter.NAME);
+  private void addProjectsWidgets(Dashboard dashboard) {
+    MeasureFilterDto filter = findSystemFilter(ProjectFilter.NAME);
     if (filter != null) {
       dashboard
-          .addWidget(MeasureFilterListWidget.ID, 2)
-          .setProperty(MeasureFilterListWidget.FILTER_PROPERTY, filter.getId().toString())
-          .setProperty(MeasureFilterListWidget.PAGE_SIZE_PROPERTY, "20");
+        .addWidget(MeasureFilterListWidget.ID, 2)
+        .setProperty(MeasureFilterListWidget.FILTER_PROPERTY, filter.getId().toString())
+        .setProperty(MeasureFilterListWidget.PAGE_SIZE_PROPERTY, "20");
 
       dashboard
-          .addWidget(MeasureFilterTreemapWidget.ID, 2)
-          .setProperty(MeasureFilterListWidget.FILTER_PROPERTY, filter.getId().toString())
-          .setProperty(MeasureFilterTreemapWidget.SIZE_METRIC_PROPERTY, "ncloc")
-          .setProperty(MeasureFilterTreemapWidget.COLOR_METRIC_PROPERTY, "violations_density");
+        .addWidget(MeasureFilterTreemapWidget.ID, 2)
+        .setProperty(MeasureFilterListWidget.FILTER_PROPERTY, filter.getId().toString())
+        .setProperty(MeasureFilterTreemapWidget.SIZE_METRIC_PROPERTY, "ncloc")
+        .setProperty(MeasureFilterTreemapWidget.COLOR_METRIC_PROPERTY, "violations_density");
     }
-
-    return dashboard;
   }
 
   @Override
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ActionPlansWidget.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ActionPlansWidget.java
index 6964ec72987..f64f68ad1a1 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ActionPlansWidget.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ActionPlansWidget.java
@@ -24,6 +24,6 @@ import org.sonar.api.web.WidgetCategory;
 @WidgetCategory({"Action plans", "Reviews"})
 public class ActionPlansWidget extends CoreWidget {
   public ActionPlansWidget() {
-    super("action_plans", "Action plans", "/org/sonar/plugins/core/widgets/actionPlans/action_plans.html.erb");
+    super("action_plans", "Action plans", "/org/sonar/plugins/core/widgets/action_plans.html.erb");
   }
 }
\ No newline at end of file
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/MeasureFilterListWidget.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/MeasureFilterListWidget.java
index a5f4e4612c5..a551f35d74e 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/MeasureFilterListWidget.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/MeasureFilterListWidget.java
@@ -39,7 +39,6 @@ public class MeasureFilterListWidget extends CoreWidget {
   public static final String ID = "measure_filter_list";
 
   public MeasureFilterListWidget() {
-    super(ID, "Measure Filter as List",
-      "/org/sonar/plugins/core/widgets/measure_filter_list.html.erb");
+    super(ID, "Measure Filter as List", "/org/sonar/plugins/core/widgets/measure_filter_list.html.erb");
   }
 }
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/actionPlans/action_plans.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/action_plans.html.erb
index 208641dca2b..208641dca2b 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/actionPlans/action_plans.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/action_plans.html.erb
diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboardTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboardTest.java
index 2081d92c499..83772b25ac0 100644
--- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboardTest.java
+++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboardTest.java
@@ -61,11 +61,11 @@ public class GlobalDefaultDashboardTest {
   @Test
   public void should_create_global_dashboard_with_four_widgets() {
     when(dao.findSystemFilterByName(MyFavouritesFilter.NAME)).thenReturn(
-        new MeasureFilterDto().setId(100L)
-        );
+      new MeasureFilterDto().setId(100L)
+    );
     when(dao.findSystemFilterByName(ProjectFilter.NAME)).thenReturn(
-        new MeasureFilterDto().setId(101L)
-        );
+      new MeasureFilterDto().setId(101L)
+    );
     Dashboard dashboard = template.createDashboard();
     List<Widget> firstColumn = dashboard.getWidgetsOfColumn(1);
     assertThat(firstColumn).hasSize(2);
@@ -80,4 +80,18 @@ public class GlobalDefaultDashboardTest {
     assertThat(secondColumn.get(1).getId()).isEqualTo(MeasureFilterTreemapWidget.ID);
     assertThat(secondColumn.get(1).getProperty("filter")).isEqualTo("101");
   }
+
+  @Test
+  public void should_not_fail_if_filter_widgets_not_found() {
+    when(dao.findSystemFilterByName(MyFavouritesFilter.NAME)).thenReturn(null);
+    when(dao.findSystemFilterByName(ProjectFilter.NAME)).thenReturn(null);
+
+    Dashboard dashboard = template.createDashboard();
+    List<Widget> firstColumn = dashboard.getWidgetsOfColumn(1);
+    assertThat(firstColumn).hasSize(1);
+    assertThat(firstColumn.get(0).getId()).isEqualTo(WelcomeWidget.ID);
+
+    List<Widget> secondColumn = dashboard.getWidgetsOfColumn(2);
+    assertThat(secondColumn).isEmpty();
+  }
 }
diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/widgets/CoreWidgetsTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/widgets/CoreWidgetsTest.java
index 19393c20e11..831c922268f 100644
--- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/widgets/CoreWidgetsTest.java
+++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/widgets/CoreWidgetsTest.java
@@ -72,14 +72,16 @@ public class CoreWidgetsTest {
   @Test
   public void should_find_templates() {
     for (CoreWidget widget : widgets()) {
-      assertThat(widget.getClass().getResource(widget.getTemplatePath())).isNotNull();
+      assertThat(widget.getClass().getResource(widget.getTemplatePath()))
+        .as("Template not found: " + widget.getTemplatePath())
+        .isNotNull();
     }
   }
 
   @Test
   public void should_be_registered_as_an_extension() {
     for (CoreWidget widget : widgets()) {
-      assertThat(new CorePlugin().getExtensions()).contains(widget.getClass());
+      assertThat(new CorePlugin().getExtensions()).as("Widget not registered: " + widget.getClass()).contains(widget.getClass());
     }
   }