From 0ac32549b3b249d266376efa3bc7ad0e188c2447 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Lievremont Date: Fri, 20 Sep 2013 11:12:47 +0200 Subject: [PATCH] SONAR-4679 Rename generic class Pattern to more accurate IssuePattern --- .../core/issue/ignore/IgnoreIssuesFilter.java | 8 +-- .../{Pattern.java => IssuePattern.java} | 24 ++++---- .../issue/ignore/pattern/PatternDecoder.java | 18 +++--- .../ignore/pattern/PatternsInitializer.java | 32 +++++------ .../issue/ignore/scanner/RegexpScanner.java | 6 +- .../issue/ignore/IgnoreIssuesFilterTest.java | 6 +- ...PatternTest.java => IssuePatternTest.java} | 55 +++++++++---------- .../ignore/pattern/PatternDecoderTest.java | 16 +++--- .../pattern/PatternsInitializerTest.java | 12 ++-- .../ignore/scanner/RegexpScannerTest.java | 8 +-- .../ignore/scanner/SourceScannerTest.java | 4 +- 11 files changed, 94 insertions(+), 95 deletions(-) rename plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/{Pattern.java => IssuePattern.java} (84%) rename plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/pattern/{PatternTest.java => IssuePatternTest.java} (59%) diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/IgnoreIssuesFilter.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/IgnoreIssuesFilter.java index ea342e36a1f..7691df8bb59 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/IgnoreIssuesFilter.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/IgnoreIssuesFilter.java @@ -24,7 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.issue.Issue; import org.sonar.api.issue.IssueFilter; -import org.sonar.plugins.core.issue.ignore.pattern.Pattern; +import org.sonar.plugins.core.issue.ignore.pattern.IssuePattern; import org.sonar.plugins.core.issue.ignore.pattern.PatternsInitializer; import java.util.List; @@ -40,8 +40,8 @@ public final class IgnoreIssuesFilter implements IssueFilter { } public boolean accept(Issue issue) { - List patterns = patternsInitializer.getPatternsForComponent(issue.componentKey()); - for (Pattern pattern : patterns) { + List patterns = patternsInitializer.getPatternsForComponent(issue.componentKey()); + for (IssuePattern pattern : patterns) { if (pattern.match(issue)) { logExclusion(issue, pattern); return false; @@ -50,7 +50,7 @@ public final class IgnoreIssuesFilter implements IssueFilter { return true; } - private void logExclusion(Issue issue, Pattern pattern) { + private void logExclusion(Issue issue, IssuePattern pattern) { LOG.debug("Issue {} ignored by {}", issue, pattern); } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/Pattern.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/IssuePattern.java similarity index 84% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/Pattern.java rename to plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/IssuePattern.java index 5112669c571..458292a6e80 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/Pattern.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/IssuePattern.java @@ -29,7 +29,7 @@ import org.sonar.api.utils.WildcardPattern; import java.util.Set; -public class Pattern { +public class IssuePattern { private WildcardPattern resourcePattern; private WildcardPattern rulePattern; @@ -40,15 +40,15 @@ public class Pattern { private String allFileRegexp; private boolean checkLines = true; - public Pattern() { + public IssuePattern() { } - public Pattern(String resourcePattern, String rulePattern) { + public IssuePattern(String resourcePattern, String rulePattern) { this.resourcePattern = WildcardPattern.create(resourcePattern); this.rulePattern = WildcardPattern.create(rulePattern); } - public Pattern(String resourcePattern, String rulePattern, Set lineRanges) { + public IssuePattern(String resourcePattern, String rulePattern, Set lineRanges) { this(resourcePattern, rulePattern); this.lineRanges = lineRanges; } @@ -73,12 +73,12 @@ public class Pattern { return allFileRegexp; } - Pattern addLineRange(int fromLineId, int toLineId) { + IssuePattern addLineRange(int fromLineId, int toLineId) { lineRanges.add(new LineRange(fromLineId, toLineId)); return this; } - Pattern addLine(int lineId) { + IssuePattern addLine(int lineId) { lines.add(lineId); return this; } @@ -87,22 +87,22 @@ public class Pattern { return checkLines; } - Pattern setCheckLines(boolean b) { + IssuePattern setCheckLines(boolean b) { this.checkLines = b; return this; } - Pattern setBeginBlockRegexp(String beginBlockRegexp) { + IssuePattern setBeginBlockRegexp(String beginBlockRegexp) { this.beginBlockRegexp = beginBlockRegexp; return this; } - Pattern setEndBlockRegexp(String endBlockRegexp) { + IssuePattern setEndBlockRegexp(String endBlockRegexp) { this.endBlockRegexp = endBlockRegexp; return this; } - Pattern setAllFileRegexp(String allFileRegexp) { + IssuePattern setAllFileRegexp(String allFileRegexp) { this.allFileRegexp = allFileRegexp; return this; } @@ -156,8 +156,8 @@ public class Pattern { return resource != null && resourcePattern.match(resource); } - public Pattern forResource(String resource) { - return new Pattern(resource, rulePattern.toString(), lineRanges).setCheckLines(isCheckLines()); + public IssuePattern forResource(String resource) { + return new IssuePattern(resource, rulePattern.toString(), lineRanges).setCheckLines(isCheckLines()); } @Override diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/PatternDecoder.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/PatternDecoder.java index 8a2b8e28909..7912ed1e4c0 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/PatternDecoder.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/PatternDecoder.java @@ -33,11 +33,11 @@ public class PatternDecoder { private static final String LINE_RANGE_REGEXP = "\\[((\\d+|\\d+-\\d+),?)*\\]"; private static final String CONFIG_FORMAT_ERROR_PREFIX = "Exclusions > Issues : Invalid format. "; - public List decode(String patternsList) { - List patterns = Lists.newLinkedList(); + public List decode(String patternsList) { + List patterns = Lists.newLinkedList(); String[] patternsLines = StringUtils.split(patternsList, "\n"); for (String patternLine : patternsLines) { - Pattern pattern = decodeLine(patternLine.trim()); + IssuePattern pattern = decodeLine(patternLine.trim()); if (pattern != null) { patterns.add(pattern); } @@ -48,7 +48,7 @@ public class PatternDecoder { /** * Main method that decodes a line which defines a pattern */ - public Pattern decodeLine(String line) { + public IssuePattern decodeLine(String line) { if (isBlankOrComment(line)) { return null; } @@ -58,17 +58,17 @@ public class PatternDecoder { throw new SonarException(CONFIG_FORMAT_ERROR_PREFIX + "The following line has more than 3 fields separated by comma: " + line); } - Pattern pattern; + IssuePattern pattern; if (fields.length == THREE_FIELDS_PER_LINE) { checkRegularLineConstraints(line, fields); - pattern = new Pattern(StringUtils.trim(fields[0]), StringUtils.trim(fields[1])); + pattern = new IssuePattern(StringUtils.trim(fields[0]), StringUtils.trim(fields[1])); decodeRangeOfLines(pattern, fields[2]); } else if (fields.length == 2) { checkDoubleRegexpLineConstraints(line, fields); - pattern = new Pattern().setBeginBlockRegexp(fields[0]).setEndBlockRegexp(fields[1]); + pattern = new IssuePattern().setBeginBlockRegexp(fields[0]).setEndBlockRegexp(fields[1]); } else { checkWholeFileRegexp(fields[0]); - pattern = new Pattern().setAllFileRegexp(fields[0]); + pattern = new IssuePattern().setAllFileRegexp(fields[0]); } return pattern; @@ -99,7 +99,7 @@ public class PatternDecoder { } } - public static void decodeRangeOfLines(Pattern pattern, String field) { + public static void decodeRangeOfLines(IssuePattern pattern, String field) { if (StringUtils.equals(field, "*")) { pattern.setCheckLines(false); } else { diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/PatternsInitializer.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/PatternsInitializer.java index 43aedfddaee..5be21f823d2 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/PatternsInitializer.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/PatternsInitializer.java @@ -40,25 +40,25 @@ public class PatternsInitializer implements BatchExtension { private final Settings settings; - private List multicriteriaPatterns; - private List blockPatterns; - private List allFilePatterns; - private Map> patternByComponent = Maps.newHashMap(); + private List multicriteriaPatterns; + private List blockPatterns; + private List allFilePatterns; + private Map> patternByComponent = Maps.newHashMap(); public PatternsInitializer(Settings settings) { this.settings = settings; initPatterns(); } - public List getMulticriteriaPatterns() { + public List getMulticriteriaPatterns() { return multicriteriaPatterns; } - public List getBlockPatterns() { + public List getBlockPatterns() { return blockPatterns; } - public List getAllFilePatterns() { + public List getAllFilePatterns() { return allFilePatterns; } @@ -93,7 +93,7 @@ public class PatternsInitializer implements BatchExtension { String lineRange = settings.getString(propPrefix + IgnoreIssuesConfiguration.LINE_RANGE_KEY); String[] fields = new String[] { resourceKeyPattern, ruleKeyPattern, lineRange }; PatternDecoder.checkRegularLineConstraints(StringUtils.join(fields, ","), fields); - Pattern pattern = new Pattern(firstNonNull(resourceKeyPattern, "*"), firstNonNull(ruleKeyPattern, "*")); + IssuePattern pattern = new IssuePattern(firstNonNull(resourceKeyPattern, "*"), firstNonNull(ruleKeyPattern, "*")); PatternDecoder.decodeRangeOfLines(pattern, firstNonNull(lineRange, "*")); multicriteriaPatterns.add(pattern); } @@ -106,7 +106,7 @@ public class PatternsInitializer implements BatchExtension { String endBlockRegexp = settings.getString(propPrefix + IgnoreIssuesConfiguration.END_BLOCK_REGEXP); String[] fields = new String[] { beginBlockRegexp, endBlockRegexp }; PatternDecoder.checkDoubleRegexpLineConstraints(StringUtils.join(fields, ","), fields); - Pattern pattern = new Pattern().setBeginBlockRegexp(nullToEmpty(beginBlockRegexp)).setEndBlockRegexp(nullToEmpty(endBlockRegexp)); + IssuePattern pattern = new IssuePattern().setBeginBlockRegexp(nullToEmpty(beginBlockRegexp)).setEndBlockRegexp(nullToEmpty(endBlockRegexp)); blockPatterns.add(pattern); } @@ -116,28 +116,28 @@ public class PatternsInitializer implements BatchExtension { String propPrefix = IgnoreIssuesConfiguration.PATTERNS_ALLFILE_KEY + "." + id + "."; String allFileRegexp = settings.getString(propPrefix + IgnoreIssuesConfiguration.FILE_REGEXP); PatternDecoder.checkWholeFileRegexp(allFileRegexp); - Pattern pattern = new Pattern().setAllFileRegexp(nullToEmpty(allFileRegexp)); + IssuePattern pattern = new IssuePattern().setAllFileRegexp(nullToEmpty(allFileRegexp)); allFilePatterns.add(pattern); } } public void addPatternToExcludeResource(String resource) { - addPatternForComponent(resource, new Pattern(resource, "*").setCheckLines(false)); + addPatternForComponent(resource, new IssuePattern(resource, "*").setCheckLines(false)); } public void addPatternToExcludeLines(String resource, Set lineRanges) { - addPatternForComponent(resource, new Pattern(resource, "*", lineRanges).setCheckLines(true)); + addPatternForComponent(resource, new IssuePattern(resource, "*", lineRanges).setCheckLines(true)); } public void configurePatternsForComponent(String componentKey, String path) { - for (Pattern pattern: multicriteriaPatterns) { + for (IssuePattern pattern: multicriteriaPatterns) { if (pattern.matchResource(path)) { addPatternForComponent(componentKey, pattern); } } } - public List getPatternsForComponent(String componentKey) { + public List getPatternsForComponent(String componentKey) { if (patternByComponent.containsKey(componentKey)) { return patternByComponent.get(componentKey); } else { @@ -145,9 +145,9 @@ public class PatternsInitializer implements BatchExtension { } } - private void addPatternForComponent(String component, Pattern pattern) { + private void addPatternForComponent(String component, IssuePattern pattern) { if (!patternByComponent.containsKey(component)) { - List newList = Lists.newArrayList(); + List newList = Lists.newArrayList(); patternByComponent.put(component, newList); } patternByComponent.get(component).add(pattern.forResource(component)); diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/scanner/RegexpScanner.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/scanner/RegexpScanner.java index edd107c7e9e..93af123e7cb 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/scanner/RegexpScanner.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/scanner/RegexpScanner.java @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.BatchExtension; import org.sonar.plugins.core.issue.ignore.pattern.LineRange; -import org.sonar.plugins.core.issue.ignore.pattern.Pattern; +import org.sonar.plugins.core.issue.ignore.pattern.IssuePattern; import org.sonar.plugins.core.issue.ignore.pattern.PatternsInitializer; import java.io.File; @@ -59,10 +59,10 @@ public class RegexpScanner implements BatchExtension { allFilePatterns = Lists.newArrayList(); blockMatchers = Lists.newArrayList(); - for (Pattern pattern : this.patternsInitializer.getAllFilePatterns()) { + for (IssuePattern pattern : this.patternsInitializer.getAllFilePatterns()) { allFilePatterns.add(java.util.regex.Pattern.compile(pattern.getAllFileRegexp())); } - for (Pattern pattern : this.patternsInitializer.getBlockPatterns()) { + for (IssuePattern pattern : this.patternsInitializer.getBlockPatterns()) { blockMatchers.add(new DoubleRegexpMatcher( java.util.regex.Pattern.compile(pattern.getBeginBlockRegexp()), java.util.regex.Pattern.compile(pattern.getEndBlockRegexp()))); diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/IgnoreIssuesFilterTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/IgnoreIssuesFilterTest.java index 2808d578252..fb229d2114a 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/IgnoreIssuesFilterTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/IgnoreIssuesFilterTest.java @@ -25,7 +25,7 @@ import org.junit.Test; import org.sonar.api.issue.Issue; import org.sonar.api.rule.RuleKey; import org.sonar.api.rules.Rule; -import org.sonar.plugins.core.issue.ignore.pattern.Pattern; +import org.sonar.plugins.core.issue.ignore.pattern.IssuePattern; import org.sonar.plugins.core.issue.ignore.pattern.PatternDecoder; import org.sonar.plugins.core.issue.ignore.pattern.PatternsInitializer; @@ -48,7 +48,7 @@ public class IgnoreIssuesFilterTest { @Before public void init() { patternsInitializer = mock(PatternsInitializer.class); - when(patternsInitializer.getMulticriteriaPatterns()).thenReturn(Collections. emptyList()); + when(patternsInitializer.getMulticriteriaPatterns()).thenReturn(Collections. emptyList()); filter = new IgnoreIssuesFilter(patternsInitializer); } @@ -98,7 +98,7 @@ public class IgnoreIssuesFilterTest { return mockIssue; } - private List createPatterns(String line) { + private List createPatterns(String line) { return new PatternDecoder().decode(line); } } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/pattern/PatternTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/pattern/IssuePatternTest.java similarity index 59% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/pattern/PatternTest.java rename to plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/pattern/IssuePatternTest.java index 7dd80bb5718..9a069bbb2a1 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/pattern/PatternTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/pattern/IssuePatternTest.java @@ -20,21 +20,20 @@ package org.sonar.plugins.core.issue.ignore.pattern; -import org.junit.Ignore; - import org.junit.Test; import org.sonar.api.issue.Issue; import org.sonar.api.rule.RuleKey; import org.sonar.api.rules.Rule; + import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class PatternTest { +public class IssuePatternTest { @Test public void shouldMatchLines() { - Pattern pattern = new Pattern("*", "*"); + IssuePattern pattern = new IssuePattern("*", "*"); pattern.addLine(12).addLine(15).addLineRange(20, 25); assertThat(pattern.matchLine(3)).isFalse(); @@ -47,31 +46,31 @@ public class PatternTest { @Test public void shouldMatchJavaFile() { String javaFile = "org.foo.Bar"; - assertThat(new Pattern("org.foo.Bar", "*").matchResource(javaFile)).isTrue(); - assertThat(new Pattern("org.foo.*", "*").matchResource(javaFile)).isTrue(); - assertThat(new Pattern("*Bar", "*").matchResource(javaFile)).isTrue(); - assertThat(new Pattern("*", "*").matchResource(javaFile)).isTrue(); - assertThat(new Pattern("org.*.?ar", "*").matchResource(javaFile)).isTrue(); - - assertThat(new Pattern("org.other.Hello", "*").matchResource(javaFile)).isFalse(); - assertThat(new Pattern("org.foo.Hello", "*").matchResource(javaFile)).isFalse(); - assertThat(new Pattern("org.*.??ar", "*").matchResource(javaFile)).isFalse(); - assertThat(new Pattern("org.*.??ar", "*").matchResource(null)).isFalse(); - assertThat(new Pattern("org.*.??ar", "*").matchResource("plop")).isFalse(); + assertThat(new IssuePattern("org.foo.Bar", "*").matchResource(javaFile)).isTrue(); + assertThat(new IssuePattern("org.foo.*", "*").matchResource(javaFile)).isTrue(); + assertThat(new IssuePattern("*Bar", "*").matchResource(javaFile)).isTrue(); + assertThat(new IssuePattern("*", "*").matchResource(javaFile)).isTrue(); + assertThat(new IssuePattern("org.*.?ar", "*").matchResource(javaFile)).isTrue(); + + assertThat(new IssuePattern("org.other.Hello", "*").matchResource(javaFile)).isFalse(); + assertThat(new IssuePattern("org.foo.Hello", "*").matchResource(javaFile)).isFalse(); + assertThat(new IssuePattern("org.*.??ar", "*").matchResource(javaFile)).isFalse(); + assertThat(new IssuePattern("org.*.??ar", "*").matchResource(null)).isFalse(); + assertThat(new IssuePattern("org.*.??ar", "*").matchResource("plop")).isFalse(); } @Test public void shouldMatchRule() { RuleKey rule = Rule.create("checkstyle", "IllegalRegexp", "").ruleKey(); - assertThat(new Pattern("*", "*").matchRule(rule)).isTrue(); - assertThat(new Pattern("*", "checkstyle:*").matchRule(rule)).isTrue(); - assertThat(new Pattern("*", "checkstyle:IllegalRegexp").matchRule(rule)).isTrue(); - assertThat(new Pattern("*", "checkstyle:Illegal*").matchRule(rule)).isTrue(); - assertThat(new Pattern("*", "*:*Illegal*").matchRule(rule)).isTrue(); - - assertThat(new Pattern("*", "pmd:IllegalRegexp").matchRule(rule)).isFalse(); - assertThat(new Pattern("*", "pmd:*").matchRule(rule)).isFalse(); - assertThat(new Pattern("*", "*:Foo*IllegalRegexp").matchRule(rule)).isFalse(); + assertThat(new IssuePattern("*", "*").matchRule(rule)).isTrue(); + assertThat(new IssuePattern("*", "checkstyle:*").matchRule(rule)).isTrue(); + assertThat(new IssuePattern("*", "checkstyle:IllegalRegexp").matchRule(rule)).isTrue(); + assertThat(new IssuePattern("*", "checkstyle:Illegal*").matchRule(rule)).isTrue(); + assertThat(new IssuePattern("*", "*:*Illegal*").matchRule(rule)).isTrue(); + + assertThat(new IssuePattern("*", "pmd:IllegalRegexp").matchRule(rule)).isFalse(); + assertThat(new IssuePattern("*", "pmd:*").matchRule(rule)).isFalse(); + assertThat(new IssuePattern("*", "*:Foo*IllegalRegexp").matchRule(rule)).isFalse(); } @Test @@ -79,7 +78,7 @@ public class PatternTest { Rule rule = Rule.create("checkstyle", "IllegalRegexp", ""); String javaFile = "org.foo.Bar"; - Pattern pattern = new Pattern("*", "*"); + IssuePattern pattern = new IssuePattern("*", "*"); pattern.addLine(12); assertThat(pattern.match(create(rule, javaFile, null))).isFalse(); @@ -103,13 +102,13 @@ public class PatternTest { @Test public void shouldNotMatchNullRule() { - assertThat(new Pattern("*", "*").matchRule(null)).isFalse(); + assertThat(new IssuePattern("*", "*").matchRule(null)).isFalse(); } @Test public void shouldPrintPatternToString() { - Pattern pattern = new Pattern("*", "checkstyle:*"); + IssuePattern pattern = new IssuePattern("*", "checkstyle:*"); - assertThat(pattern.toString()).isEqualTo("Pattern[resourcePattern=*,rulePattern=checkstyle:*,lines=[],lineRanges=[],beginBlockRegexp=,endBlockRegexp=,allFileRegexp=,checkLines=true]"); + assertThat(pattern.toString()).isEqualTo("IssuePattern[resourcePattern=*,rulePattern=checkstyle:*,lines=[],lineRanges=[],beginBlockRegexp=,endBlockRegexp=,allFileRegexp=,checkLines=true]"); } } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/pattern/PatternDecoderTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/pattern/PatternDecoderTest.java index 27ccd5eb81e..18e9e58436c 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/pattern/PatternDecoderTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/pattern/PatternDecoderTest.java @@ -49,7 +49,7 @@ public class PatternDecoderTest { "*;checkstyle:IllegalRegexp;*\n\n" + "# exclude a specific rule on a specific file\n" + "com.foo.Bar;checkstyle:IllegalRegexp;*\n"; - List patterns = decoder.decode(patternsList); + List patterns = decoder.decode(patternsList); assertThat(patterns).hasSize(5); } @@ -86,7 +86,7 @@ public class PatternDecoderTest { @Test public void shouldReadStarPatterns() { - Pattern pattern = decoder.decodeLine("*;*;*"); + IssuePattern pattern = decoder.decodeLine("*;*;*"); assertThat(pattern.getResourcePattern().toString()).isEqualTo("*"); assertThat(pattern.getRulePattern().toString()).isEqualTo("*"); @@ -95,7 +95,7 @@ public class PatternDecoderTest { @Test public void shouldReadLineIds() { - Pattern pattern = decoder.decodeLine("*;*;[10,25,98]"); + IssuePattern pattern = decoder.decodeLine("*;*;[10,25,98]"); assertThat(pattern.isCheckLines()).isTrue(); assertThat(pattern.getAllLines()).containsOnly(10, 25, 98); @@ -103,7 +103,7 @@ public class PatternDecoderTest { @Test public void shouldReadRangeOfLineIds() { - Pattern pattern = decoder.decodeLine("*;*;[10-12,25,97-100]"); + IssuePattern pattern = decoder.decodeLine("*;*;[10-12,25,97-100]"); assertThat(pattern.isCheckLines()).isTrue(); assertThat(pattern.getAllLines()).containsOnly(10, 11, 12, 25, 97, 98, 99, 100); @@ -114,7 +114,7 @@ public class PatternDecoderTest { // [] is different than * // - all violations are excluded on * // * no violations are excluded on [] - Pattern pattern = decoder.decodeLine("*;*;[]"); + IssuePattern pattern = decoder.decodeLine("*;*;[]"); assertThat(pattern.isCheckLines()).isTrue(); assertThat(pattern.getAllLines()).isEmpty(); @@ -122,7 +122,7 @@ public class PatternDecoderTest { @Test public void shouldReadBlockPattern() { - Pattern pattern = decoder.decodeLine("SONAR-OFF;SONAR-ON"); + IssuePattern pattern = decoder.decodeLine("SONAR-OFF;SONAR-ON"); assertThat(pattern.getResourcePattern()).isNull(); assertThat(pattern.getBeginBlockRegexp()).isEqualTo("SONAR-OFF"); @@ -131,7 +131,7 @@ public class PatternDecoderTest { @Test public void shouldReadAllFilePattern() { - Pattern pattern = decoder.decodeLine("SONAR-ALL-OFF"); + IssuePattern pattern = decoder.decodeLine("SONAR-ALL-OFF"); assertThat(pattern.getResourcePattern()).isNull(); assertThat(pattern.getAllFileRegexp()).isEqualTo("SONAR-ALL-OFF"); @@ -179,7 +179,7 @@ public class PatternDecoderTest { @Test public void shouldAcceptEmptyEndBlockRegexp() { - Pattern pattern = decoder.decodeLine("OFF;"); + IssuePattern pattern = decoder.decodeLine("OFF;"); assertThat(pattern.getResourcePattern()).isNull(); assertThat(pattern.getBeginBlockRegexp()).isEqualTo("OFF"); diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/pattern/PatternsInitializerTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/pattern/PatternsInitializerTest.java index 5a45b9327e9..4abb5358747 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/pattern/PatternsInitializerTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/pattern/PatternsInitializerTest.java @@ -59,7 +59,7 @@ public class PatternsInitializerTest { String file = "foo"; patternsInitializer.addPatternToExcludeResource(file); - Pattern extraPattern = patternsInitializer.getPatternsForComponent(file).get(0); + IssuePattern extraPattern = patternsInitializer.getPatternsForComponent(file).get(0); assertThat(extraPattern.matchResource(file)).isTrue(); assertThat(extraPattern.isCheckLines()).isFalse(); } @@ -71,7 +71,7 @@ public class PatternsInitializerTest { lineRanges.add(new LineRange(25, 28)); patternsInitializer.addPatternToExcludeLines(file, lineRanges); - Pattern extraPattern = patternsInitializer.getPatternsForComponent(file).get(0); + IssuePattern extraPattern = patternsInitializer.getPatternsForComponent(file).get(0); assertThat(extraPattern.matchResource(file)).isTrue(); assertThat(extraPattern.getAllLines()).isEqualTo(Sets.newHashSet(25, 26, 27, 28)); } @@ -176,12 +176,12 @@ public class PatternsInitializerTest { String componentKey = "groupId:artifactId:org.foo.Bar"; String path = "org/foo/Bar.java"; - Pattern matching1, matching2, notMatching; - matching1 = mock(Pattern.class); + IssuePattern matching1, matching2, notMatching; + matching1 = mock(IssuePattern.class); when(matching1.matchResource(path)).thenReturn(true); - matching2 = mock(Pattern.class); + matching2 = mock(IssuePattern.class); when(matching2.matchResource(path)).thenReturn(true); - notMatching = mock(Pattern.class); + notMatching = mock(IssuePattern.class); when(notMatching.matchResource(path)).thenReturn(false); patternsInitializer.initPatterns(); diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest.java index 9454ac52e84..109de97e31d 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.sonar.plugins.core.issue.ignore.pattern.LineRange; -import org.sonar.plugins.core.issue.ignore.pattern.Pattern; +import org.sonar.plugins.core.issue.ignore.pattern.IssuePattern; import org.sonar.plugins.core.issue.ignore.pattern.PatternsInitializer; import org.sonar.test.TestUtils; @@ -48,11 +48,11 @@ public class RegexpScannerTest { @Mock private PatternsInitializer patternsInitializer; @Mock - private Pattern allFilePattern; + private IssuePattern allFilePattern; @Mock - private Pattern blockPattern1; + private IssuePattern blockPattern1; @Mock - private Pattern blockPattern2; + private IssuePattern blockPattern2; @Before public void init() { diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/scanner/SourceScannerTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/scanner/SourceScannerTest.java index 4cd9954ef70..bbcff4d25a9 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/scanner/SourceScannerTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/ignore/scanner/SourceScannerTest.java @@ -32,7 +32,7 @@ import org.sonar.api.resources.Project; import org.sonar.api.scan.filesystem.FileQuery; import org.sonar.api.scan.filesystem.ModuleFileSystem; import org.sonar.api.utils.SonarException; -import org.sonar.plugins.core.issue.ignore.pattern.Pattern; +import org.sonar.plugins.core.issue.ignore.pattern.IssuePattern; import org.sonar.plugins.core.issue.ignore.pattern.PatternsInitializer; import java.io.File; @@ -196,7 +196,7 @@ public class SourceScannerTest { when(project.getLanguageKey()).thenReturn("php"); when(fileSystem.files(Mockito.isA(FileQuery.class))).thenReturn(Arrays.asList(sourceFile)); - List empty = ImmutableList.of(); + List empty = ImmutableList.of(); when(patternsInitializer.getPatternsForComponent("Foo.php")).thenReturn(empty); doThrow(new IOException("BUG")).when(regexpScanner).scan("polop:Foo.php", sourceFile, UTF_8); -- 2.39.5