SONAR-1722: Rename ActiveRule.overrides to AcriveRule.overridden

SONAR-2052: Support inheritance of quality profiles in backup of global configuration

17 files changed, 89 insertions, 62 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesBackup.java b/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesBackup.java
index 67ef7de9185..85dfbbae810 100644
--- a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesBackup.java
+++ b/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesBackup.java
@@ -169,6 +169,8 @@ public class ProfilesBackup implements Backupable {
         writeNode(writer, "key", rule.getRule().getKey());
         writeNode(writer, "plugin", rule.getRule().getRepositoryKey());
         writeNode(writer, "level", rule.getSeverity().name());
+        writeNode(writer, "inherited", Boolean.toString(rule.isInherited()));
+        writeNode(writer, "overridden", Boolean.toString(rule.isOverridden()));
 
         if (!rule.getActiveRuleParams().isEmpty()) {
           writer.startNode("params");
@@ -204,6 +206,8 @@ public class ProfilesBackup implements Backupable {
         ActiveRule activeRule = new ActiveRule(null, new Rule(valuesRule.get("plugin"), valuesRule.get("key")), RulePriority
             .valueOf(valuesRule.get("level")));
         activeRule.setActiveRuleParams(params);
+        activeRule.setInherited(Boolean.parseBoolean(valuesRule.get("inherited")));
+        activeRule.setOverridden(Boolean.parseBoolean(valuesRule.get("overridden")));
         return activeRule;
       }
 
diff --git a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java b/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java
index 549f71742f2..9053b287aca 100644
--- a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java
+++ b/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java
@@ -104,8 +104,8 @@ public class ProfilesManager extends BaseDao {
   public void activatedOrChanged(int parentProfileId, int activeRuleId) {
     List<RulesProfile> children = getChildren(parentProfileId);
     ActiveRule parentActiveRule = getSession().getEntity(ActiveRule.class, activeRuleId);
-    if (parentActiveRule.isInherited() && !parentActiveRule.isOverrides()) {
-      parentActiveRule.setOverrides(true);
+    if (parentActiveRule.isInherited() && !parentActiveRule.isOverridden()) {
+      parentActiveRule.setOverridden(true);
       getSession().saveWithoutFlush(parentActiveRule);
     }
     for (RulesProfile child : children) {
@@ -129,7 +129,7 @@ public class ProfilesManager extends BaseDao {
   public void revert(int profileId, int activeRuleId) {
     RulesProfile profile = getSession().getEntity(RulesProfile.class, profileId);
     ActiveRule activeRule = getSession().getEntity(ActiveRule.class, activeRuleId);
-    if (activeRule != null && activeRule.isInherited() && activeRule.isOverrides()) {
+    if (activeRule != null && activeRule.isInherited() && activeRule.isOverridden()) {
       ActiveRule parentActiveRule = getParentProfile(profile).getActiveRule(activeRule.getRule());
       removeActiveRule(profile, activeRule);
       activeRule = (ActiveRule) parentActiveRule.clone();
@@ -143,11 +143,11 @@ public class ProfilesManager extends BaseDao {
   private void activateOrChange(RulesProfile profile, ActiveRule parentActiveRule) {
     ActiveRule activeRule = profile.getActiveRule(parentActiveRule.getRule());
     if (activeRule != null) {
-      if (activeRule.isInherited() && !activeRule.isOverrides()) {
+      if (activeRule.isInherited() && !activeRule.isOverridden()) {
         removeActiveRule(profile, activeRule);
       } else {
         activeRule.setInherited(true);
-        activeRule.setOverrides(true);
+        activeRule.setOverridden(true);
         getSession().saveWithoutFlush(activeRule);
         return;
       }
@@ -161,11 +161,11 @@ public class ProfilesManager extends BaseDao {
   private void deactivate(RulesProfile profile, Rule rule) {
     ActiveRule activeRule = profile.getActiveRule(rule);
     if (activeRule != null) {
-      if (activeRule.isInherited() && !activeRule.isOverrides()) {
+      if (activeRule.isInherited() && !activeRule.isOverridden()) {
         removeActiveRule(profile, activeRule);
       } else {
         activeRule.setInherited(false);
-        activeRule.setOverrides(false);
+        activeRule.setOverridden(false);
         getSession().saveWithoutFlush(activeRule);
       }
     }
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
index dd8d4ae7885..e8bc6427c82 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
@@ -1,6 +1,6 @@
 <td nowrap valign="top" class="left" x="<%= active_rule.failure_level if active_rule -%>" width="1%">
   <% inherited = active_rule.inherited if active_rule
-     overrides = active_rule.overrides if active_rule
+     overridden = active_rule.overridden if active_rule
   %>
   <form id="levels_<%= rule.id -%>" action="">
       <% enable_modification = is_admin && !profile.provided?
@@ -25,7 +25,7 @@
 </td>
 <td valign="top" class="left">
   <% if inherited %>
-    <% if overrides %>
+    <% if overridden %>
       Overrides rule from parent profile.<br/>
       <%= button_to "Revert", :action => 'revert_rule', :id => profile.id, :active_rule_id => active_rule.id %><br/>
     <% else %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/169_add_columns_for_profiles_inheritance.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/169_add_columns_for_profiles_inheritance.rb
index 2119cbe479b..9d99baf7817 100644
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/169_add_columns_for_profiles_inheritance.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/169_add_columns_for_profiles_inheritance.rb
@@ -25,9 +25,9 @@ class AddColumnsForProfilesInheritance < ActiveRecord::Migration
 
   def self.up
     add_column 'active_rules', 'inherited', :boolean, :null => true
-    add_column 'active_rules', 'overrides', :boolean, :null => true
+    add_column 'active_rules', 'overridden', :boolean, :null => true
     ActiveRule.reset_column_information
-    ActiveRule.update_all(ActiveRule.sanitize_sql_for_assignment({:inherited => false, :overrides => false}))
+    ActiveRule.update_all(ActiveRule.sanitize_sql_for_assignment({:inherited => false, :overridden => false}))
 
     add_column 'rules_profiles', 'parent_name', :string, :limit => 40, :null => true
     Profile.reset_column_information
diff --git a/sonar-server/src/test/java/org/sonar/server/configuration/BackupTest.java b/sonar-server/src/test/java/org/sonar/server/configuration/BackupTest.java
index c9afa4d3dae..3a2b52029f2 100644
--- a/sonar-server/src/test/java/org/sonar/server/configuration/BackupTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/configuration/BackupTest.java
@@ -114,7 +114,7 @@ public class BackupTest {
     }
 
     Collection<RulesProfile> profiles = sonarConfig.getProfiles();
-    assertEquals(3, profiles.size());
+    assertEquals(2, profiles.size());
 
     Iterator<RulesProfile> profilesIter = profiles.iterator();
     RulesProfile testProfile = profilesIter.next();
@@ -128,6 +128,8 @@ public class BackupTest {
     assertNotNull(testActiveRule.getRule());
     assertEquals("test key", testActiveRule.getRule().getKey());
     assertEquals("test plugin", testActiveRule.getRule().getRepositoryKey());
+    assertThat(testActiveRule.isInherited(), is(false));
+    assertThat(testActiveRule.isOverridden(), is(false));
     assertEquals(1, testActiveRule.getActiveRuleParams().size());
 
     ActiveRuleParam testActiveRuleParam = testActiveRule.getActiveRuleParams().get(0);
@@ -143,8 +145,13 @@ public class BackupTest {
     assertNotNull(testAlert.getMetric());
     assertEquals("test key", testAlert.getMetric().getKey());
 
+    // Child profile
     testProfile = profilesIter.next();
-    assertEquals("test2 parent", testProfile.getParentName());
+    assertEquals("test2 name", testProfile.getName());
+    assertEquals("test name", testProfile.getParentName());
+    testActiveRule = testProfile.getActiveRules().get(0);
+    assertThat(testActiveRule.isInherited(), is(true));
+    assertThat(testActiveRule.isOverridden(), is(true));
 
     Collection<Rule> rules = sonarConfig.getRules();
     assertThat(rules.size(), is(1));
@@ -245,23 +252,25 @@ public class BackupTest {
   private List<RulesProfile> getProfiles() {
     List<RulesProfile> profiles = new ArrayList<RulesProfile>();
 
+    Rule rule = Rule.create("test plugin", "test key", null);
+    rule.createParameter("test param key");
+
     RulesProfile profile1 = RulesProfile.create("test name", "test language");
     profile1.setDefaultProfile(true);
     profile1.setProvided(true);
     profiles.add(profile1);
 
-    RulesProfile parentProfile = RulesProfile.create("test2 parent", "test2 language");
-    profiles.add(parentProfile);
+    ActiveRule activeRule = profile1.activateRule(rule, RulePriority.MAJOR);
+    activeRule.setParameter("test param key", "test value");
 
-    RulesProfile profile2 = RulesProfile.create("test2 name", "test2 language");
-    profile2.setParentName(parentProfile.getName());
+    RulesProfile profile2 = RulesProfile.create("test2 name", "test language");
+    profile2.setParentName(profile1.getName());
     profiles.add(profile2);
 
-    Rule rule = Rule.create("test plugin", "test key", null);
-    rule.createParameter("test param key");
-
-    ActiveRule activeRule = profile1.activateRule(rule, RulePriority.MAJOR);
-    activeRule.setParameter("test param key", "test value");
+    ActiveRule activeRule2 = profile2.activateRule(rule, RulePriority.MINOR);
+    activeRule2.setParameter("test param key", "test value");
+    activeRule2.setInherited(true);
+    activeRule2.setOverridden(true);
 
     profiles.get(0).getAlerts().add(new Alert(null, new Metric("test key"), Alert.OPERATOR_GREATER, "testError", "testWarn"));
 
diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-valid.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-valid.xml
index e549391d960..d271cb729c3 100644
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-valid.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-valid.xml
@@ -63,17 +63,23 @@
       <name><![CDATA[test2 name]]></name>
       <default-profile><![CDATA[false]]></default-profile>
       <provided><![CDATA[false]]></provided>
-      <language><![CDATA[test2 language]]></language>
-      <parentName><![CDATA[test2 parent]]></parentName>
-      <active-rules/>
-      <alerts/>
-    </profile>
-    <profile>
-      <name><![CDATA[test2 parent]]></name>
-      <default-profile><![CDATA[false]]></default-profile>
-      <provided><![CDATA[false]]></provided>
-      <language><![CDATA[test2 language]]></language>
-      <active-rules/>
+      <language><![CDATA[test language]]></language>
+      <parentName><![CDATA[test name]]></parentName>
+      <active-rules>
+        <active-rule>
+          <key><![CDATA[test key]]></key>
+          <plugin><![CDATA[test plugin]]></plugin>
+          <level><![CDATA[ERROR]]></level>
+          <inherited><![CDATA[true]]></inherited>
+          <overridden><![CDATA[true]]></overridden>
+          <params>
+            <param>
+              <key><![CDATA[test param key]]></key>
+              <value><![CDATA[test value]]></value>
+            </param>
+          </params>
+        </active-rule>
+      </active-rules>
       <alerts/>
     </profile>
   </profiles>
diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-valid.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-valid.xml
index 7d0db470c77..7f353a51f67 100644
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-valid.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-valid.xml
@@ -44,6 +44,8 @@
           <key><![CDATA[test key]]></key>
           <plugin><![CDATA[test plugin]]></plugin>
           <level><![CDATA[MAJOR]]></level>
+          <inherited><![CDATA[false]]></inherited>
+          <overridden><![CDATA[false]]></overridden>
           <params>
             <param>
               <key><![CDATA[test param key]]></key>
@@ -62,20 +64,26 @@
       </alerts>
     </profile>
     <profile>
-      <name><![CDATA[test2 parent]]></name>
-      <default-profile><![CDATA[false]]></default-profile>
-      <provided><![CDATA[false]]></provided>
-      <language><![CDATA[test2 language]]></language>
-      <active-rules/>
-      <alerts/>
-    </profile>
-    <profile>
       <name><![CDATA[test2 name]]></name>
       <default-profile><![CDATA[false]]></default-profile>
       <provided><![CDATA[false]]></provided>
-      <language><![CDATA[test2 language]]></language>
-      <parentName><![CDATA[test2 parent]]></parentName>
-      <active-rules/>
+      <language><![CDATA[test language]]></language>
+      <parentName><![CDATA[test name]]></parentName>
+      <active-rules>
+        <active-rule>
+          <key><![CDATA[test key]]></key>
+          <plugin><![CDATA[test plugin]]></plugin>
+          <level><![CDATA[MINOR]]></level>
+          <inherited><![CDATA[true]]></inherited>
+          <overridden><![CDATA[true]]></overridden>
+          <params>
+            <param>
+              <key><![CDATA[test param key]]></key>
+              <value><![CDATA[test value]]></value>
+            </param>
+          </params>
+        </active-rule>
+      </active-rules>
       <alerts/>
     </profile>
   </profiles>
diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren-result.xml
index 04db426da65..36f0a7035e0 100644
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren-result.xml
@@ -9,10 +9,10 @@
   
   <rules_profiles id="2" provided="false" name="child" default_profile="0" language="java" parent_name="parent"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overrides="[null]"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overridden="[null]"/>
   <active_rule_parameters id="1" active_rule_id="1" rules_parameter_id="1" value="30"/>
   
-  <active_rules id="2" profile_id="2" rule_id="1" failure_level="2" inherited="true" overrides="[null]"/>
+  <active_rules id="2" profile_id="2" rule_id="1" failure_level="2" inherited="true" overridden="[null]"/>
   <active_rule_parameters id="2" active_rule_id="2" rules_parameter_id="1" value="30"/>
   
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren.xml
index 0cc85206463..8eaee098614 100644
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren.xml
@@ -9,7 +9,7 @@
   
   <rules_profiles id="2" provided="false" name="child" default_profile="0" language="java" parent_name="parent"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overrides="[null]"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overridden="[null]"/>
   <active_rule_parameters id="1" active_rule_id="1" rules_parameter_id="1" value="30"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent-result.xml
index c93d81534ff..2d8dcd06fef 100644
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent-result.xml
@@ -12,10 +12,10 @@
   
   <rules_profiles id="3" provided="false" name="child" default_profile="0" language="java" parent_name="new_parent"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overrides="[null]"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overridden="[null]"/>
 
-  <active_rules id="2" profile_id="2" rule_id="2" failure_level="2" inherited="false" overrides="[null]"/>
+  <active_rules id="2" profile_id="2" rule_id="2" failure_level="2" inherited="false" overridden="[null]"/>
   
-  <active_rules id="4" profile_id="3" rule_id="2" failure_level="2" inherited="true" overrides="[null]"/>
+  <active_rules id="4" profile_id="3" rule_id="2" failure_level="2" inherited="true" overridden="[null]"/>
   
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent.xml
index d93a6684d19..4e94e54fa5f 100644
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent.xml
@@ -12,10 +12,10 @@
   
   <rules_profiles id="3" provided="false" name="child" default_profile="0" language="java" parent_name="parent"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overrides="[null]"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overridden="[null]"/>
 
-  <active_rules id="2" profile_id="2" rule_id="2" failure_level="2" inherited="false" overrides="[null]"/>
+  <active_rules id="2" profile_id="2" rule_id="2" failure_level="2" inherited="false" overridden="[null]"/>
   
-  <active_rules id="3" profile_id="3" rule_id="1" failure_level="2" inherited="true" overrides="[null]"/>
+  <active_rules id="3" profile_id="3" rule_id="1" failure_level="2" inherited="true" overridden="[null]"/>
   
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren-result.xml
index 6f68f9f6338..874f79d03e4 100644
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren-result.xml
@@ -7,6 +7,6 @@
   
   <rules_profiles id="2" provided="false" name="child" default_profile="0" language="java" parent_name="parent"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overrides="[null]"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overridden="[null]"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren.xml
index 73010f07a0b..016e11a46f4 100644
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren.xml
@@ -7,8 +7,8 @@
   
   <rules_profiles id="2" provided="false" name="child" default_profile="0" language="java" parent_name="parent"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overrides="[null]"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overridden="[null]"/>
 
-  <active_rules id="2" profile_id="2" rule_id="1" failure_level="2" inherited="true" overrides="[null]"/>
+  <active_rules id="2" profile_id="2" rule_id="1" failure_level="2" inherited="true" overridden="[null]"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent-result.xml
index 7c93dac1ad3..783ad6580b8 100644
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent-result.xml
@@ -7,6 +7,6 @@
   
   <rules_profiles id="2" provided="false" name="child" default_profile="0" language="java" parent_name="[null]"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overrides="[null]"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overridden="[null]"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent.xml
index 73010f07a0b..016e11a46f4 100644
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent.xml
@@ -7,8 +7,8 @@
   
   <rules_profiles id="2" provided="false" name="child" default_profile="0" language="java" parent_name="parent"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overrides="[null]"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overridden="[null]"/>
 
-  <active_rules id="2" profile_id="2" rule_id="1" failure_level="2" inherited="true" overrides="[null]"/>
+  <active_rules id="2" profile_id="2" rule_id="1" failure_level="2" inherited="true" overridden="[null]"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent-result.xml
index 73010f07a0b..016e11a46f4 100644
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent-result.xml
@@ -7,8 +7,8 @@
   
   <rules_profiles id="2" provided="false" name="child" default_profile="0" language="java" parent_name="parent"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overrides="[null]"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overridden="[null]"/>
 
-  <active_rules id="2" profile_id="2" rule_id="1" failure_level="2" inherited="true" overrides="[null]"/>
+  <active_rules id="2" profile_id="2" rule_id="1" failure_level="2" inherited="true" overridden="[null]"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent.xml
index 7c93dac1ad3..783ad6580b8 100644
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent.xml
@@ -7,6 +7,6 @@
   
   <rules_profiles id="2" provided="false" name="child" default_profile="0" language="java" parent_name="[null]"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overrides="[null]"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="false" overridden="[null]"/>
 
 </dataset>