Update unit test due to renaming of active_rule_changes.user_name to active_rule_chan...

diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/changeParentProfile-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/changeParentProfile-result.xml
index 179e151f058d367d6c6e8302c73328906056175c..e31d8978f02424bce279f97475a9cad7154d8e24 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/changeParentProfile-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/changeParentProfile-result.xml
@@ -1,5 +1,5 @@
 <dataset>
 
-  <active_rule_changes id="1" user_name="admin" profile_id="2" profile_version="2" rule_id="1" enabled="true" old_severity="[null]" new_severity="2"/>
+  <active_rule_changes id="1" username="admin" profile_id="2" profile_version="2" rule_id="1" enabled="true" old_severity="[null]" new_severity="2"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/removeActivatedRules-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/removeActivatedRules-result.xml
index 2e4292d7b24f8c0f8f0553758cece8347d5ae11d..bc09b586a0f97c5b822cc13f023729844a506013 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/removeActivatedRules-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/removeActivatedRules-result.xml
@@ -1,7 +1,7 @@
 <dataset>
 
-  <active_rule_changes id="1" user_name="[null]" profile_id="1" profile_version="2" rule_id="1" enabled="false" old_severity="2" new_severity="[null]"/>
-  <active_rule_changes id="2" user_name="[null]" profile_id="2" profile_version="2" rule_id="1" enabled="false" old_severity="2" new_severity="[null]"/>
+  <active_rule_changes id="1" username="[null]" profile_id="1" profile_version="2" rule_id="1" enabled="false" old_severity="2" new_severity="[null]"/>
+  <active_rule_changes id="2" username="[null]" profile_id="2" profile_version="2" rule_id="1" enabled="false" old_severity="2" new_severity="[null]"/>
 
   <active_rules id="3" profile_id="2" rule_id="2" failure_level="2" inheritance="[null]"/>
 

diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleActivated-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleActivated-result.xml
index ca2f4df610f00efdc6629e589dd5bdb6cd90de16..e19b67be4cfe82432d0a515be055381871719083 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleActivated-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleActivated-result.xml
@@ -1,5 +1,5 @@
 <dataset>
 
-  <active_rule_changes id="1" user_name="admin" profile_id="2" profile_version="2" rule_id="2" enabled="true" old_severity="[null]" new_severity="2"/>
+  <active_rule_changes id="1" username="admin" profile_id="2" profile_version="2" rule_id="2" enabled="true" old_severity="[null]" new_severity="2"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleDeactivated-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleDeactivated-result.xml
index 2edaf060432f0f6b9542e21fd6bd185c133c6743..28129b3017d031f02e054f66c223998156266091 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleDeactivated-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleDeactivated-result.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <active_rule_changes id="1" user_name="admin" profile_id="2" profile_version="2" rule_id="2" enabled="false" old_severity="2" new_severity="[null]"/>
+  <active_rule_changes id="1" username="admin" profile_id="2" profile_version="2" rule_id="2" enabled="false" old_severity="2" new_severity="[null]"/>
   
   <active_rule_param_changes id="1" active_rule_change_id="1" rules_parameter_id="13" old_value="30" new_value="[null]"/>
 

diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleParamChanged-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleParamChanged-result.xml
index 3c1672f4ac7ab6544cf54115da815e428c9f0fd3..698999f5239f0c190548a792f3c82036eeea2f6e 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleParamChanged-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleParamChanged-result.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <active_rule_changes id="1" user_name="admin" profile_id="2" profile_version="2" rule_id="2" enabled="[null]" old_severity="[null]" new_severity="[null]"/>
+  <active_rule_changes id="1" username="admin" profile_id="2" profile_version="2" rule_id="2" enabled="[null]" old_severity="[null]" new_severity="[null]"/>
 
   <active_rule_param_changes id="1" active_rule_change_id="1" rules_parameter_id="13" old_value="20" new_value="30"/>
   

diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleReverted-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleReverted-result.xml
index 653da410aa3a1d0067ac67d5c13e4fd72c80e908..eda98ec8c8238a5c1ef744586bae5bc6f9ef984d 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleReverted-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleReverted-result.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <active_rule_changes id="1" user_name="admin" profile_id="2" profile_version="2" rule_id="2" enabled="[null]" old_severity="3" new_severity="2"/>
+  <active_rule_changes id="1" username="admin" profile_id="2" profile_version="2" rule_id="2" enabled="[null]" old_severity="3" new_severity="2"/>
 
   <active_rule_param_changes id="1" active_rule_change_id="1" rules_parameter_id="13" old_value="30" new_value="[null]"/>
   <active_rule_param_changes id="2" active_rule_change_id="1" rules_parameter_id="14" old_value="100" new_value="50"/>

diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleSeverityChanged-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleSeverityChanged-result.xml
index 22930c36abc949fc25e808c01c1de8ee6a72c01a..69d8e4077aa80bb09f7997575dd4d68eceff6e7e 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleSeverityChanged-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleSeverityChanged-result.xml
@@ -1,5 +1,5 @@
 <dataset>
 
-  <active_rule_changes id="1" user_name="admin" profile_id="2" profile_version="2" rule_id="2" enabled="[null]" old_severity="4" new_severity="3"/>
+  <active_rule_changes id="1" username="admin" profile_id="2" profile_version="2" rule_id="2" enabled="[null]" old_severity="4" new_severity="3"/>
 
 </dataset>