Fixed some basic tests for RegisterRule with DAOv.2

diff --git a/sonar-core/src/main/java/org/sonar/core/rule/RuleDto.java b/sonar-core/src/main/java/org/sonar/core/rule/RuleDto.java
index 6ce40e81d3c3bd66b05c0c9372988f43acf251b0..88ba9c64fb39165d9bf74418f51e47d5f2350817 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/rule/RuleDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/rule/RuleDto.java
@@ -343,12 +343,12 @@ public final class RuleDto implements Dto<RuleKey> {
   }
 
   public RuleDto setTags(Set<String> tags) {
-    this.tags = StringUtils.join(tags, ',');
+    this.tags = tags.isEmpty()?null:StringUtils.join(tags, ',');
     return this;
   }
 
   public RuleDto setSystemTags(Set<String> tags) {
-    this.systemTags = StringUtils.join(tags, ',');
+    this.systemTags =  tags.isEmpty()?null:StringUtils.join(tags, ',');
     return this;
   }
 

diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/RegisterRules.java b/sonar-server/src/main/java/org/sonar/server/rule2/RegisterRules.java
index 64aaa428dbad8c3715ed44b0cba8b4067bff4b17..f9d5f456ca374a982ccb517d793bdf3e6c378f34 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/rule2/RegisterRules.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule2/RegisterRules.java
@@ -77,6 +77,7 @@ public class RegisterRules implements Startable {
     this(defLoader, profilesManager, myBatis, ruleDao, activeRuleDao, characteristicDao, System2.INSTANCE);
   }
 
