From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Mon, 5 Feb 2018 15:46:22 +0000 (+0100)
Subject: Fix FP in RuleIndexTest
X-Git-Tag: 7.5~1742
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ea77a805bfccb66c5943eb0bcaf36df3cb905227;p=sonarqube.git

Fix FP in RuleIndexTest

Rule language is generated with a random value. As language is used
by the search engine, the random value may match the request and
break the assertion.
---

diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexTest.java
index 30e2946d16a..02981ebf5dc 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexTest.java
@@ -213,12 +213,12 @@ public class RuleIndexTest {
 
   @Test
   public void search_content_by_query() {
-    RuleDefinitionDto rule1 = createRule(rule -> rule.setRuleKey("123").setDescription("My great rule CWE-123 which makes your code 1000 times better!"));
-    RuleDefinitionDto rule2 = createRule(rule -> rule.setRuleKey("124").setDescription("Another great and shiny rule CWE-124"));
-    RuleDefinitionDto rule3 = createRule(rule -> rule.setRuleKey("1000").setDescription("Another great rule CWE-1000"));
-    RuleDefinitionDto rule4 = createRule(rule -> rule.setRuleKey("404")
+    RuleDefinitionDto rule1 = createJavaRule(rule -> rule.setRuleKey("123").setDescription("My great rule CWE-123 which makes your code 1000 times better!"));
+    RuleDefinitionDto rule2 = createJavaRule(rule -> rule.setRuleKey("124").setDescription("Another great and shiny rule CWE-124"));
+    RuleDefinitionDto rule3 = createJavaRule(rule -> rule.setRuleKey("1000").setDescription("Another great rule CWE-1000"));
+    RuleDefinitionDto rule4 = createJavaRule(rule -> rule.setRuleKey("404")
       .setDescription("<h1>HTML-Geeks</h1><p style=\"color:blue\">special formatting!</p><table><tr><td>inside</td><td>tables</td></tr></table>"));
-    RuleDefinitionDto rule5 = createRule(rule -> rule.setRuleKey("405")
+    RuleDefinitionDto rule5 = createJavaRule(rule -> rule.setRuleKey("405")
       .setDescription("internationalization missunderstandings alsdkjfnadklsjfnadkdfnsksdjfn"));
     index();
 
@@ -464,6 +464,10 @@ public class RuleIndexTest {
     return createRule(r -> r.setLanguage("java"));
   }
 
+  private RuleDefinitionDto createJavaRule(Consumer<RuleDefinitionDto> consumer) {
+    return createRule(r -> r.setLanguage("java"), consumer);
+  }
+
   @SafeVarargs
   private final RuleMetadataDto createRuleMetadata(RuleDefinitionDto rule, OrganizationDto organization, Consumer<RuleMetadataDto>... populaters) {
     return db.rules().insertOrUpdateMetadata(rule, organization, populaters);