Fix #61 Remove deprecated rule selector-naming-convention

racodond · Sep 14, 2017 · 77c0bd2 · 77c0bd2
1 parent 2eb0d6b
commit 77c0bd2
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 326 deletions.
diff --git a/README.md b/README.md
@@ -152,7 +152,6 @@ It computes the complexity/rule, meaning the average number of selectors per rul
 * Regular expression on property
 * Regular expression on unit
 * Rule properties should be alphabetically ordered
-* Selectors should follow a naming convention
 * Shorthand properties should be used whenever possible
 * Shorthand properties should not be used
 * Single quotes should be used instead of double quotes for strings

diff --git a/css-checks/src/main/java/org/sonar/css/checks/CheckList.java b/css-checks/src/main/java/org/sonar/css/checks/CheckList.java
@@ -167,7 +167,6 @@ private static List<Class> getCommonChecks() {
       QuotedGenericFontFamilyNamesCheck.class,
       QuotedUrlCheck.class,
       SelectorLikeRegExCheck.class,
-      SelectorNamingConventionCheck.class,
       SelectorNumberCheck.class,
       SemicolonDeclarationCheck.class,
       SingleQuotesCheck.class,
@@ -249,7 +248,6 @@ public static List<Class> getEmbeddedCssChecks() {
       QuotedGenericFontFamilyNamesCheck.class,
       QuotedUrlCheck.class,
       SelectorLikeRegExCheck.class,
-      SelectorNamingConventionCheck.class,
       SelectorNumberCheck.class,
       SemicolonDeclarationCheck.class,
       SingleQuotesCheck.class,

diff --git a/css-checks/src/main/java/org/sonar/css/checks/common/SelectorNamingConventionCheck.java b/css-checks/src/main/java/org/sonar/css/checks/common/SelectorNamingConventionCheck.java
diff --git a/.../main/resources/org/sonar/css/checks/l10n/common/template/selector-naming-convention.html b/.../main/resources/org/sonar/css/checks/l10n/common/template/selector-naming-convention.html
diff --git a/css-checks/src/test/java/org/sonar/css/checks/common/SelectorNamingConventionCheckTest.java b/css-checks/src/test/java/org/sonar/css/checks/common/SelectorNamingConventionCheckTest.java
diff --git a/css-frontend/src/test/java/org/sonar/css/parser/less/StyleSheetTreeTest.java b/css-frontend/src/test/java/org/sonar/css/parser/less/StyleSheetTreeTest.java
@@ -39,9 +39,6 @@ public StyleSheetTreeTest() {
   public void stylesheet() throws Exception {
     StyleSheetTree tree;
 
-    tree = checkParsed(".abc { .space; }");
-    assertThat(tree.atRules()).isEmpty();
-
     checkParsed("");
     checkParsed(" ");
     checkParsed("  ");

diff --git a/its/ruling/tests/src/test/expected/css-alphabetize-declarations.json b/its/ruling/tests/src/test/expected/css-alphabetize-declarations.json
@@ -4,7 +4,7 @@
 59,
 65,
 71,
-87,g
+87,
 101,
 106,
 111,

diff --git a/its/ruling/tests/src/test/expected/css-selector-naming-convention.json b/its/ruling/tests/src/test/expected/css-selector-naming-convention.json
diff --git a/its/ruling/tests/src/test/expected/less-selector-naming-convention.json b/its/ruling/tests/src/test/expected/less-selector-naming-convention.json
diff --git a/its/ruling/tests/src/test/expected/scss-selector-naming-convention.json b/its/ruling/tests/src/test/expected/scss-selector-naming-convention.json
diff --git a/sonar-css-plugin/src/test/java/org/sonar/plugins/css/css/CssRulesDefinitionTest.java b/sonar-css-plugin/src/test/java/org/sonar/plugins/css/css/CssRulesDefinitionTest.java
@@ -38,7 +38,7 @@ public void test() {
 
     assertThat(repository.name()).isEqualTo("SonarQube");
     assertThat(repository.language()).isEqualTo("css");
-    assertThat(repository.rules()).hasSize(88);
+    assertThat(repository.rules()).hasSize(87);
     assertThat(CheckList.getEmbeddedCssChecks()).hasSize(repository.rules().size() - 6);
 
 

diff --git a/sonar-css-plugin/src/test/java/org/sonar/plugins/css/less/LessRulesDefinitionTest.java b/sonar-css-plugin/src/test/java/org/sonar/plugins/css/less/LessRulesDefinitionTest.java
@@ -38,7 +38,7 @@ public void test() {
 
     assertThat(repository.name()).isEqualTo("SonarQube");
     assertThat(repository.language()).isEqualTo("less");
-    assertThat(repository.rules()).hasSize(89);
+    assertThat(repository.rules()).hasSize(88);
 
     RulesDefinition.Rule rule = repository.rule(DeprecatedEscapingFunctionCheck.class.getAnnotation(Rule.class).key());
     assertThat(rule).isNotNull();

diff --git a/sonar-css-plugin/src/test/java/org/sonar/plugins/css/scss/ScssRulesDefinitionTest.java b/sonar-css-plugin/src/test/java/org/sonar/plugins/css/scss/ScssRulesDefinitionTest.java
@@ -38,7 +38,7 @@ public void test() {
 
     assertThat(repository.name()).isEqualTo("SonarQube");
     assertThat(repository.language()).isEqualTo("scss");
-    assertThat(repository.rules()).hasSize(100);
+    assertThat(repository.rules()).hasSize(99);
 
     RulesDefinition.Rule rule = repository.rule(ScssVariableNamingConventionCheck.class.getAnnotation(Rule.class).key());
     assertThat(rule).isNotNull();
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
 ,
 ,
 ,
-,g
+,
 ,
 ,
 ,
@@ Expand Down @@