+
   @VisibleForTesting
   RegisterRules(RuleDefinitionsLoader defLoader, ProfilesManager profilesManager,
                 MyBatis myBatis, RuleDao ruleDao, ActiveRuleDao activeRuleDao,

diff --git a/sonar-server/src/test/java/org/sonar/server/rule2/RegisterRulesTest.java b/sonar-server/src/test/java/org/sonar/server/rule2/RegisterRulesTest.java
index 8963e627146a554156c359dbe525d81e79a95259..89428a63f35198cc245ad69f9a2c5de3c0628eee 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/rule2/RegisterRulesTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule2/RegisterRulesTest.java
@@ -19,10 +19,8 @@
  */
 package org.sonar.server.rule2;
 
-import org.apache.ibatis.session.SqlSession;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -49,14 +47,12 @@ import org.sonar.server.rule.ESRuleTags;
 import org.sonar.server.rule.RuleDefinitionsLoader;
 import org.sonar.server.rule.RuleRegistry;
 import org.sonar.server.rule.RuleRepositories;
-import org.sonar.server.rule.RuleTagOperations;
 
 import java.util.Collection;
 import java.util.Date;
 
 import static org.fest.assertions.Assertions.assertThat;
 import static org.fest.assertions.Fail.fail;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -85,7 +81,6 @@ public class RegisterRulesTest extends AbstractDaoTestCase {
   @Captor
   ArgumentCaptor<Collection<RuleTagDto>> ruleTagsCaptor;
 
-  RuleTagOperations ruleTagOperations;
   MyBatis myBatis;
   RuleDao ruleDao;
   RuleTagDao ruleTagDao;
@@ -105,7 +100,6 @@ public class RegisterRulesTest extends AbstractDaoTestCase {
     ruleDao = new RuleDao();
     ruleTagDao = new RuleTagDao(myBatis);
     activeRuleDao = new ActiveRuleDao(new QualityProfileDao(myBatis), ruleDao);
-    ruleTagOperations = new RuleTagOperations(ruleTagDao, esRuleTags);
     characteristicDao = new CharacteristicDao(myBatis);
     task = new RegisterRules(new RuleDefinitionsLoader(mock(RuleRepositories.class), new RulesDefinition[]{new FakeRepository()}),
       profilesManager, myBatis, ruleDao, activeRuleDao, characteristicDao, system);
@@ -113,27 +107,10 @@ public class RegisterRulesTest extends AbstractDaoTestCase {
   }
 
   @After
-  public void after(){
+  public void after() {
     session.close();
   }
 
-
-  @Test
-  @Ignore
-  public void insert_new_rules() {
-    setupData("shared");
-    task.start();
-
-    verify(ruleRegistry).reindex(rulesCaptor.capture(), any(SqlSession.class));
-    assertThat(rulesCaptor.getValue()).hasSize(3);
-    verify(ruleRegistry).removeDeletedRules(any(String[].class));
-
-    verify(esRuleTags).putAllTags(ruleTagsCaptor.capture());
-    assertThat(ruleTagsCaptor.getValue()).hasSize(3);
-
-    checkTables("insert_new_rules", EXCLUDED_COLUMN_NAMES, "rules", "rules_parameters", "rules_rule_tags", "rule_tags");
-  }
-
   @Test
   public void update_template_rule_language() {
     setupData("update_template_rule_language");
@@ -298,32 +275,34 @@ public class RegisterRulesTest extends AbstractDaoTestCase {
     checkTables("not_disable_manual_rules", EXCLUDED_COLUMN_NAMES_INCLUDING_DEBT, "rules");
   }
 
-//  @Test
-//  public void test_high_number_of_rules() {
-//    task = new RegisterRules(new RuleDefinitionsLoader(mock(RuleRepositories.class), new RulesDefinition[]{new BigRepository()}),
-//      profilesManager, ruleTagOperations, myBatis, ruleDao, activeRuleDao, characteristicDao, mock(RegisterDebtModel.class));
-//
-//    setupData("shared");
-//    task.start();
-//
-//    // There is already one rule in DB
-//    assertThat(ruleDao.selectAll()).hasSize(BigRepository.SIZE + 1);
-//    assertThat(ruleDao.selectParameters()).hasSize(BigRepository.SIZE * 20);
+  @Test
+  public void test_high_number_of_rules() {
+    task = new RegisterRules(new RuleDefinitionsLoader(mock(RuleRepositories.class), new RulesDefinition[]{new BigRepository()}),
+      profilesManager, myBatis, ruleDao, activeRuleDao, characteristicDao);
+
+    setupData("shared");
+    task.start();
+
+
+    // There is already one rule in DB
+    assertThat(ruleDao.findAll(session)).hasSize(BigRepository.SIZE + 1);
+    assertThat(ruleDao.findAllRuleParams(session)).hasSize(BigRepository.SIZE * 20);
 //    assertThat(ruleDao.selectTags(getMyBatis().openSession(false))).hasSize(BigRepository.SIZE * 3);
-//  }
-
-//  @Test
-//  public void insert_extended_repositories() {
-//    task = new RegisterRules(new RuleDefinitionsLoader(mock(RuleRepositories.class), new RulesDefinition[]{
-//      new FindbugsRepository(), new FbContribRepository()}),
-//      profilesManager, ruleRegistry, esRuleTags, ruleTagOperations, myBatis, ruleDao, ruleTagDao, activeRuleDao, characteristicDao, mock(RegisterDebtModel.class)
-//    );
-//
-//    setupData("empty");
-//    task.start();
-//
-//    checkTables("insert_extended_repositories", EXCLUDED_COLUMN_NAMES_INCLUDING_DEBT, "rules");
-//  }
+  }
+
+  @Test
+  public void insert_extended_repositories() {
+    task = new RegisterRules(new RuleDefinitionsLoader(mock(RuleRepositories.class), new RulesDefinition[]{
+      new FindbugsRepository(), new FbContribRepository()}),
+      profilesManager, myBatis, ruleDao, activeRuleDao, characteristicDao
+    );
+
+
+    setupData("empty");
+    task.start();
+
+    checkTables("insert_extended_repositories", EXCLUDED_COLUMN_NAMES_INCLUDING_DEBT, "rules");
+  }
 
   static class FakeRepository implements RulesDefinition {
     @Override

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rule_params-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rule_params-result.xml
index e62e97a793d44e0d9252fc771a9fa7431ae743cf..dfa2ccff0193bdcf56e8f42b6e16a87bb3a891d5 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rule_params-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rule_params-result.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <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"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"/>
 
   <rules_parameters id="1" rule_id="1" default_value="default value one" description="parameter one" name="param1" param_type="STRING"/>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rule_params.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rule_params.xml
index 5b6e2bc90ed2f364a9be6e4283283ff34dd91fd6..bf310a09b6a4b88a8d29b5c7502602d9e78afb09 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rule_params.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rule_params.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
+  <rules tags="[null]" system_tags="tag1,tag3,tag5" 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]" />
 
   <rules_parameters id="1" rule_id="1" name="param1" description="[null]" param_type="STRING"/>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rules-result.xml
index 4994d92912aa129d5f398c972491ca12f4301d44..1616973e23e0a561520f5ad9d4efb524ab784025 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rules-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rules-result.xml
@@ -1,15 +1,15 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"/>
 
-  <rules tags="" system_tags="tag1,tag3,tag5" id="3" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" system_tags="tag1,tag3,tag5" id="3" 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"/>
 
-  <rules tags="" system_tags="" id="4" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="[null]" system_tags="[null]" id="4" 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"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rules.xml
index e93d82a6fdec0881ec0969c2f3f6fb01938780e6..8957a2373d47f8f46ccc479eaf6016f2ce3a5ad8 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rules.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rules.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
   <rules_parameters id="1" rule_id="1" name="deprecated-prop" description="[null]" param_type="STRING"/>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_repositories-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_repositories-result.xml
index f62bcfb60d1900236615b5df6bad5bf5934ae65c..f350c52f77bfc70534c2a9ec435f97aa51b55129 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_repositories-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_repositories-result.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
      status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" system_tags="[null]" id="2" 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"/>
   <rules_parameters id="1" rule_id="2" default_value="default value one" description="parameter one" name="param1" param_type="STRING"/>
   <rules_parameters id="2" rule_id="2" default_value="default value two" description="parameter two" name="param2" param_type="STRING"/>
@@ -11,7 +11,7 @@
   <rule_tags id="2" rule_id="2" tag="tag3" tag_type="SYSTEM"/>
   <rule_tags id="3" rule_id="2" tag="tag5" tag_type="SYSTEM"/>
 
-  <rules tags="" system_tags="" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="rule2" name="Two" description="Description of Two"
+  <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="rule2" name="Two" description="Description of Two"
                    status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"/>
   
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_rules-result.xml
index 0a9bf6572c3e9ef0e2c50cea523f0afeded4ea94..a19bf8bb48aeb1c2772e6f6cc03c53ade586557e 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_rules-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_rules-result.xml
@@ -1,20 +1,20 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"/>
 
   <rules_parameters id="1" rule_id="1" name="deprecated-prop" description="[null]" param_type="STRING" default_value="[null]"/>
 
-  <rules tags="" system_tags="tag1,tag3,tag5" id="3" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" system_tags="tag1,tag3,tag5" id="3" 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"/>
 
   <rules_parameters id="2" rule_id="3" default_value="default value one" description="parameter one" name="param1" param_type="STRING"/>
   <rules_parameters id="3" rule_id="3" default_value="default value two" description="parameter two" name="param2" param_type="STRING"/>
 
-  <rules tags="" system_tags="" id="4" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="[null]" system_tags="[null]" id="4" 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"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_rules.xml
index 877df4311669a580b54d4f415529369a2cd081aa..d13c0db742fa9757276c4f74e22023759815f5e6 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_rules.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_rules.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="" system_tags="formertag1" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="[null]" system_tags="formertag1" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
-  <rules tags="formertag2" system_tags="" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
+  <rules tags="formertag2" system_tags="[null]" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
   <rules_parameters id="1" rule_id="1" name="deprecated-prop" description="[null]" param_type="STRING"/>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_template_rules_if_parent_is_disabled-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_template_rules_if_parent_is_disabled-result.xml
index 9d0e154fead2ab221a743f630bce7479831a9b5b..816825359714eedeb151d91c31439b6aa65bfc48 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_template_rules_if_parent_is_disabled-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_template_rules_if_parent_is_disabled-result.xml
@@ -1,21 +1,21 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="disabled_rule" plugin_name="fake" plugin_config_key="[null]" name="Disabled rule" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="disabled_rule" plugin_name="fake" plugin_config_key="[null]" name="Disabled rule" description="[null]"
          status="REMOVED" priority="4" cardinality="MULTIPLE" parent_id="[null]" language="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="1" language="[null]"/>
 
-  <rules tags="" system_tags="" id="3" plugin_rule_key="disabled_rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="disabled_rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
          status="REMOVED" priority="1" cardinality="SINGLE" parent_id="[null]"  language="[null]"/>
 
-  <rules tags="" system_tags="" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="3" language="[null]"/>
 
-  <rules tags="" system_tags="" id="5" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" system_tags="[null]" id="5" 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"/>
 
-  <rules tags="" system_tags="" id="6" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="[null]" system_tags="[null]" id="6" 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"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_template_rules_if_parent_is_disabled.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_template_rules_if_parent_is_disabled.xml
index 6091a6bd195fb500f5248cc4c66b6af6c4bf9851..d3e61274471b9243e5636b35a40ef31becec6a69 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_template_rules_if_parent_is_disabled.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_template_rules_if_parent_is_disabled.xml
@@ -1,19 +1,19 @@
 <dataset>
 
   <!-- Rule as been removed -->
-  <rules tags="" system_tags="" id="1" plugin_rule_key="disabled_rule" plugin_name="fake" plugin_config_key="[null]" name="Disabled rule" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="disabled_rule" plugin_name="fake" plugin_config_key="[null]" name="Disabled rule" description="[null]"
          status="REMOVED" priority="4" cardinality="MULTIPLE" parent_id="[null]"/>
 
   <!-- user rule duplicated from rule 1. It is currently enabled. -->
-  <rules tags="" system_tags="" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="1"/>
 
   <!-- This rule will be removed... -->
-  <rules tags="" system_tags="" id="3" plugin_rule_key="disabled_rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="disabled_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]" />
 
   <!-- ...so this template will be removed too -->
-  <rules tags="" system_tags="" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="3"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/ignore_rule_debt_definitions_if_rule_is_linked_on_root_characteristic.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/ignore_rule_debt_definitions_if_rule_is_linked_on_root_characteristic.xml
index 55f29c2f96123adfaa8fb97f3f464b4adbe7dee8..d5dfe74dd1c24972b953ab444c98f1b5a04bcd62 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/ignore_rule_debt_definitions_if_rule_is_linked_on_root_characteristic.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/ignore_rule_debt_definitions_if_rule_is_linked_on_root_characteristic.xml
@@ -2,7 +2,7 @@
 
   <characteristics id="2" kee="MEMORY_EFFICIENCY" name="Efficiency" parent_id="[null]" characteristic_order="[null]" enabled="[true]"/>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
+  <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"
          status="READY" priority="2" cardinality="SINGLE" parent_id="[null]"
          characteristic_id="[null]" default_characteristic_id="200"
          remediation_function="[null]" default_remediation_function="LINEAR"
@@ -10,7 +10,7 @@
          remediation_offset="[null]" default_remediation_offset="[null]"
          effort_to_fix_description="squid.S1115.effortTotFix"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <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]"/>
 
 

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/insert_extended_repositories-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/insert_extended_repositories-result.xml
index 680cb48eac08c56c7578799f861f56121844ee6d..5ad7d6d57d1ef072040a21b4f1fd01ba288d1570 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/insert_extended_repositories-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/insert_extended_repositories-result.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="findbugs" plugin_config_key="[null]" name="Rule One" description="Description of Rule One"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="findbugs" plugin_config_key="[null]" name="Rule One" description="Description of Rule One"
      status="READY" priority="2" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-    <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="findbugs" plugin_config_key="[null]" name="Rule Two" description="Description of Rule Two"
+    <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="findbugs" plugin_config_key="[null]" name="Rule Two" description="Description of Rule Two"
          status="READY" priority="2" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/insert_new_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/insert_new_rules-result.xml
index 8bd8da0698bb6d8d7d6f73f45b48303ac6b2e281..0578a3d9262fa703b07b3ea99f4070a8c67e7fa2 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/insert_new_rules-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/insert_new_rules-result.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
@@ -8,7 +8,7 @@
          remediation_offset="[null]" default_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" system_tags="[null]" id="2" 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="2"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
@@ -27,7 +27,7 @@
   <rules_rule_tags id="2" rule_id="2" rule_tag_id="2" tag_type="SYSTEM"/>
   <rules_rule_tags id="3" rule_id="2" rule_tag_id="3" tag_type="SYSTEM"/>
 
-  <rules tags="" system_tags="" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="[null]" system_tags="[null]" id="3" 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"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_already_disabled_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_already_disabled_rules-result.xml
index 3a2aa5a2542ae8030073754af28c5f9b2d17bbe9..c798a6a0c7a4d04cc04faef9798bf95b907ef888 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_already_disabled_rules-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_already_disabled_rules-result.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
@@ -9,7 +9,7 @@
          effort_to_fix_description="[null]"
          updated_at="2014-03-16"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
@@ -19,7 +19,7 @@
          updated_at="2014-03-16"/>
 
  <!-- New rules -->
-  <rules tags="" system_tags="" id="3" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" system_tags="[null]" id="3" 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="2"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
@@ -28,7 +28,7 @@
          effort_to_fix_description="squid.S115.effortToFix"
          updated_at="2014-03-17 19:10:03.0"/>
 
-  <rules tags="" system_tags="" id="4" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="[null]" system_tags="[null]" id="4" 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"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_already_disabled_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_already_disabled_rules.xml
index 44553e69261ce14e698c69cd10fd14baaa07ca8b..1390753947752d621a7eb1b1870139fd79385811 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_already_disabled_rules.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_already_disabled_rules.xml
@@ -2,7 +2,7 @@
 
   <characteristics id="2" kee="MEMORY_EFFICIENCY" name="Memory Efficiency" parent_id="1" characteristic_order="1" enabled="[true]"/>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
@@ -11,7 +11,7 @@
          effort_to_fix_description="[null]"
          updated_at="2014-03-16"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_manual_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_manual_rules-result.xml
index 54e131930718b4f6c108ca51e80f64954a22a0f8..0f73b04c525c3adcee582b2dce360817b12f8aa2 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_manual_rules-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_manual_rules-result.xml
@@ -1,15 +1,15 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="PerformanceIssue" plugin_name="manual" plugin_config_key="[null]" name="Performance Issue" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="PerformanceIssue" plugin_name="manual" plugin_config_key="[null]" name="Performance Issue" description="[null]"
          status="READY" priority="[null]" cardinality="SINGLE" parent_id="[null]" language="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="IllegalExceptionCheck" plugin_name="checkstyle" plugin_config_key="[null]" name="Illegal Exception" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="IllegalExceptionCheck" plugin_name="checkstyle" plugin_config_key="[null]" name="Illegal Exception" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"/>
 
-  <rules tags="" system_tags="" id="3" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" system_tags="[null]" id="3" 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"/>
 
-  <rules tags="" system_tags="" id="4" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="[null]" system_tags="[null]" id="4" 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"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_manual_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_manual_rules.xml
index 832e52b92b6eb28332026eb6cb44a6edef7405a8..7f175d92749689aaf6db62054c0a9dbc83fa06b0 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_manual_rules.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_manual_rules.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="PerformanceIssue" plugin_name="manual" plugin_config_key="[null]" name="Performance Issue" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="PerformanceIssue" plugin_name="manual" plugin_config_key="[null]" name="Performance Issue" description="[null]"
          status="READY" priority="[null]" cardinality="SINGLE" parent_id="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="IllegalExceptionCheck" plugin_name="checkstyle" plugin_config_key="[null]" name="Illegal Exception" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="IllegalExceptionCheck" plugin_name="checkstyle" plugin_config_key="[null]" name="Illegal Exception" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled-result.xml
index 0c26b40b5177efd00e24dfe9e66b583ead983a30..446bbc47029eafc496e6a87776882428849fcf23 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled-result.xml
@@ -1,12 +1,12 @@
 <dataset>
 
-  <rules tags="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" system_tags="tag1,tag3,tag5" 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"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
      status="READY" priority="4" cardinality="SINGLE" parent_id="1" language="java"/>
 
-  <rules tags="" system_tags="" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="[null]" system_tags="[null]" id="3" 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"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled.xml
index 60fffd2389ab0dd39aa3a0a962482bd1be60d017..8e3bcfb804dca31a8bd410dc2393888f1dcb4903 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="[null]" name="Rule one" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="[null]" name="Rule one" description="[null]"
          status="READY" priority="4" cardinality="MULTIPLE" parent_id="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="1"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_update_already_disabled_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_update_already_disabled_rules-result.xml
index 2f2f453533a66d30a9495b961dae6f524d998499..91f0b991742c1e452e3edef40ce3b410958e0f0c 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_update_already_disabled_rules-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_update_already_disabled_rules-result.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="rule2" name="Two" description="Description of Two"
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="rule2" name="Two" description="Description of Two"
                    status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_update_already_disabled_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_update_already_disabled_rules.xml
index 56d37d8e5432d59cd30aa060408774792199b0b2..45e3706d7002755af5cab9e6754417ef45dc8b99 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_update_already_disabled_rules.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_update_already_disabled_rules.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/notify_for_removed_rules_when_repository_is_still_existing.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/notify_for_removed_rules_when_repository_is_still_existing.xml
index 0e6a0aa4968ca5ef5f60b3ad754b97a49fd01d36..f4e73c9239b720a71f05f8fa63d2c27cb3a97db1 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/notify_for_removed_rules_when_repository_is_still_existing.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/notify_for_removed_rules_when_repository_is_still_existing.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="fake" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="fake" plugin_config_key="[null]" name="Deprecated" description="[null]"
                    status="READY" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_rules-result.xml
index 13c41591aa5d875afaab1e510d1b7654ccddb7f9..fe4c1ce35060d0c9cb9094c1d20d6e2c06c29b82 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_rules-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_rules-result.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" system_tags="tag1,tag3,tag5" 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"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_rules.xml
index 3ab3113fd4dd06b72c621b1e6980edc0d0bc651b..d5b82972127ac9dc06c67ba2ddec2f8c51556487 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_rules.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_rules.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="[null]" name="Old name" description="Old description"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="[null]" name="Old name" description="Old description"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_template_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_template_rules-result.xml
index 97231e50ef393c4ca1a66deacce860dbecb8964e..518b25fb9924757cff2e14675687088f136fd7f5 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_template_rules-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_template_rules-result.xml
@@ -1,12 +1,12 @@
 <dataset>
 
-  <rules tags="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" system_tags="tag1,tag3,tag5" 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"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="1" language="java"/>
 
-  <rules tags="" system_tags="" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="[null]" system_tags="[null]" id="3" 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"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_template_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_template_rules.xml
index b80f5711a0457401569295b3d2bcebbc070c9f38..3982ccb7ca796618a1ac9beb4f930dbb7f15040a 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_template_rules.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_template_rules.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <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"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="1" language="java"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml
index b458b548fefd19fa901bdf144cfe42237ead6988..681ce324eaf044729b30568374fd1157c7f31a48 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <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"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
@@ -8,7 +8,7 @@
          remediation_offset="[null]" default_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml
index e6ac9b370e0f0992bc30dd476efd7e8171b2a691..36041f853cbb232902ef12da8b50a75febd8be79 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml
@@ -2,7 +2,7 @@
 
   <characteristics id="999" kee="NEW" name="New" parent_id="1" characteristic_order="1" enabled="[true]"/>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
+  <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"
          status="READY" priority="2" cardinality="SINGLE" parent_id="[null]"
          characteristic_id="[null]" default_characteristic_id="200"
          remediation_function="[null]" default_remediation_function="LINEAR"
@@ -10,7 +10,7 @@
          remediation_offset="[null]" default_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <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]"/>
 
 

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml
index 728e44a7c185e81c5a1cbe061cd4b6a332e9bcb1..63d0aaf32399e2f40b30c6969e701f78ed09e46f 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" system_tags="tag1,tag3,tag5" 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="-1" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
@@ -8,7 +8,7 @@
          remediation_offset="[null]" default_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml
index 1e870c31a765e2e9d5e90def378e399491e8eaf4..0c99aac7390c198f440986cdfee226dcd0d01262 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml
@@ -2,7 +2,7 @@
 
   <characteristics id="999" kee="NEW" name="New" parent_id="1" characteristic_order="1" enabled="[true]"/>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
+  <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"
          status="READY" priority="2" cardinality="SINGLE" parent_id="[null]"
          characteristic_id="-1" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
@@ -10,7 +10,7 @@
          remediation_offset="[null]" default_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <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]"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden-result.xml
index b47f35dcb2b9124d9fa16285d5744b2c95afa4dd..4bd810288ed50824332400fad1442967bdba8e0b 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden-result.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" system_tags="tag1,tag3,tag5" 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="3" default_characteristic_id="[null]"
          remediation_function="LINEAR_OFFSET" default_remediation_function="[null]"
@@ -8,7 +8,7 @@
          remediation_offset="10h" default_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden.xml
index b7d6edf03100c9045cbe72ad5730a127b2cbf840..6ff0decdea8e6c7d189b0f55c9f67367eecfe19e 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden.xml
@@ -4,7 +4,7 @@
   <characteristics id="2" kee="MEMORY_EFFICIENCY" name="Memory Efficiency" parent_id="1" characteristic_order="1" enabled="[false]"/>
   <characteristics id="3" kee="COMPILER" name="Compiler" parent_id="1" characteristic_order="1" enabled="[true]"/>
 
-  <rules tags="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
+  <rules tags="[null]" system_tags="tag1,tag3,tag5" 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="3" default_characteristic_id="[null]"
          remediation_function="LINEAR_OFFSET" default_remediation_function="[null]"
@@ -12,7 +12,7 @@
          remediation_offset="10h" default_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <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]"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/shared.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/shared.xml
