From d775dffb2c2c0bc9ff1822a50c9ff9f9cf7eb46c Mon Sep 17 00:00:00 2001
From: Fabrice Bellingard <bellingard@gmail.com>
Date: Mon, 14 May 2012 15:59:22 +0200
Subject: [PATCH] Fix Sonar Core Plugin unit tests

---
 ...uldCloseResolvedManualViolations-result.xml |  4 ++--
 .../shouldCloseResolvedManualViolations.xml    |  4 ++--
 .../shouldCloseReviewsOnDeletedResources.xml   |  4 ++--
 ...CloseReviewsOnResolvedViolations-result.xml |  8 ++++----
 .../shouldCloseReviewsOnResolvedViolations.xml |  8 ++++----
 .../shouldReopenViolations-result.xml          |  2 +-
 .../shouldReopenViolations.xml                 |  2 +-
 .../ReviewsMeasuresDecoratorTest/fixture.xml   | 18 ++++++++++++------
 8 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseResolvedManualViolations-result.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseResolvedManualViolations-result.xml
index 18b0a2dd102..f0355573bde 100644
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseResolvedManualViolations-result.xml
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseResolvedManualViolations-result.xml
@@ -6,12 +6,12 @@
   <reviews id="1" project_id="[null]" resource_id="100" status="OPEN" rule_failure_permanent_id="1000"
            resolution="[null]" created_at="[null]" updated_at="[null]"
            resource_line="[null]" severity="[null]" user_id="[null]" rule_id="[null]" manual_violation="true" manual_severity="false"
-           title="[null]" assignee_id="[null]"/>
+           title="[null]" assignee_id="[null]" data="[null]"/>
 
   <reviews id="2" project_id="[null]" resource_id="100" status="CLOSED" rule_failure_permanent_id="1000"
              resolution="FIXED" created_at="[null]" updated_at="[null]"
              resource_line="[null]" severity="[null]" user_id="[null]" rule_id="[null]" manual_violation="true" manual_severity="false"
-             title="[null]" assignee_id="[null]"/>
+             title="[null]" assignee_id="[null]" data="[null]"/>
 
 
 </dataset>
\ No newline at end of file
diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseResolvedManualViolations.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseResolvedManualViolations.xml
index 728aeae009a..da15d01c10d 100644
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseResolvedManualViolations.xml
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseResolvedManualViolations.xml
@@ -6,12 +6,12 @@
   <reviews id="1" project_id="[null]" resource_id="100" status="OPEN" rule_failure_permanent_id="1000"
            resolution="[null]" created_at="[null]" updated_at="[null]"
            resource_line="[null]" severity="[null]" user_id="[null]" rule_id="[null]" manual_violation="true" manual_severity="false"
-           title="[null]" assignee_id="[null]"/>
+           title="[null]" assignee_id="[null]" data="[null]"/>
 
   <reviews id="2" project_id="[null]" resource_id="100" status="RESOLVED" rule_failure_permanent_id="1000"
              resolution="FIXED" created_at="[null]" updated_at="[null]"
              resource_line="[null]" severity="[null]" user_id="[null]" rule_id="[null]" manual_violation="true" manual_severity="false"
-             title="[null]" assignee_id="[null]"/>
+             title="[null]" assignee_id="[null]" data="[null]"/>
 
 
 </dataset>
\ No newline at end of file
diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseReviewsOnDeletedResources.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseReviewsOnDeletedResources.xml
index 2f1db04a0d2..fca504bdf5c 100644
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseReviewsOnDeletedResources.xml
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseReviewsOnDeletedResources.xml
@@ -10,12 +10,12 @@
   <reviews id="1" project_id="[null]" resource_id="100" status="OPEN" rule_failure_permanent_id="1000"
            resolution="[null]" created_at="[null]" updated_at="[null]"
            resource_line="[null]" severity="[null]" user_id="[null]" rule_id="[null]" manual_violation="true" manual_severity="false"
