Merge pull request #266 from iwarapter/feature/issue#265

Feature/issue#265
iwarapter · May 22, 2016 · 49d7acb · 49d7acb
2 parents 853e5ef + 3a4589e
commit 49d7acb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/puppet-checks/src/main/java/com/iadams/sonarqube/puppet/checks/OneIncludePerLineCheck.java b/puppet-checks/src/main/java/com/iadams/sonarqube/puppet/checks/OneIncludePerLineCheck.java
@@ -52,7 +52,7 @@ public void init() {
 
   @Override
   public void visitNode(AstNode node) {
-    if ("include".equals(node.getTokenValue()) && !node.getFirstChild(PuppetGrammar.FUNCVALUES).getChildren(PuppetPunctuator.COMMA).isEmpty()) {
+    if ("include".equals(node.getTokenValue()) && node.hasDescendant(PuppetPunctuator.COMMA)) {
       addIssue(node, this, "Split this include statement into multiple lines.");
     }
   }

diff --git a/...ecks/src/test/groovy/com/iadams/sonarqube/puppet/checks/OneIncludePerLineCheckSpec.groovy b/...ecks/src/test/groovy/com/iadams/sonarqube/puppet/checks/OneIncludePerLineCheckSpec.groovy
@@ -44,6 +44,7 @@ class OneIncludePerLineCheckSpec extends Specification {
       .next().atLine(2).withMessage(MESSAGE)
       .next().atLine(3).withMessage(MESSAGE)
       .next().atLine(6).withMessage(MESSAGE)
+      .next().atLine(8).withMessage(MESSAGE)
       .noMore();
   }
-}
+}
diff --git a/puppet-checks/src/test/resources/checks/one_include_per_line.pp b/puppet-checks/src/test/resources/checks/one_include_per_line.pp
@@ -5,3 +5,4 @@
 include Class['base::linux']
 include Class['base::linux'], Class['base::tomcat']   # Noncompliant
 
+include( "stdlib", "apache" ) # Noncompliant
diff --git a/.../src/test/groovy/com/iadams/sonarqube/puppet/parser/simple_statements/FunctionSpec.groovy b/.../src/test/groovy/com/iadams/sonarqube/puppet/parser/simple_statements/FunctionSpec.groovy
@@ -91,8 +91,13 @@ class FunctionSpec extends GrammarSpec {
     assertThat(p).matches('include $my_classes')
   }
 
+  def 'include with brackets'() {
+    expect:
+    assertThat(p).matches('include( "stdlib", "apache" )')
+  }
+
   def "function using hash array accessor"() {
     expect:
     assertThat(p).matches('dirname($logfiles[1][1])')
   }
-}
+}