index c6bc110446a5fdfc6ae034fd0531045e03bfd7ef..c1c3fb31ab42cd78c5a9f4a3843e8dd5258d01ae 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/shared.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/shared.xml
@@ -2,7 +2,7 @@
 
   <characteristics id="2" kee="MEMORY_EFFICIENCY" name="Memory Efficiency" parent_id="1" characteristic_order="1" enabled="[true]"/>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
                    status="READY" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/store_bundle_name_and_description_in_database-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/store_bundle_name_and_description_in_database-result.xml
index ea262565bb6455ebcdd6df40067ef5907e38618d..1cfe02dd4ab68611a0ab91dc9560a26d14f6028b 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/store_bundle_name_and_description_in_database-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/store_bundle_name_and_description_in_database-result.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="The One" description="The Description of One"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="The One" description="The Description of One"
      status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="rule2" name="Two" description="Description of Two"
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="rule2" name="Two" description="Description of Two"
      status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
 </dataset>

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 7214b9a16f0591d442558a20f269a923a3fce30d..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
@@ -12,7 +12,7 @@
   <rules_parameters id="2" rule_id="1" default_value="default value two" description="parameter two" name="param2" param_type="STRING"/>
 
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"

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 76cfc9b5c7f3c245779f9e882e376bb41f2b5196..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
@@ -12,7 +12,7 @@
 
   <rules_parameters id="1" rule_id="1" name="param1" description="[null]" param_type="STRING"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <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]"/>
 
 

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_parameters-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_parameters-result.xml
index 56fce29d5548990d297579b76bd159c9ecbd604c..08777a3cbfb7d71cc3432478ae48631c6d9a095d 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_parameters-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_parameters-result.xml
@@ -1,11 +1,11 @@
 <dataset>
 