-           title="[null]" assignee_id="[null]"/>
+           title="[null]" assignee_id="[null]" data="[null]"/>
 
   <reviews id="2" project_id="[null]" resource_id="100" status="RESOLVED" rule_failure_permanent_id="1000"
              resolution="FIXED" created_at="[null]" updated_at="[null]"
              resource_line="[null]" severity="[null]" user_id="[null]" rule_id="[null]" manual_violation="true" manual_severity="false"
-             title="[null]" assignee_id="[null]"/>
+             title="[null]" assignee_id="[null]" data="[null]"/>
 
 
 </dataset>
\ No newline at end of file
diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseReviewsOnResolvedViolations-result.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseReviewsOnResolvedViolations-result.xml
index 44b421f24c6..73f3114da02 100644
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseReviewsOnResolvedViolations-result.xml
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseReviewsOnResolvedViolations-result.xml
@@ -7,23 +7,23 @@
   <reviews id="1" project_id="[null]" resource_id="100" status="CLOSED" rule_failure_permanent_id="1000"
            resolution="[null]" created_at="[null]" updated_at="[null]"
            resource_line="[null]" severity="[null]" user_id="[null]" rule_id="[null]" manual_violation="false" manual_severity="false"
-           title="[null]" assignee_id="[null]"/>
+           title="[null]" assignee_id="[null]" data="[null]"/>
 
   <reviews id="2" project_id="[null]" resource_id="100" status="CLOSED" rule_failure_permanent_id="1001"
              resolution="FALSE-POSITIVE" created_at="[null]" updated_at="[null]"
              resource_line="[null]" severity="[null]" user_id="[null]" rule_id="[null]" manual_violation="false" manual_severity="false"
-             title="[null]" assignee_id="[null]"/>
+             title="[null]" assignee_id="[null]" data="[null]"/>
 
   <!-- closed reviews -->
   <reviews id="3" project_id="[null]" resource_id="100" status="CLOSED" rule_failure_permanent_id="1002"
                resolution="RESOLVED" created_at="[null]" updated_at="[null]"
                resource_line="[null]" severity="[null]" user_id="[null]" rule_id="[null]" manual_violation="false" manual_severity="false"
-               title="[null]" assignee_id="[null]"/>
+               title="[null]" assignee_id="[null]" data="[null]"/>
 
 
   <!-- other resource -->
   <reviews id="4" project_id="[null]" resource_id="101" status="OPEN" rule_failure_permanent_id="1100"
                  resolution="[null]" created_at="[null]" updated_at="[null]"
                  resource_line="[null]" severity="[null]" user_id="[null]" rule_id="[null]" manual_violation="false" manual_severity="false"
-                 title="[null]" assignee_id="[null]"/>
+                 title="[null]" assignee_id="[null]" data="[null]"/>
 </dataset>
\ No newline at end of file
diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseReviewsOnResolvedViolations.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseReviewsOnResolvedViolations.xml
index a8e0c3949cd..9840ca85976 100644
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseReviewsOnResolvedViolations.xml
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldCloseReviewsOnResolvedViolations.xml
@@ -7,23 +7,23 @@
   <reviews id="1" project_id="[null]" resource_id="100" status="OPEN" rule_failure_permanent_id="1000"
            resolution="[null]" created_at="[null]" updated_at="[null]"
            resource_line="[null]" severity="[null]" user_id="[null]" rule_id="[null]" manual_violation="false" manual_severity="false"
-           title="[null]" assignee_id="[null]"/>
+           title="[null]" assignee_id="[null]" data="[null]"/>
 
   <reviews id="2" project_id="[null]" resource_id="100" status="RESOLVED" rule_failure_permanent_id="1001"
            resolution="FALSE-POSITIVE" created_at="[null]" updated_at="[null]"
            resource_line="[null]" severity="[null]" user_id="[null]" rule_id="[null]" manual_violation="false" manual_severity="false"
-           title="[null]" assignee_id="[null]"/>
+           title="[null]" assignee_id="[null]" data="[null]"/>
 
   <!-- closed reviews -->
   <reviews id="3" project_id="[null]" resource_id="100" status="CLOSED" rule_failure_permanent_id="1002"
            resolution="RESOLVED" created_at="[null]" updated_at="[null]"
            resource_line="[null]" severity="[null]" user_id="[null]" rule_id="[null]" manual_violation="false" manual_severity="false"
