From 758e376cc9fa3a3d2f3518f10e0f0449023c8d79 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 28 Feb 2014 13:10:41 +0100 Subject: [PATCH] Fix drilldown page when project was analyzed before v4.2 --- .../plugins/core/DefaultResourceTypes.java | 66 ++++++++++--------- .../core/DefaultResourceTypesTest.java | 2 +- 2 files changed, 37 insertions(+), 31 deletions(-) diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/DefaultResourceTypes.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/DefaultResourceTypes.java index c331932594d..e5df63744f4 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/DefaultResourceTypes.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/DefaultResourceTypes.java @@ -38,37 +38,43 @@ public final class DefaultResourceTypes extends ExtensionProvider implements Bat public ResourceTypeTree provide() { return ResourceTypeTree.builder() - .addType(ResourceType.builder(Qualifiers.PROJECT) - .setProperty("deletable", true) - .setProperty("supportsGlobalDashboards", true) - .setProperty("modifiable_history", true) - .setProperty("hasRolePolicy", true) - .setProperty(UPDATABLE_KEY, true) - .setProperty(SUPPORTS_MEASURE_FILTERS, true) - .setProperty("comparable", true) - .setProperty(CONFIGURABLE, true) - .build()) - .addType(ResourceType.builder(Qualifiers.MODULE) - .setProperty(UPDATABLE_KEY, true) - .setProperty(SUPPORTS_MEASURE_FILTERS, true) - .setProperty(CONFIGURABLE, true) - .build()) - .addType(ResourceType.builder(Qualifiers.DIRECTORY) - .setProperty(SUPPORTS_MEASURE_FILTERS, true) - .build()) - .addType(ResourceType.builder(Qualifiers.FILE) - .hasSourceCode() - .setProperty(SUPPORTS_MEASURE_FILTERS, true) - .build()) - .addType(ResourceType.builder(Qualifiers.UNIT_TEST_FILE) - .hasSourceCode() - .setProperty(SUPPORTS_MEASURE_FILTERS, true) - .build()) + .addType(ResourceType.builder(Qualifiers.PROJECT) + .setProperty("deletable", true) + .setProperty("supportsGlobalDashboards", true) + .setProperty("modifiable_history", true) + .setProperty("hasRolePolicy", true) + .setProperty(UPDATABLE_KEY, true) + .setProperty(SUPPORTS_MEASURE_FILTERS, true) + .setProperty("comparable", true) + .setProperty(CONFIGURABLE, true) + .build()) + .addType(ResourceType.builder(Qualifiers.MODULE) + .setProperty(UPDATABLE_KEY, true) + .setProperty(SUPPORTS_MEASURE_FILTERS, true) + .setProperty(CONFIGURABLE, true) + .build()) + .addType(ResourceType.builder(Qualifiers.DIRECTORY) + .setProperty(SUPPORTS_MEASURE_FILTERS, true) + .build()) + .addType(ResourceType.builder(Qualifiers.PACKAGE) + .build()) + .addType(ResourceType.builder(Qualifiers.FILE) + .hasSourceCode() + .setProperty(SUPPORTS_MEASURE_FILTERS, true) + .build()) + .addType(ResourceType.builder(Qualifiers.CLASS) + .hasSourceCode() + .build()) + .addType(ResourceType.builder(Qualifiers.UNIT_TEST_FILE) + .hasSourceCode() + .setProperty(SUPPORTS_MEASURE_FILTERS, true) + .build()) - .addRelations(Qualifiers.PROJECT, Qualifiers.MODULE) - .addRelations(Qualifiers.MODULE, Qualifiers.DIRECTORY, Qualifiers.PACKAGE) - .addRelations(Qualifiers.DIRECTORY, Qualifiers.FILE, Qualifiers.UNIT_TEST_FILE) + .addRelations(Qualifiers.PROJECT, Qualifiers.MODULE) + .addRelations(Qualifiers.MODULE, Qualifiers.DIRECTORY, Qualifiers.PACKAGE) + .addRelations(Qualifiers.DIRECTORY, Qualifiers.FILE, Qualifiers.UNIT_TEST_FILE) + .addRelations(Qualifiers.PACKAGE, Qualifiers.CLASS, Qualifiers.UNIT_TEST_FILE) - .build(); + .build(); } } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/DefaultResourceTypesTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/DefaultResourceTypesTest.java index c7feb8b2bc3..aba4d750a07 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/DefaultResourceTypesTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/DefaultResourceTypesTest.java @@ -32,7 +32,7 @@ public class DefaultResourceTypesTest { public void provide_types() { ResourceTypeTree tree = new DefaultResourceTypes().provide(); - assertThat(tree.getTypes()).hasSize(5); + assertThat(tree.getTypes()).hasSize(7); assertThat(tree.getChildren(Qualifiers.PROJECT)).containsExactly(Qualifiers.MODULE); } -- 2.39.5