diff options
author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2018-02-05 16:46:22 +0100 |
---|---|---|
committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2018-02-05 16:46:22 +0100 |
commit | ea77a805bfccb66c5943eb0bcaf36df3cb905227 (patch) | |
tree | fd1f2f80fbb8c7967cca5f8410caf1ec1776b42f | |
parent | 2ee63dead2452afb3deaf7593b7b524d65dbca9f (diff) | |
download | sonarqube-ea77a805bfccb66c5943eb0bcaf36df3cb905227.tar.gz sonarqube-ea77a805bfccb66c5943eb0bcaf36df3cb905227.zip |
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.
-rw-r--r-- | server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexTest.java | 14 |
1 files changed, 9 insertions, 5 deletions
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); |