Merge pull request #913 from jmecosta/5.6updatesV2

upgrade plugin to use the new 5.6 api
SonarOpenCommunity · Jul 16, 2016 · f175001 · f175001
2 parents a9331a2 + 75206b5
commit f175001
Show file tree

Hide file tree

Showing 193 changed files with 2,551 additions and 3,653 deletions.
diff --git a/cxx-checks/pom.xml b/cxx-checks/pom.xml
@@ -18,16 +18,23 @@
       <artifactId>cxx-squid</artifactId>
       <version>${project.version}</version>
     </dependency>
+
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
+      <groupId>org.sonarsource.sslr</groupId>
+      <artifactId>sslr-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.easytesting</groupId>
       <artifactId>fest-assert</artifactId>
@@ -39,5 +46,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
 </project>
diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/BooleanEqualityComparisonCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/BooleanEqualityComparisonCheck.java
@@ -27,18 +27,15 @@
 import org.sonar.squidbridge.checks.SquidCheck;
 import com.sonar.sslr.api.Grammar;
 import com.sonar.sslr.api.AstNode;
-import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
-import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 
 @Rule(
   key = "BooleanEqualityComparison",
   name = "Literal boolean values should not be used in condition expressions",
   priority = Priority.MINOR,
   tags = {Tag.CONVENTION})
 @ActivatedByDefault
