Merge pull request #28 from ddrozdov/issue-22

Fix incorrect invocation of ScalaStyleUtils.getTestFilesToProcess()
ngbinh · Oct 4, 2017 · 0cea2e2 · 0cea2e2
2 parents 94d5ecc + 14ffea3
commit 0cea2e2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/...scalastyle-plugin_2.10/src/main/groovy/org/github/ngbinh/scalastyle/ScalaStyleTask.groovy b/...scalastyle-plugin_2.10/src/main/groovy/org/github/ngbinh/scalastyle/ScalaStyleTask.groovy
@@ -20,13 +20,9 @@ package org.github.ngbinh.scalastyle
 import org.gradle.api.file.FileTree
 import org.gradle.api.tasks.SourceTask
 import org.gradle.api.tasks.TaskAction
-import org.scalastyle.ScalastyleChecker
 import org.scalastyle.ScalastyleConfiguration
 import org.scalastyle.TextOutput
 import org.scalastyle.XmlOutput
-import com.typesafe.config.ConfigFactory
-import com.typesafe.config.Config
-
 /**
  * @author Binh Nguyen
  * @since 12/16/2014
@@ -68,7 +64,7 @@ class ScalaStyleTask extends SourceTask {
                 if (testConfigLocation != null) {
                   def testConfiguration = ScalastyleConfiguration.readFromXml(testConfigLocation)
                   if (testConfiguration != null) {
-                      def testFilesToProcess = scalaStyleUtils.getTestFilesToProcess(source.getFiles().toList(), testSourceDir.getFiles().toList(), inputEncoding, includeTestSourceDirectory)
+                      def testFilesToProcess = scalaStyleUtils.getTestFilesToProcess(testSourceDir.getFiles().toList(), inputEncoding)
                       messages.addAll(scalaStyleUtils.checkFiles(testConfiguration, testFilesToProcess))
                   }
                 }
@@ -120,7 +116,7 @@ class ScalaStyleTask extends SourceTask {
             throw new Exception("Specify Scala source set")
         }
 
-        if (includeTestSourceDirectory && testSource == null) {
+        if (testSource == null) {
             testSourceDir = project.fileTree(project.projectDir.absolutePath + "/src/test/scala")
         } else {
             testSourceDir = project.fileTree(project.projectDir.absolutePath + "/" + testSource)

diff --git a/...-scalastyle-plugin_2.10/src/main/scala/org/github/ngbinh/scalastyle/ScalaStyleUtils.scala b/...-scalastyle-plugin_2.10/src/main/scala/org/github/ngbinh/scalastyle/ScalaStyleUtils.scala
@@ -41,7 +41,7 @@ class ScalaStyleUtils {
     sd ::: tsd
   }
 
-  def getTestFilesToProcess(testFiles: jList[File], inputEncoding: String, includeTestSourceDirectory: Boolean): List[FileSpec] = {
+  def getTestFilesToProcess(testFiles: jList[File], inputEncoding: String): List[FileSpec] = {
     getFiles("testFiles", asScalaBufferConverter(testFiles).asScala.toList, inputEncoding)
   }
 

diff --git a/...scalastyle-plugin_2.11/src/main/groovy/org/github/ngbinh/scalastyle/ScalaStyleTask.groovy b/...scalastyle-plugin_2.11/src/main/groovy/org/github/ngbinh/scalastyle/ScalaStyleTask.groovy
@@ -20,13 +20,9 @@ package org.github.ngbinh.scalastyle
 import org.gradle.api.file.FileTree
 import org.gradle.api.tasks.SourceTask
 import org.gradle.api.tasks.TaskAction
-import org.scalastyle.ScalastyleChecker
 import org.scalastyle.ScalastyleConfiguration
 import org.scalastyle.TextOutput
 import org.scalastyle.XmlOutput
-import com.typesafe.config.ConfigFactory
-import com.typesafe.config.Config
-
 /**
  * @author Binh Nguyen
  * @since 12/16/2014
@@ -68,7 +64,7 @@ class ScalaStyleTask extends SourceTask {
                 if (testConfigLocation != null) {
                   def testConfiguration = ScalastyleConfiguration.readFromXml(testConfigLocation)
                   if (testConfiguration != null) {
-                      def testFilesToProcess = scalaStyleUtils.getTestFilesToProcess(source.getFiles().toList(), testSourceDir.getFiles().toList(), inputEncoding, includeTestSourceDirectory)
+                      def testFilesToProcess = scalaStyleUtils.getTestFilesToProcess(testSourceDir.getFiles().toList(), inputEncoding)
                       messages.addAll(scalaStyleUtils.checkFiles(testConfiguration, testFilesToProcess))
                   }
                 }
@@ -120,7 +116,7 @@ class ScalaStyleTask extends SourceTask {
             throw new Exception("Specify Scala source set")
         }
 
-        if (includeTestSourceDirectory && testSource == null) {
+        if (testSource == null) {
             testSourceDir = project.fileTree(project.projectDir.absolutePath + "/src/test/scala")
         } else {
             testSourceDir = project.fileTree(project.projectDir.absolutePath + "/" + testSource)

diff --git a/...-scalastyle-plugin_2.11/src/main/scala/org/github/ngbinh/scalastyle/ScalaStyleUtils.scala b/...-scalastyle-plugin_2.11/src/main/scala/org/github/ngbinh/scalastyle/ScalaStyleUtils.scala
@@ -41,7 +41,7 @@ class ScalaStyleUtils {
     sd ::: tsd
   }
 
-  def getTestFilesToProcess(testFiles: jList[File], inputEncoding: String, includeTestSourceDirectory: Boolean): List[FileSpec] = {
+  def getTestFilesToProcess(testFiles: jList[File], inputEncoding: String): List[FileSpec] = {
     getFiles("testFiles", asScalaBufferConverter(testFiles).asScala.toList, inputEncoding)
   }