-           title="[null]" assignee_id="[null]"/>
+           title="[null]" assignee_id="[null]" data="[null]"/>
 
 
   <!-- other resource -->
   <reviews id="4" project_id="[null]" resource_id="101" status="OPEN" rule_failure_permanent_id="1100"
            resolution="[null]" created_at="[null]" updated_at="[null]"
            resource_line="[null]" severity="[null]" user_id="[null]" rule_id="[null]" manual_violation="false" manual_severity="false"
-           title="[null]" assignee_id="[null]"/>
+           title="[null]" assignee_id="[null]" data="[null]"/>
 </dataset>
\ No newline at end of file
diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldReopenViolations-result.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldReopenViolations-result.xml
index 68dc04a412b..96286e98d8b 100644
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldReopenViolations-result.xml
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldReopenViolations-result.xml
@@ -6,7 +6,7 @@
   <reviews id="1" project_id="[null]" resource_id="100" status="REOPENED" rule_failure_permanent_id="1000"
            resolution="[null]" created_at="[null]" updated_at="[null]"
            resource_line="[null]" severity="[null]" user_id="[null]" rule_id="[null]" manual_violation="false" manual_severity="false"
-           title="[null]" assignee_id="[null]"/>
+           title="[null]" assignee_id="[null]" data="[null]"/>
 
 
 </dataset>
\ No newline at end of file
diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldReopenViolations.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldReopenViolations.xml
index 83874328135..38273073ceb 100644
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldReopenViolations.xml
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest/shouldReopenViolations.xml
@@ -6,7 +6,7 @@
   <reviews id="1" project_id="[null]" resource_id="100" status="RESOLVED" rule_failure_permanent_id="1000"
            resolution="FIXED" created_at="[null]" updated_at="[null]"
            resource_line="[null]" severity="[null]" user_id="[null]" rule_id="[null]" manual_violation="false" manual_severity="false"
-           title="[null]" assignee_id="[null]"/>
+           title="[null]" assignee_id="[null]" data="[null]"/>
 
 
 </dataset>
\ No newline at end of file
diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewsMeasuresDecoratorTest/fixture.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewsMeasuresDecoratorTest/fixture.xml
index 7384c0e2e5f..063e30cb01a 100644
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewsMeasuresDecoratorTest/fixture.xml
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ReviewsMeasuresDecoratorTest/fixture.xml
@@ -14,7 +14,8 @@
     user_id="[null]"
     rule_id="[null]"
     manual_violation="false"
-    manual_severity="false"/>
+    manual_severity="false"
+    data="[null]"/>
   <reviews
     id="2"
     status="OPEN"
@@ -24,7 +25,8 @@
     resource_line="2"
     rule_id="[null]"
     manual_violation="false"
-    manual_severity="false"/>
+    manual_severity="false"
+    data="[null]"/>
   <reviews
     id="3"
     status="OPEN"
@@ -34,7 +36,8 @@
     resource_line="0"
     rule_id="[null]"
     manual_violation="false"
-    manual_severity="false"/>
+    manual_severity="false"
+    data="[null]"/>
   <reviews
     id="4"
     status="OPEN"
@@ -44,7 +47,8 @@
     resource_line="4"
     rule_id="[null]"
     manual_violation="false"
-    manual_severity="false"/>
+    manual_severity="false"
+    data="[null]"/>
   <reviews
     id="5"
     status="OPEN"
@@ -54,7 +58,8 @@
     resource_line="[null]"
     rule_id="[null]"
     manual_violation="false"
-    manual_severity="false"/>
+    manual_severity="false"
+    data="[null]"/>
   <reviews
     id="6"
     status="OPEN"
@@ -64,6 +69,7 @@
     resource_line="[null]"
     rule_id="[null]"
     manual_violation="false"
-    manual_severity="false"/>
+    manual_severity="false"
+    data="[null]"/>
 
 </dataset>
\ No newline at end of file
-- 
2.39.5