Fixed Rule.tags in RuleRegisterTest

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_fields-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_fields-result.xml
index 7ac8818755730dfd3eea012cd504593a8fbb9381..9bbd5d720a8cc6074b282c9d3de09ac965dd2224 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_fields-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_fields-result.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+    <rules tags="tag3,tag4" system_tags="tag1,tag2" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"
          characteristic_id="[null]" default_characteristic_id="200"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
@@ -11,15 +11,6 @@
   <rules_parameters id="1" rule_id="1" default_value="default value one" description="parameter one" name="param1" param_type="STRING"/>
   <rules_parameters id="2" rule_id="1" default_value="default value two" description="parameter two" name="param2" param_type="STRING"/>
 
-  <rule_tags id="1" tag="tag1"/>
-  <rule_tags id="3" tag="tag3"/>
-  <rule_tags id="4" tag="tag4"/>
-  <rule_tags id="5" tag="tag5"/>
-
-  <rules_rule_tags id="1" rule_id="1" rule_tag_id="1" tag_type="SYSTEM"/>
-  <rules_rule_tags id="3" rule_id="1" rule_tag_id="3" tag_type="SYSTEM"/>
-  <rules_rule_tags id="4" rule_id="1" rule_tag_id="4" tag_type="ADMIN"/>
-  <rules_rule_tags id="5" rule_id="1" rule_tag_id="5" tag_type="SYSTEM"/>
 
   <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
          status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_fields.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_fields.xml
index dddc193f1d819d4bf8def4d1a33f77ddb28d009f..b894013a71aa5f02c9635b436bf177b620e08fc2 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_fields.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_fields.xml
@@ -2,7 +2,7 @@
 
   <characteristics id="200" kee="MEMORY_EFFICIENCY" name="Memory Efficiency" parent_id="1" characteristic_order="1" enabled="[true]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
+  <rules tags="tag3,tag4" system_tags="tag1,tag2" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
          status="READY" priority="2" cardinality="SINGLE" parent_id="[null]"
          characteristic_id="[null]" default_characteristic_id="200"
          remediation_function="[null]" default_remediation_function="LINEAR"
@@ -12,16 +12,6 @@
 
   <rules_parameters id="1" rule_id="1" name="param1" description="[null]" param_type="STRING"/>
 
-  <rule_tags id="1" tag="tag1"/>
-  <rule_tags id="2" tag="tag2"/>
-  <rule_tags id="3" tag="tag3"/>
-  <rule_tags id="4" tag="tag4"/>
-
-  <rules_rule_tags id="1" rule_id="1" rule_tag_id="1" tag_type="SYSTEM"/>
-  <rules_rule_tags id="2" rule_id="1" rule_tag_id="2" tag_type="SYSTEM"/>
-  <rules_rule_tags id="3" rule_id="1" rule_tag_id="3" tag_type="ADMIN"/>
-  <rules_rule_tags id="4" rule_id="1" rule_tag_id="4" tag_type="ADMIN"/>
-
   <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
          status="READY" priority="1" cardinality="SINGLE" parent_id="[null]"/>