SONAR-5300 Return differential measures when a period is set in /api/components/app

7 files changed, 130 insertions, 10 deletions

diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures.json
new file mode 100644
index 00000000000..da382ae72e3
--- /dev/null
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures.json
@@ -0,0 +1,29 @@
+{
+  "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",
+  "subProjectName": "SonarQube :: Plugin API",
+  "projectName": "SonarQube",
+  "fav": false,
+  "scmAvailable": false,
+  "canMarkAsFavourite": false,
+  "canBulkChange": 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/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures_when_period_is_set.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures_when_period_is_set.json
new file mode 100644
index 00000000000..c76c0297698
--- /dev/null
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures_when_period_is_set.json
@@ -0,0 +1,31 @@
+{
+  "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",
+  "subProjectName": "SonarQube :: Plugin API",
+  "projectName": "SonarQube",
+  "fav": false,
+  "scmAvailable": false,
+  "canMarkAsFavourite": false,
+  "canBulkChange": 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/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures.json
index 0a888c70c9d..af6333f7ca6 100644
--- a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures.json
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures.json
@@ -16,12 +16,6 @@
     "fNcloc": "200",
     "fCoverage": "95.4%",
     "fDuplicationDensity": "7.4%",
-    "fDebt": "3h 2min",
-    "fIssues": "14",
-    "fBlockerIssues": "1",
-    "fCriticalIssues": "2",
-    "fMajorIssues": "5",
-    "fMinorIssues": "4",
-    "fInfoIssues": "2"
+    "fDebt": "3h 2min"
   }
 }
diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures_when_period_is_set.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures_when_period_is_set.json
new file mode 100644
index 00000000000..ad91e5e003a
--- /dev/null
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures_when_period_is_set.json
@@ -0,0 +1,23 @@
+{
+  "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",
+  "subProjectName": "SonarQube :: Plugin API",
+  "projectName": "SonarQube",
+  "fav": false,
+  "scmAvailable": false,
+  "canMarkAsFavourite": false,
+  "canBulkChange": 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"
+  }
+}
diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules_when_period_is_set.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules_when_period_is_set.json
new file mode 100644
index 00000000000..6bd62351925
--- /dev/null
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules_when_period_is_set.json
@@ -0,0 +1,20 @@
+{
+  "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",
+  "subProjectName": "SonarQube :: Plugin API",
+  "projectName": "SonarQube",
+  "fav": false,
+  "scmAvailable": false,
+  "canMarkAsFavourite": false,
+  "canBulkChange": 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/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities_when_period_is_set.json b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities_when_period_is_set.json
new file mode 100644
index 00000000000..76c5339abfd
--- /dev/null
+++ b/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities_when_period_is_set.json
@@ -0,0 +1,20 @@
+{
+  "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",
+  "subProjectName": "SonarQube :: Plugin API",
+  "projectName": "SonarQube",
+  "fav": false,
+  "scmAvailable": false,
+  "canMarkAsFavourite": false,
+  "canBulkChange": false,
+  "periods": [
+    [1, "since previous analysis (May 08 2014)", "2014-05-08T00:00:00+0200"]
+  ],
+  "severities": [
+    ["MAJOR", "Major", 5]
+  ],
+  "rules": [],
+  "measures": {}
+}
diff --git a/sonar-server/src/test/resources/org/sonar/server/measure/persistence/MeasureDaoTest/shared.xml b/sonar-server/src/test/resources/org/sonar/server/measure/persistence/MeasureDaoTest/shared.xml
index 70097c0470f..041ca607f35 100644
--- a/sonar-server/src/test/resources/org/sonar/server/measure/persistence/MeasureDaoTest/shared.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/measure/persistence/MeasureDaoTest/shared.xml
@@ -8,8 +8,11 @@
 
   <snapshots id="5" project_id="1" islast="[true]" />
 
-  <project_measures id="20" snapshot_id="5" metric_id="10" value="[null]" text_value="[null]" measure_data="MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OQ=="/>
-  <project_measures id="21" snapshot_id="5" metric_id="11" value="[null]" text_value="36=1;37=1;38=1;39=1;43=1;48=1;53=1" measure_data="[null]"/>
-  <project_measures id="22" snapshot_id="5" metric_id="12" value="10" text_value="[null]" measure_data="[null]"/>
+  <project_measures id="20" snapshot_id="5" metric_id="10" value="[null]" text_value="[null]" measure_data="MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OQ=="
+                    variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]" />
+  <project_measures id="21" snapshot_id="5" metric_id="11" value="[null]" text_value="36=1;37=1;38=1;39=1;43=1;48=1;53=1" measure_data="[null]"
+                    variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]" />
+  <project_measures id="22" snapshot_id="5" metric_id="12" value="10" text_value="[null]" measure_data="[null]"
+                    variation_value_1="1" variation_value_2="2" variation_value_3="3" variation_value_4="4" variation_value_5="-5"/>
 
 </dataset>