diff options
Diffstat (limited to 'sonar-server/src')
20 files changed, 98 insertions, 48 deletions
diff --git a/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java b/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java index 248b00db06a..cbf1e521f53 100644 --- a/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java +++ b/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java @@ -117,8 +117,8 @@ public class CopyRequirementsFromCharacteristicsToRules { private static class RuleInputLoader implements MassUpdater.InputLoader<RuleRow>{ @Override public String selectSql() { - return "SELECT r.id,r.characteristic_id,r.remediation_function,r.remediation_factor,r.remediation_offset," + - "r.default_characteristic_id,r.default_remediation_function,r.default_remediation_factor,r.default_remediation_offset,r.status " + + return "SELECT r.id,r.characteristic_id,r.remediation_function,r.remediation_coeff,r.remediation_offset," + + "r.default_characteristic_id,r.default_remediation_function,r.default_remediation_coeff,r.default_remediation_offset,r.status " + "FROM rules r"; } @@ -151,7 +151,7 @@ public class CopyRequirementsFromCharacteristicsToRules { @Override public String updateSql() { - return "UPDATE rules SET characteristic_id=?,remediation_function=?,remediation_factor=?,remediation_offset=?,updated_at=? WHERE id=?"; + return "UPDATE rules SET characteristic_id=?,remediation_function=?,remediation_coeff=?,remediation_offset=?,updated_at=? WHERE id=?"; } @Override diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/523_update_rule_debt_columns.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/523_update_rule_debt_columns.rb new file mode 100644 index 00000000000..9e7b2b72133 --- /dev/null +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/523_update_rule_debt_columns.rb @@ -0,0 +1,50 @@ +# +# SonarQube, open source software quality management tool. +# Copyright (C) 2008-2014 SonarSource +# mailto:contact AT sonarsource DOT com +# +# SonarQube is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 3 of the License, or (at your option) any later version. +# +# SonarQube is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + +# +# SonarQube 4.3 +# +# TO BE DELETED WHEN EXECUTED ON DORY +# +class UpdateRuleDebtColumns < ActiveRecord::Migration + + class Rule < ActiveRecord::Base + end + + def self.up + Metric.reset_column_information + + rename_column(:rules, :remediation_factor, :remediation_coeff) + rename_column(:rules, :default_remediation_factor, :default_remediation_coeff) + + # As CopyRequirementsFromCharacteristicsToRules has been updated to not insert 0X durations, we have update columns to reflect what should have been done. + + Rule.update_all("remediation_coeff=NULL", "remediation_coeff = '0d'" ) + Rule.update_all("remediation_coeff=NULL", "remediation_coeff = '0h'" ) + Rule.update_all("remediation_coeff=NULL", "remediation_coeff = '0min'" ) + Rule.update_all("remediation_coeff=NULL", "remediation_coeff = '0mn'" ) + + Rule.update_all("remediation_offset=NULL", "remediation_offset = '0d'" ) + Rule.update_all("remediation_offset=NULL", "remediation_offset = '0h'" ) + Rule.update_all("remediation_offset=NULL", "remediation_offset = '0min'" ) + Rule.update_all("remediation_offset=NULL", "remediation_offset = '0mn'" ) + end + +end diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java index 7248d6d6718..a0fd69ff7f9 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java @@ -48,7 +48,7 @@ public class RegisterRulesTest extends AbstractDaoTestCase { private static final String[] EXCLUDED_COLUMN_NAMES = {"created_at", "updated_at", "note_data", "note_user_login", "note_created_at", "note_updated_at"}; private static final String[] EXCLUDED_COLUMN_NAMES_INCLUDING_DEBT = {"created_at", "updated_at", "note_data", "note_user_login", "note_created_at", "note_updated_at", "characteristic_id", "default_characteristic_id", - "remediation_function", "default_remediation_function", "remediation_factor", "default_remediation_factor", "remediation_offset", "default_remediation_offset", + "remediation_function", "default_remediation_function", "remediation_coeff", "default_remediation_coeff", "remediation_offset", "default_remediation_offset", "effort_to_fix_description"}; RegisterRules task; diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/ignore_rule_debt_definitions_if_rule_is_linked_on_root_characteristic.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/ignore_rule_debt_definitions_if_rule_is_linked_on_root_characteristic.xml index 2c69463ae43..f292f0a01f6 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/ignore_rule_debt_definitions_if_rule_is_linked_on_root_characteristic.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/ignore_rule_debt_definitions_if_rule_is_linked_on_root_characteristic.xml @@ -6,7 +6,7 @@ status="READY" priority="2" cardinality="SINGLE" parent_id="[null]" characteristic_id="[null]" default_characteristic_id="200" remediation_function="[null]" default_remediation_function="LINEAR" - remediation_factor="[null]" default_remediation_factor="14min" + remediation_coeff="[null]" default_remediation_coeff="14min" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="squid.S1115.effortTotFix"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_new_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_new_rules-result.xml index 21cc3f9dab4..d0de3d15a9d 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_new_rules-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_new_rules-result.xml @@ -4,7 +4,7 @@ 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]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]"/> @@ -12,7 +12,7 @@ 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" - remediation_factor="[null]" default_remediation_factor="5d" + remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" effort_to_fix_description="squid.S115.effortToFix"/> @@ -31,7 +31,7 @@ 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]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules-result.xml index c4b64d12430..b78b8804371 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules-result.xml @@ -4,7 +4,7 @@ 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]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]" updated_at="2014-03-16"/> @@ -13,7 +13,7 @@ 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]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]" updated_at="2014-03-16"/> @@ -23,7 +23,7 @@ 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" - remediation_factor="[null]" default_remediation_factor="5d" + remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" effort_to_fix_description="squid.S115.effortToFix" updated_at="2014-03-17 19:10:03.0"/> @@ -32,7 +32,7 @@ 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]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]" updated_at="2014-03-17 19:10:03.0"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules.xml index 27a03f91411..a512738cc04 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules.xml @@ -6,7 +6,7 @@ status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" characteristic_id="[null]" default_characteristic_id="[null]" remediation_function="[null]" default_remediation_function="[null]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]" updated_at="2014-03-16"/> @@ -15,7 +15,7 @@ status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" characteristic_id="[null]" default_characteristic_id="[null]" remediation_function="[null]" default_remediation_function="[null]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]" updated_at="2014-03-16"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml index 89e5191d7fd..3fd0dc9c746 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml @@ -4,7 +4,7 @@ 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]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]"/> @@ -12,7 +12,7 @@ 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]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml index 14495983726..4ccf94bbaa3 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml @@ -6,7 +6,7 @@ status="READY" priority="2" cardinality="SINGLE" parent_id="[null]" characteristic_id="[null]" default_characteristic_id="200" remediation_function="[null]" default_remediation_function="LINEAR" - remediation_factor="[null]" default_remediation_factor="14min" + remediation_coeff="[null]" default_remediation_coeff="14min" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml index fcb2b867045..6046c08a0cd 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml @@ -4,7 +4,7 @@ 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]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]"/> @@ -12,7 +12,7 @@ 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]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml index fd2c3d8e489..1a5aac45ef0 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml @@ -6,7 +6,7 @@ status="READY" priority="2" cardinality="SINGLE" parent_id="[null]" characteristic_id="-1" default_characteristic_id="[null]" remediation_function="[null]" default_remediation_function="[null]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]"/> @@ -14,7 +14,7 @@ status="READY" priority="1" cardinality="SINGLE" parent_id="[null]" characteristic_id="[null]" default_characteristic_id="[null]" remediation_function="[null]" default_remediation_function="[null]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/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/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden-result.xml index 9fcf2872bb9..1ccbc8dfb68 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/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/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden-result.xml @@ -4,7 +4,7 @@ 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]" - remediation_factor="5d" default_remediation_factor="[null]" + remediation_coeff="5d" default_remediation_coeff="[null]" remediation_offset="10h" default_remediation_offset="[null]" effort_to_fix_description="[null]"/> @@ -12,7 +12,7 @@ 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]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/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/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden.xml index 66458e67ee3..4a0da7b3377 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/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/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden.xml @@ -8,7 +8,7 @@ status="READY" priority="2" cardinality="SINGLE" parent_id="[null]" characteristic_id="3" default_characteristic_id="[null]" remediation_function="LINEAR_OFFSET" default_remediation_function="[null]" - remediation_factor="5d" default_remediation_factor="[null]" + remediation_coeff="5d" default_remediation_coeff="[null]" remediation_offset="10h" default_remediation_offset="[null]" effort_to_fix_description="[null]"/> @@ -16,7 +16,7 @@ status="READY" priority="1" cardinality="SINGLE" parent_id="[null]" characteristic_id="[null]" default_characteristic_id="[null]" remediation_function="[null]" default_remediation_function="[null]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields-result.xml index 4c832441dd4..214576567d6 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields-result.xml @@ -4,7 +4,7 @@ status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java" characteristic_id="[null]" default_characteristic_id="200" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" - remediation_factor="[null]" default_remediation_factor="5d" + remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" effort_to_fix_description="squid.S115.effortToFix"/> @@ -25,7 +25,7 @@ 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]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields.xml index 5a04a1672f5..158e65dd3dd 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields.xml @@ -6,7 +6,7 @@ status="READY" priority="2" cardinality="SINGLE" parent_id="[null]" characteristic_id="[null]" default_characteristic_id="200" remediation_function="[null]" default_remediation_function="LINEAR" - remediation_factor="[null]" default_remediation_factor="14min" + remediation_coeff="[null]" default_remediation_coeff="14min" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language-result.xml index 0fc47887777..10e1584dd73 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language-result.xml @@ -4,7 +4,7 @@ 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" - remediation_factor="[null]" default_remediation_factor="5d" + remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" effort_to_fix_description="squid.S115.effortToFix" /> @@ -13,7 +13,7 @@ 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" - remediation_factor="[null]" default_remediation_factor="5d" + remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" effort_to_fix_description="squid.S115.effortToFix" /> @@ -21,7 +21,7 @@ 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]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]" /> @@ -30,7 +30,7 @@ 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]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]" /> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language.xml index 2813575401e..3328bafc00c 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language.xml @@ -6,7 +6,7 @@ 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" - remediation_factor="[null]" default_remediation_factor="5d" + remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" effort_to_fix_description="squid.S115.effortToFix" /> @@ -15,7 +15,7 @@ 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" - remediation_factor="[null]" default_remediation_factor="1h" + remediation_coeff="[null]" default_remediation_coeff="1h" remediation_offset="[null]" default_remediation_offset="15min" effort_to_fix_description="squid.S115.effortToFix2" /> @@ -23,7 +23,7 @@ status="DEPRECATED" priority="1" cardinality="MULTIPLE" parent_id="[null]" characteristic_id="[null]" default_characteristic_id="[null]" remediation_function="[null]" default_remediation_function="[null]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]" /> @@ -32,7 +32,7 @@ status="READY" priority="4" cardinality="SINGLE" parent_id="3" characteristic_id="[null]" default_characteristic_id="[null]" remediation_function="[null]" default_remediation_function="[null]" - remediation_factor="[null]" default_remediation_factor="[null]" + remediation_coeff="[null]" default_remediation_coeff="[null]" remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]" /> diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules.xml b/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules.xml index 9b96cf3de42..a90e960c94e 100644 --- a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules.xml +++ b/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules.xml @@ -4,35 +4,35 @@ <rules id="1" plugin_rule_key="UselessImportCheck" plugin_name="squid" name="UselessImportCheck" description="Useless imports should be removed" status="READY" characteristic_id="[null]" default_characteristic_id="10" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" - remediation_factor="[null]" default_remediation_factor="5d" + remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to a disabled requirement -> Update rule to disable characteristic --> <rules id="2" plugin_rule_key="LeftCurlyBraceStartLineCheck" plugin_name="squid" name="LeftCurlyBraceStartLineCheck" description="Left curly braces should be located at the beginning of lines of code" status="READY" characteristic_id="[null]" default_characteristic_id="10" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" - remediation_factor="[null]" default_remediation_factor="5d" + remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Removed rule linked to a disabled requirement -> Do nothing --> <rules id="3" plugin_rule_key="CallToFileDeleteOnExitMethod" plugin_name="squid" name="CallToFileDeleteOnExitMethod" description="CallToFileDeleteOnExitMethod" status="REMOVED" characteristic_id="[null]" default_characteristic_id="10" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" - remediation_factor="[null]" default_remediation_factor="5d" + remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to one enable requirement, with same value of debt -> Nothing to do --> <rules id="4" plugin_rule_key="ObjectFinalizeOverridenCallsSuperFinalizeCheck" plugin_name="squid" name="ObjectFinalizeOverridenCallsSuperFinalizeCheck" description="super.finalize() should be called at the end of Object.finalize() implementations" status="READY" characteristic_id="[null]" default_characteristic_id="10" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" - remediation_factor="[null]" default_remediation_factor="5min" + remediation_coeff="[null]" default_remediation_coeff="5min" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to one enable requirement, with different value of debt -> Update rule --> <rules id="5" plugin_rule_key="RightCurlyBraceStartLineCheck" plugin_name="squid" name="RightCurlyBraceStartLineCheck" description="Right curly braces should be located at the beginning of lines of code" status="READY" characteristic_id="[null]" default_characteristic_id="20" remediation_function="[null]" default_remediation_function="LINEAR" - remediation_factor="[null]" default_remediation_factor="5d" + remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="[null]" updated_at="2014-02-19"/> </dataset> diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules_result.xml b/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules_result.xml index 503f39a1d6d..83fc74c8813 100644 --- a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules_result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules_result.xml @@ -4,35 +4,35 @@ <rules id="1" plugin_rule_key="UselessImportCheck" plugin_name="squid" name="UselessImportCheck" description="Useless imports should be removed" status="READY" characteristic_id="[null]" default_characteristic_id="10" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" - remediation_factor="[null]" default_remediation_factor="5d" + remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to a disabled requirements -> Update rule to disable characteristic --> <rules id="2" plugin_rule_key="LeftCurlyBraceStartLineCheck" plugin_name="squid" name="LeftCurlyBraceStartLineCheck" description="Left curly braces should be located at the beginning of lines of code" status="READY" characteristic_id="-1" default_characteristic_id="10" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" - remediation_factor="[null]" default_remediation_factor="5d" + remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-03-13 19:10:03.0"/> <!-- Removed rule linked to a disabled requirement -> Do nothing --> <rules id="3" plugin_rule_key="CallToFileDeleteOnExitMethod" plugin_name="squid" name="CallToFileDeleteOnExitMethod" description="CallToFileDeleteOnExitMethod" status="REMOVED" characteristic_id="[null]" default_characteristic_id="10" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" - remediation_factor="[null]" default_remediation_factor="5d" + remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to one enable requirement, with same value of debt -> Nothing to do --> <rules id="4" plugin_rule_key="ObjectFinalizeOverridenCallsSuperFinalizeCheck" plugin_name="squid" name="ObjectFinalizeOverridenCallsSuperFinalizeCheck" description="super.finalize() should be called at the end of Object.finalize() implementations" status="READY" characteristic_id="[null]" default_characteristic_id="10" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" - remediation_factor="[null]" default_remediation_factor="5min" + remediation_coeff="[null]" default_remediation_coeff="5min" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to one enable requirement, with different value of debt -> Update rule --> <rules id="5" plugin_rule_key="RightCurlyBraceStartLineCheck" plugin_name="squid" name="RightCurlyBraceStartLineCheck" description="Right curly braces should be located at the beginning of lines of code" status="READY" characteristic_id="10" default_characteristic_id="20" remediation_function="LINEAR_OFFSET" default_remediation_function="LINEAR" - remediation_factor="20min" default_remediation_factor="5d" + remediation_coeff="20min" default_remediation_coeff="5d" remediation_offset="30h" default_remediation_offset="[null]" updated_at="2014-03-13 19:10:03.0"/> </dataset> diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/schema.sql b/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/schema.sql index 3f02904a610..da87904a95c 100644 --- a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/schema.sql +++ b/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/schema.sql @@ -9,8 +9,8 @@ CREATE TABLE "RULES" ( "DEFAULT_CHARACTERISTIC_ID" INTEGER, "REMEDIATION_FUNCTION" VARCHAR(20), "DEFAULT_REMEDIATION_FUNCTION" VARCHAR(20), - "REMEDIATION_FACTOR" VARCHAR(20), - "DEFAULT_REMEDIATION_FACTOR" VARCHAR(20), + "REMEDIATION_COEFF" VARCHAR(20), + "DEFAULT_REMEDIATION_COEFF" VARCHAR(20), "REMEDIATION_OFFSET" VARCHAR(20), "DEFAULT_REMEDIATION_OFFSET" VARCHAR(20), "UPDATED_AT" TIMESTAMP |