-  <rules tags="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" system_tags="tag1,tag3,tag5" 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"/>
   <rules_parameters id="1" rule_id="1" default_value="default value one" description="parameter one" name="param1" param_type="STRING"/>
   <rules_parameters id="3" rule_id="1" default_value="default value two" description="parameter two" name="param2" param_type="STRING"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_parameters.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_parameters.xml
index ff8c90bae1c490cbbed06402e241695edab0ad9b..f1037dcb3f5e79dbfceed92589b44b63f3e57840 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_parameters.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_parameters.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
+  <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"
          status="READY" priority="2" cardinality="SINGLE" parent_id="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <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]"/>
 
   <rules_parameters id="1" rule_id="1" name="param1" description="old description" param_type="STRING"/>

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_template_rule_language-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_template_rule_language-result.xml
index 502da4b134267f25b4bc19d228c40a3f1e27f3ab..a7ecc1906159e5e93d066ef8300eb33d6eea96c3 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_template_rule_language-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_template_rule_language-result.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" system_tags="tag1,tag3,tag5" 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="100"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
@@ -9,7 +9,7 @@
          effort_to_fix_description="squid.S115.effortToFix" />
 
   <!-- Instance of old rule 1 :/ -->
-  <rules tags="" system_tags="" id="2" plugin_rule_key="template_rule1" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="template_rule1" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="1" language="java"
          characteristic_id="[null]" default_characteristic_id="100"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