-@SqaleSubCharacteristic(RulesDefinition.SubCharacteristics.UNDERSTANDABILITY)
 @SqaleConstantRemediation("5min")
 public class BooleanEqualityComparisonCheck extends SquidCheck<Grammar> {
 

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/CheckList.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/CheckList.java
@@ -76,7 +76,6 @@ public static List<Class> getChecks() {
       UsingNamespaceInHeaderCheck.class,
       SafetyTagCheck.class,
       UseCorrectIncludeCheck.class,
-      XPathCheck.class,
       BooleanEqualityComparisonCheck.class,
       NestedStatementsCheck.class,
       TooManyParametersCheck.class,

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/ClassComplexityCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/ClassComplexityCheck.java
@@ -21,14 +21,12 @@
 
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.Grammar;
-import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
 import org.sonar.cxx.api.CxxMetric;
 import org.sonar.cxx.parser.CxxGrammarImpl;
 import org.sonar.squidbridge.annotations.SqaleLinearWithOffsetRemediation;
-import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 import org.sonar.cxx.tag.Tag;
 import org.sonar.squidbridge.api.SourceClass;
 import org.sonar.squidbridge.checks.ChecksHelper;
@@ -39,7 +37,6 @@
   priority = Priority.MAJOR,
   name = "Classes should not be too complex",
   tags = {Tag.BRAIN_OVERLOAD})
-@SqaleSubCharacteristic(RulesDefinition.SubCharacteristics.UNDERSTANDABILITY)
 @SqaleLinearWithOffsetRemediation(
   coeff = "1min",
   offset = "10min",

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/CollapsibleIfCandidateCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/CollapsibleIfCandidateCheck.java
@@ -30,19 +30,16 @@
 
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.Grammar;
-import org.sonar.api.server.rule.RulesDefinition;
 import static org.sonar.cxx.checks.utils.CheckUtils.isIfStatement;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
-import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 
 @Rule(
   key = "CollapsibleIfCandidate",
   name = "Collapsible 'if' statements should be merged",
   priority = Priority.MAJOR,
   tags = {Tag.BRAIN_OVERLOAD})
 @ActivatedByDefault
-@SqaleSubCharacteristic(RulesDefinition.SubCharacteristics.DATA_RELIABILITY)
 @SqaleConstantRemediation("5min")
 public class CollapsibleIfCandidateCheck extends SquidCheck<Grammar> {
 

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/CommentedCodeCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/CommentedCodeCheck.java
@@ -37,10 +37,8 @@
 import com.sonar.sslr.api.Grammar;
 import com.sonar.sslr.api.Token;
 import com.sonar.sslr.api.Trivia;
-import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
-import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 import org.sonar.cxx.tag.Tag;
 
 @Rule(
@@ -49,7 +47,6 @@
   tags = {Tag.UNUSED},
   priority = Priority.BLOCKER)
 @ActivatedByDefault
-@SqaleSubCharacteristic(RulesDefinition.SubCharacteristics.UNDERSTANDABILITY)
 @SqaleConstantRemediation("5min")
 public class CommentedCodeCheck extends SquidCheck<Grammar> implements AstAndTokenVisitor {
 

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/CycleBetweenPackagesCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/CycleBetweenPackagesCheck.java
@@ -28,10 +28,8 @@
 import org.sonar.check.Rule;
 import org.sonar.squidbridge.checks.SquidCheck;
 import com.sonar.sslr.api.Grammar;
-import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleLinearRemediation;
-import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 import org.sonar.cxx.tag.Tag;
 
 /**
@@ -44,7 +42,6 @@
   tags = {Tag.CONVENTION},
   priority = Priority.MAJOR)
 @ActivatedByDefault
-@SqaleSubCharacteristic(RulesDefinition.SubCharacteristics.ARCHITECTURE_RELIABILITY)
 @SqaleLinearRemediation(coeff= "120min" , effortToFixDescription = "extract problematic methods and move it to separate package")
 public class CycleBetweenPackagesCheck extends SquidCheck<Grammar> {
 

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/DuplicatedIncludeCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/DuplicatedIncludeCheck.java
@@ -28,10 +28,8 @@
 import org.sonar.check.Rule;
 import org.sonar.squidbridge.checks.SquidCheck;
 import com.sonar.sslr.api.Grammar;
-import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
-import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 import org.sonar.cxx.tag.Tag;
 
 /**
@@ -44,7 +42,6 @@
   tags = {Tag.PREPROCESSOR},
   priority = Priority.MAJOR)
 @ActivatedByDefault
-@SqaleSubCharacteristic(RulesDefinition.SubCharacteristics.ARCHITECTURE_RELIABILITY)
 @SqaleConstantRemediation("5min")
 public class DuplicatedIncludeCheck extends SquidCheck<Grammar> {
 

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/FileComplexityCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/FileComplexityCheck.java
@@ -26,9 +26,7 @@
 import org.sonar.squidbridge.checks.AbstractFileComplexityCheck;
 import org.sonar.squidbridge.measures.MetricDef;
 import com.sonar.sslr.api.Grammar;
-import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.squidbridge.annotations.SqaleLinearWithOffsetRemediation;
-import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 import org.sonar.cxx.tag.Tag;
 
 @Rule(
@@ -37,7 +35,6 @@
   tags = {Tag.BRAIN_OVERLOAD},
   priority = Priority.MAJOR)
 //@ActivatedByDefault
-@SqaleSubCharacteristic(RulesDefinition.SubCharacteristics.UNIT_TESTABILITY)
 @SqaleLinearWithOffsetRemediation(
   coeff = "1min",
   offset = "30min",

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/FileEncodingCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/FileEncodingCheck.java
@@ -21,14 +21,12 @@
 
 import java.io.IOException;
 import java.nio.charset.Charset;
-import java.util.List;
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
 import org.sonar.cxx.visitors.CxxCharsetAwareVisitor;
 import org.sonar.squidbridge.checks.SquidCheck;
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.Grammar;
-import java.nio.charset.CharsetEncoder;
 import java.nio.file.Files;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.NoSqale;

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/FileHeaderCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/FileHeaderCheck.java
@@ -34,10 +34,8 @@
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.Grammar;
 
-import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
-import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 import org.sonar.squidbridge.api.AnalysisException;
 
 import java.util.regex.Matcher;
@@ -49,7 +47,6 @@
   priority = Priority.BLOCKER,
   tags = {})
 @ActivatedByDefault
-@SqaleSubCharacteristic(RulesDefinition.SubCharacteristics.READABILITY)
 @SqaleConstantRemediation("5min")
 //similar Vera++ rule T013 "No copyright notice found"
 public class FileHeaderCheck extends SquidCheck<Grammar> implements CxxCharsetAwareVisitor {

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/FixmeTagPresenceCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/FixmeTagPresenceCheck.java
@@ -26,18 +26,15 @@
 import com.sonar.sslr.api.AstAndTokenVisitor;
 import com.sonar.sslr.api.Grammar;
 import com.sonar.sslr.api.Token;
-import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
-import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 
 @Rule(
   key = "FixmeTagPresence",
   name = "FIXME tags should be handled",
   priority = Priority.MAJOR,
   tags = {Tag.BAD_PRACTICE})
 @ActivatedByDefault
-@SqaleSubCharacteristic(RulesDefinition.SubCharacteristics.INSTRUCTION_RELIABILITY)
 @SqaleConstantRemediation("20min")
 public class FixmeTagPresenceCheck extends SquidCheck<Grammar> implements AstAndTokenVisitor {
 

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/FunctionComplexityCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/FunctionComplexityCheck.java
@@ -29,10 +29,8 @@
 import org.sonar.squidbridge.checks.SquidCheck;
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.Grammar;
-import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleLinearWithOffsetRemediation;
-import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 import org.sonar.cxx.tag.Tag;
 
 @Rule(
@@ -41,7 +39,6 @@
   tags = {Tag.BRAIN_OVERLOAD},
   priority = Priority.MAJOR)
 @ActivatedByDefault
-@SqaleSubCharacteristic(RulesDefinition.SubCharacteristics.UNIT_TESTABILITY)
 @SqaleLinearWithOffsetRemediation(
   coeff = "1min",
   offset = "10min",

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/HardcodedAccountCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/HardcodedAccountCheck.java
@@ -31,10 +31,8 @@
 import org.sonar.squidbridge.checks.SquidCheck;
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.Grammar;
-import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
-import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 import org.sonar.cxx.tag.Tag;
 
 @Rule(
@@ -43,7 +41,6 @@
   tags = {Tag.CERT, Tag.SECURITY},
   priority = Priority.BLOCKER)
 @ActivatedByDefault
-@SqaleSubCharacteristic(RulesDefinition.SubCharacteristics.ARCHITECTURE_CHANGEABILITY)
 @SqaleConstantRemediation("30min")
 public class HardcodedAccountCheck extends SquidCheck<Grammar> {
 

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/IndentationCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/IndentationCheck.java
@@ -39,13 +39,11 @@
 import com.sonar.sslr.api.Token;
 import com.sonar.sslr.api.Trivia;
 
-import org.sonar.api.server.rule.RulesDefinition;
 import static org.sonar.cxx.checks.utils.CheckUtils.isIdentifierLabel;
 import static org.sonar.cxx.checks.utils.CheckUtils.isIfStatement;
 import static org.sonar.cxx.checks.utils.CheckUtils.isSwitchStatement;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
-import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 import org.sonar.cxx.tag.Tag;
 
 @Rule(
@@ -54,7 +52,6 @@
         tags = {Tag.CONVENTION},
         priority = Priority.MAJOR)
 @ActivatedByDefault
-@SqaleSubCharacteristic(RulesDefinition.SubCharacteristics.READABILITY)
 @SqaleConstantRemediation("5min")
 public class IndentationCheck extends SquidCheck<Grammar> implements CxxCharsetAwareVisitor {
 

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/MagicNumberCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/MagicNumberCheck.java
@@ -30,11 +30,9 @@
 import org.sonar.squidbridge.checks.SquidCheck;
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.Grammar;
-import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.cxx.api.CxxKeyword;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
-import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 import org.sonar.cxx.tag.Tag;
 
 @Rule(
@@ -43,7 +41,6 @@
   tags = {Tag.CONVENTION},
   priority = Priority.MINOR)
 @ActivatedByDefault
-@SqaleSubCharacteristic(RulesDefinition.SubCharacteristics.DATA_RELIABILITY)
 @SqaleConstantRemediation("5min")
 public class MagicNumberCheck extends SquidCheck<Grammar> {
 

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/MissingCurlyBracesCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/MissingCurlyBracesCheck.java
@@ -26,11 +26,9 @@
 import org.sonar.squidbridge.checks.SquidCheck;
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.Grammar;
-import org.sonar.api.server.rule.RulesDefinition;
 import static org.sonar.cxx.checks.utils.CheckUtils.isIfStatement;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
-import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 import org.sonar.cxx.tag.Tag;
 
 @Rule(
@@ -39,7 +37,6 @@
   tags = {Tag.CONVENTION, Tag.PITFALL},
   priority = Priority.MAJOR)
 @ActivatedByDefault
-@SqaleSubCharacteristic(RulesDefinition.SubCharacteristics.READABILITY)
 @SqaleConstantRemediation("5min")
 public class MissingCurlyBracesCheck extends SquidCheck<Grammar> {
 

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/MissingNewLineAtEndOfFileCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/MissingNewLineAtEndOfFileCheck.java
@@ -26,10 +26,8 @@
 import org.sonar.squidbridge.checks.SquidCheck;
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.Grammar;
-import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
-import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 import org.sonar.cxx.tag.Tag;
 
 @Rule(
@@ -38,7 +36,6 @@
   tags = {Tag.CONVENTION},
   priority = Priority.MINOR)
 @ActivatedByDefault
-@SqaleSubCharacteristic(RulesDefinition.SubCharacteristics.READABILITY)
 @SqaleConstantRemediation("1min")
 public class MissingNewLineAtEndOfFileCheck extends SquidCheck<Grammar> {
 

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/NestedStatementsCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/NestedStatementsCheck.java
@@ -22,14 +22,12 @@
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.AstNodeType;
 import com.sonar.sslr.api.Grammar;
-import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
 import org.sonar.cxx.parser.CxxGrammarImpl;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
-import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 import org.sonar.cxx.tag.Tag;
 import org.sonar.squidbridge.checks.SquidCheck;
 
@@ -46,7 +44,6 @@
   priority = Priority.MAJOR
 )
 @ActivatedByDefault
-@SqaleSubCharacteristic(RulesDefinition.SubCharacteristics.LOGIC_CHANGEABILITY)
 @SqaleConstantRemediation("10min")
 public class NestedStatementsCheck extends SquidCheck<Grammar> {
 

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/ReservedNamesCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/ReservedNamesCheck.java
@@ -33,10 +33,8 @@
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.Grammar;
 
-import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
-import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 import org.sonar.cxx.tag.Tag;
 
 @Rule(
@@ -45,7 +43,6 @@
   tags = {Tag.PREPROCESSOR},
   priority = Priority.BLOCKER)
 @ActivatedByDefault
-@SqaleSubCharacteristic(RulesDefinition.SubCharacteristics.COMPILER_RELATED_PORTABILITY)
 @SqaleConstantRemediation("5min")
 //similar Vera++ rule T002
 public class ReservedNamesCheck extends SquidCheck<Grammar> implements CxxCharsetAwareVisitor {