SONAR-5941 add component key

diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java
index 34872621bb1d68f3d8f85f7b30a10b0975dfc2b1..c5132c9c93488a2bfc75477634c70312c33e5588 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java
@@ -128,6 +128,7 @@ public class ComponentAppAction implements RequestHandler {
       );
     boolean isFavourite = propertyDtos.size() == 1;
 
+    json.prop("key", component.key());
     json.prop("uuid", component.uuid());
     json.prop("path", component.path());
     json.prop("name", component.name());

diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java
index af7964d51c1ec9bbede7ce5ae4c977990fefde10..4f1ddb7aeb6b2eeadae41d1448307d1183e88f58 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java
@@ -39,7 +39,6 @@ import org.sonar.core.persistence.DbSession;
 import org.sonar.core.properties.PropertiesDao;
 import org.sonar.core.properties.PropertyDto;
 import org.sonar.core.properties.PropertyQuery;
-import org.sonar.core.resource.ResourceDao;
 import org.sonar.server.component.ComponentTesting;
 import org.sonar.server.component.db.ComponentDao;
 import org.sonar.server.db.DbClient;

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app.json
index 5635baae3f9843e75a32e9c20d08c5d0a8e1ad2a..201fc70537f699cb81fff8073bae337411e65598 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app.json
@@ -1,4 +1,5 @@
 {
+  "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
   "uuid": "ABCDE",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension.json
deleted file mode 100644 (file)
index c0b27c2..0000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
-  "longName": "src/main/java/org/sonar/api/Plugin.java",
-  "path": "src/main/java/org/sonar/api/Plugin.java",
-  "name": "Plugin.java",
-  "q": "FIL",
-  "subProject": "org.codehaus.sonar:sonar-plugin-api",
-  "subProjectName": "SonarQube :: Plugin API",
-  "project": "org.codehaus.sonar:sonar",
-  "projectName": "SonarQube",
-  "fav": false,
-  "canMarkAsFavourite": false,
-  "canBulkChange": false,
-  "canCreateManualIssue": false,
-  "periods": [],
-  "severities": [],
-  "rules": [],
-  "measures": {},
-  "extensions": [
-    ["my-extension", "My extension"]
-  ]
-}

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension_having_permission.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension_having_permission.json
deleted file mode 100644 (file)
index 6d72995..0000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension_having_permission.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
-  "longName": "src/main/java/org/sonar/api/Plugin.java",
-  "path": "src/main/java/org/sonar/api/Plugin.java",
-  "name": "Plugin.java",
-  "q": "FIL",
-  "subProject": "org.codehaus.sonar:sonar-plugin-api",
-  "subProjectName": "SonarQube :: Plugin API",
-  "project": "org.codehaus.sonar:sonar",
-  "projectName": "SonarQube",
-  "fav": false,
-  "canMarkAsFavourite": false,
-  "canBulkChange": false,
-  "canCreateManualIssue": false,
-  "periods": [],
-  "severities": [],
-  "rules": [],
-  "measures": {},
-  "extensions": [
-    ["my-extension-with-permission", "My extension with permission"]
-  ]
-}

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures.json
deleted file mode 100644 (file)
index 6e688c0..0000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
-  "longName": "src/main/java/org/sonar/api/Plugin.java",
-  "path": "src/main/java/org/sonar/api/Plugin.java",
-  "name": "Plugin.java",
-  "q": "FIL",
-  "subProject": "org.codehaus.sonar:sonar-plugin-api",
-  "subProjectName": "SonarQube :: Plugin API",
-  "project": "org.codehaus.sonar:sonar",
-  "projectName": "SonarQube",
-  "fav": false,
-  "canMarkAsFavourite": false,
-  "canBulkChange": false,
-  "canCreateManualIssue": false,
-  "periods": [],
-  "severities": [
-    ["BLOCKER", "Blocker", 1],
-    ["CRITICAL", "Critical", 2],
-    ["MAJOR", "Major", 5],
-    ["MINOR", "Minor", 4],
-    ["INFO", "Info", 2]
-  ],
-  "rules": [],
-  "measures": {
-    "fIssues": "14",
-    "fBlockerIssues": "1",
-    "fCriticalIssues": "2",
-    "fMajorIssues": "5",
-    "fMinorIssues": "4",
-    "fInfoIssues": "2"
-  }
-}

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures_when_period_is_set.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures_when_period_is_set.json
deleted file mode 100644 (file)
index dcd1868..0000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures_when_period_is_set.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
-  "longName": "src/main/java/org/sonar/api/Plugin.java",
-  "path": "src/main/java/org/sonar/api/Plugin.java",
-  "name": "Plugin.java",
-  "q": "FIL",
-  "subProject": "org.codehaus.sonar:sonar-plugin-api",
-  "subProjectName": "SonarQube :: Plugin API",
-  "project": "org.codehaus.sonar:sonar",
-  "projectName": "SonarQube",
-  "fav": false,
-  "canMarkAsFavourite": false,
-  "canBulkChange": false,
-  "canCreateManualIssue": false,
-  "periods": [
-    [1, "since previous analysis (May 08 2014)", "2014-05-08T00:00:00+0200"]
-  ],
-  "severities": [
-    ["BLOCKER", "Blocker", 1],
-    ["CRITICAL", "Critical", 2],
-    ["MAJOR", "Major", 5],
-    ["MINOR", "Minor", 4],
-    ["INFO", "Info", 2]
-  ],
-  "rules": [],
-  "measures": {
-    "fIssues": "14",
-    "fBlockerIssues": "1",
-    "fCriticalIssues": "2",
-    "fMajorIssues": "5",
-    "fMinorIssues": "4",
-    "fInfoIssues": "2"
-  }
-}

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_it_measure.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_it_measure.json
index ba6e4d0f38f0a2f61dde7eb474d8bc6682dd84fc..0b233ce08e20f3c80e970d9ad0a5ea297e60bd38 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_it_measure.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_it_measure.json
@@ -1,4 +1,5 @@
 {
+  "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
   "uuid": "ABCDE",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_manual_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_manual_rules.json
deleted file mode 100644 (file)
index d70a86c..0000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_manual_rules.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
-  "longName": "src/main/java/org/sonar/api/Plugin.java",
-  "path": "src/main/java/org/sonar/api/Plugin.java",
-  "name": "Plugin.java",
-  "q": "FIL",
-  "subProject": "org.codehaus.sonar:sonar-plugin-api",
-  "subProjectName": "SonarQube :: Plugin API",
-  "project": "org.codehaus.sonar:sonar",
-  "projectName": "SonarQube",
-  "fav": false,
-  "canMarkAsFavourite": false,
-  "canBulkChange": false,
-  "canCreateManualIssue": false,
-  "periods": [],
-  "severities": [],
-  "rules": [],
-  "measures": {},
-  "manual_rules": [
-    {"key": "manual:API", "name": "API"}
-  ]
-}

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures.json
index bf8dd6ca0697c0c530594a686018af2218afeaa0..606f6594f53d4fb62f2a44f58b5c53df4c7f098d 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures.json
@@ -1,4 +1,5 @@
 {
+  "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
   "uuid": "ABCDE",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures_when_period_is_set.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures_when_period_is_set.json
deleted file mode 100644 (file)
index 41501a7..0000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures_when_period_is_set.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
-  "longName": "src/main/java/org/sonar/api/Plugin.java",
-  "path": "src/main/java/org/sonar/api/Plugin.java",
-  "name": "Plugin.java",
-  "q": "FIL",
-  "subProject": "org.codehaus.sonar:sonar-plugin-api",
-  "subProjectName": "SonarQube :: Plugin API",
-  "project": "org.codehaus.sonar:sonar",
-  "projectName": "SonarQube",
-  "fav": false,
-  "canMarkAsFavourite": false,
-  "canBulkChange": false,
-  "canCreateManualIssue": false,
-  "periods": [
-    [1, "since previous analysis (May 08 2014)", "2014-05-08T00:00:00+0200"]
-  ],
-  "severities": [],
-  "rules": [],
-  "measures": {
-    "fNcloc": "2",
-    "fCoverage": "5.0",
-    "fDuplicationDensity": "1.2",
-    "fDebt": "10min",
-    "fSqaleDebtRatio" : "5.0"
-  },
-  "tabs": [
-    "coverage"
-  ]
-}

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_overall_measure.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_overall_measure.json
index 4d88e7596145224b0da9abab513553ef5764e56e..7cc5aedb715a2359ccbbe6edf342aca76d65b73d 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_overall_measure.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_overall_measure.json
@@ -1,4 +1,5 @@
 {
+  "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
   "uuid": "ABCDE",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_periods.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_periods.json
deleted file mode 100644 (file)
index 90ff42e..0000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_periods.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
-  "longName": "src/main/java/org/sonar/api/Plugin.java",
-  "path": "src/main/java/org/sonar/api/Plugin.java",
-  "name": "Plugin.java",
-  "q": "FIL",
-  "subProject": "org.codehaus.sonar:sonar-plugin-api",
-  "subProjectName": "SonarQube :: Plugin API",
-  "project": "org.codehaus.sonar:sonar",
-  "projectName": "SonarQube",
-  "fav": false,
-  "canMarkAsFavourite": false,
-  "canBulkChange": false,
-  "canCreateManualIssue": false,
-  "periods": [
-    [1, "since previous analysis (May 08 2014)", "2014-05-08T00:00:00+0200"]
-  ],
-  "severities": [],
-  "rules": [],
-  "measures": {}
-}

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules.json
deleted file mode 100644 (file)
index 69a3163..0000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
-  "longName": "src/main/java/org/sonar/api/Plugin.java",
-  "path": "src/main/java/org/sonar/api/Plugin.java",
-  "name": "Plugin.java",
-  "q": "FIL",
-  "subProject": "org.codehaus.sonar:sonar-plugin-api",
-  "subProjectName": "SonarQube :: Plugin API",
-  "project": "org.codehaus.sonar:sonar",
-  "projectName": "SonarQube",
-  "fav": false,
-  "canMarkAsFavourite": false,
-  "canBulkChange": false,
-  "canCreateManualIssue": false,
-  "periods": [],
-  "severities": [],
-  "rules": [
-    ["squid:AvoidCycle", "Avoid Cycle", 1]
-  ],
-  "measures": {}
-}

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules_when_period_is_set.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules_when_period_is_set.json
deleted file mode 100644 (file)
index 9bcea6b..0000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules_when_period_is_set.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
-  "longName": "src/main/java/org/sonar/api/Plugin.java",
-  "path": "src/main/java/org/sonar/api/Plugin.java",
-  "name": "Plugin.java",
-  "q": "FIL",
-  "subProject": "org.codehaus.sonar:sonar-plugin-api",
-  "subProjectName": "SonarQube :: Plugin API",
-  "project": "org.codehaus.sonar:sonar",
-  "projectName": "SonarQube",
-  "fav": false,
-  "canMarkAsFavourite": false,
-  "canBulkChange": false,
-  "canCreateManualIssue": false,
-  "periods": [
-    [1, "since previous analysis (May 08 2014)", "2014-05-08T00:00:00+0200"]
-  ],
-  "severities": [],
-  "rules": [
-    ["squid:AvoidCycle", "Avoid Cycle", 1]
-  ],
-  "measures": {}
-}

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities.json
deleted file mode 100644 (file)
index 55a6f96..0000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
-  "longName": "src/main/java/org/sonar/api/Plugin.java",
-  "path": "src/main/java/org/sonar/api/Plugin.java",
-  "name": "Plugin.java",
-  "q": "FIL",
-  "subProject": "org.codehaus.sonar:sonar-plugin-api",
-  "subProjectName": "SonarQube :: Plugin API",
-  "project": "org.codehaus.sonar:sonar",
-  "projectName": "SonarQube",
-  "fav": false,
-  "canMarkAsFavourite": false,
-  "canBulkChange": false,
-  "canCreateManualIssue": false,
-  "periods": [],
-  "severities": [
-    ["MAJOR", "Major", 5]
-  ],
-  "rules": [],
-  "measures": {}
-}

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities_when_period_is_set.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities_when_period_is_set.json
deleted file mode 100644 (file)
index 567ee9c..0000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities_when_period_is_set.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
-  "longName": "src/main/java/org/sonar/api/Plugin.java",
-  "path": "src/main/java/org/sonar/api/Plugin.java",
-  "name": "Plugin.java",
-  "q": "FIL",
-  "subProject": "org.codehaus.sonar:sonar-plugin-api",
-  "subProjectName": "SonarQube :: Plugin API",
-  "project": "org.codehaus.sonar:sonar",
-  "projectName": "SonarQube",
-  "fav": false,
-  "canMarkAsFavourite": false,
-  "canBulkChange": false,
-  "canCreateManualIssue": false,
-  "periods": [
-    [1, "since previous analysis (May 08 2014)", "2014-05-08T00:00:00+0200"]
-  ],
-  "severities": [
-    ["MAJOR", "Major", 5]
-  ],
-  "rules": [],
-  "measures": {}
-}

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_sub_project_equals_to_project.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_sub_project_equals_to_project.json
deleted file mode 100644 (file)
index c535c2a..0000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_sub_project_equals_to_project.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
-  "path": "src/main/java/org/sonar/api/Plugin.java",
-  "name": "Plugin.java",
-  "q": "FIL",
-  "project" : "org.codehaus.sonar:sonar",
-  "projectName": "SonarQube",
-  "fav": true,
-  "canMarkAsFavourite": true,
-  "canBulkChange": true,
-  "canCreateManualIssue": true,
-  "periods": [],
-  "severities": [],
-  "rules": [],
-  "measures": {}
-}

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_tabs.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_tabs.json
deleted file mode 100644 (file)
index 3288f42..0000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_tabs.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
-  "longName": "src/main/java/org/sonar/api/Plugin.java",
-  "path": "src/main/java/org/sonar/api/Plugin.java",
-  "name": "Plugin.java",
-  "q": "FIL",
-  "subProject": "org.codehaus.sonar:sonar-plugin-api",
-  "subProjectName": "SonarQube :: Plugin API",
-  "project": "org.codehaus.sonar:sonar",
-  "projectName": "SonarQube",
-  "fav": false,
-  "canMarkAsFavourite": false,
-  "canBulkChange": false,
-  "canCreateManualIssue": false,
-  "periods": [],
-  "severities": [],
-  "rules": [],
-  "measures": {
-    "fCoverage": "1.0%"
-  },
-  "tabs": [
-    "scm", "coverage", "duplications"
-  ]
-}

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_tests_measure.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_tests_measure.json
deleted file mode 100644 (file)
index 70ed990..0000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_tests_measure.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "key": "org.codehaus.sonar:sonar-server:src/test/java/org/sonar/server/issue/PlanActionTest.java",
-  "path": "src/test/java/org/sonar/server/issue/PlanActionTest.java",
-  "name": "PlanActionTest.java",
-  "q": "UTS",
-  "subProject": "org.codehaus.sonar:sonar-plugin-api",
-  "subProjectName": "SonarQube :: Plugin API",
-  "project": "org.codehaus.sonar:sonar",
-  "projectName": "SonarQube",
-  "fav": false,
-  "canMarkAsFavourite": false,
-  "canBulkChange": false,
-  "canCreateManualIssue": false,
-  "periods": [],
-  "severities": [],
-  "rules": [],
-  "measures": {
-    "fTests": "10"
-  }
-}

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_ut_measure.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_ut_measure.json
index 70f632d334a0edd6cfb889a461fc26e8c751bf9b..c6ef590ad5d3b36993f5a735731a0d5f8aafe3e4 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_ut_measure.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_ut_measure.json
@@ -1,4 +1,5 @@
 {
+  "key": "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/Plugin.java",
   "uuid": "ABCDE",
   "path": "src/main/java/org/sonar/api/Plugin.java",
   "name": "Plugin.java",

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_without_sub_project.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_without_sub_project.json
deleted file mode 100644 (file)
index b2fefdf..0000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_without_sub_project.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "key": "org.codehaus.sonar:sonar",
-  "name": "SonarQube",
-  "longName": "SonarQube",
-  "q": "TRK",
-  "project" : "org.codehaus.sonar:sonar",
-  "projectName": "SonarQube",
-  "fav": true,
-  "canMarkAsFavourite": true,
-  "canBulkChange": true,
-  "canCreateManualIssue": true,
-  "periods": [],
-  "severities": [],
-  "rules": [],
-  "measures": {}
-}