@@ -17,7 +17,7 @@
          remediation_offset="[null]" default_remediation_offset="10h"
          effort_to_fix_description="squid.S115.effortToFix" />
 
-  <rules tags="" system_tags="" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="[null]" system_tags="[null]" id="3" 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"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
@@ -26,7 +26,7 @@
          effort_to_fix_description="[null]" />
 
   <!-- Template of old rule 3 :/ -->
-  <rules tags="" system_tags="" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="DEPRECATED" priority="4" cardinality="SINGLE" parent_id="3" language="java"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_template_rule_language.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_template_rule_language.xml
index a0c956a8c1c726013503908ac65fb705cee40c2b..ef467594087320448a190e040030663d7a35d4b1 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_template_rule_language.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_template_rule_language.xml
@@ -2,7 +2,7 @@
 
   <characteristics id="100" kee="MEMORY_EFFICIENCY" name="Memory Efficiency" parent_id="1" characteristic_order="1" enabled="[true]"/>
 
-  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="[null]" name="Rule one" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="[null]" name="Rule one" description="[null]"
          status="READY" priority="4" cardinality="MULTIPLE" parent_id="[null]" language="[null]"
          characteristic_id="[null]" default_characteristic_id="100"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
@@ -11,7 +11,7 @@
          effort_to_fix_description="squid.S115.effortToFix" />
 
   <!-- Instance of rule 1 -->
-  <rules tags="" system_tags="" id="2" plugin_rule_key="template_rule1" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="template_rule1" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="1" language="[null]"
          characteristic_id="[null]" default_characteristic_id="200"
          remediation_function="[null]" default_remediation_function="LINEAR"
@@ -19,7 +19,7 @@
          remediation_offset="[null]" default_remediation_offset="15min"
          effort_to_fix_description="squid.S115.effortToFix2" />
 
-  <rules tags="" system_tags="" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
          status="DEPRECATED" priority="1" cardinality="MULTIPLE" parent_id="[null]"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
@@ -28,7 +28,7 @@
          effort_to_fix_description="[null]" />
 
   <!-- Instance of rule 3 -->
-  <rules tags="" system_tags="" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="3"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"