From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Wed, 27 Nov 2013 11:09:05 +0000 (+0100)
Subject: SONAR-4831 Do not add requirement when rule is no found on XML import
X-Git-Tag: 4.1-RC1~209
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4033122e6a091844e0cd0147eb9db703a57813b0;p=sonarqube.git

SONAR-4831 Do not add requirement when rule is no found on XML import
---

diff --git a/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporter.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporter.java
index 898eae3df4a..d5eef27622a 100644
--- a/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporter.java
+++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporter.java
@@ -153,6 +153,9 @@ public class TechnicalDebtXMLImporter implements ServerExtension {
       }
     }
     fillRule(requirement, ruleRepositoryKey, ruleKey, messages, technicalDebtRuleCache);
+    if (requirement.ruleKey() == null) {
+      return null;
+    }
     return processFunctionsOnRequirement(requirement, properties, messages);
   }
 
diff --git a/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest.java
index 88541b6850d..2ece2a34247 100644
--- a/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest.java
@@ -134,7 +134,7 @@ public class TechnicalDebtXMLImporterTest {
   }
 
   @Test
-  public void shouldLogWarningIfRuleNotFound() {
+  public void ignore_requirement_with_not_found_rule() {
     TechnicalDebtRuleCache technicalDebtRuleCache = mockRuleCache();
     String xml = getFileContent("shouldLogWarningIfRuleNotFound.xml");
     ValidationMessages messages = ValidationMessages.create();
diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml
index 479d550349c..cf4edb394e5 100644
--- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml
@@ -8,8 +8,16 @@
       <chc>
         <rule-repo>findbugs</rule-repo>
         <rule-key>Foo</rule-key>
+        <prop>
+          <key>remediationFactor</key>
+          <val>3.2</val>
+          <txt>h</txt>
+        </prop>
+        <prop>
+          <key>remediationFunction</key>
+          <txt>linear</txt>
+        </prop>
       </chc>
     </chc>
   </chc>
-
 </sqale>