Added testConfigLocation option to support separate scala style config for source directory [Fixes #19]

Author: vk9

README.md

@@ -29,6 +29,7 @@ Default phase of execution is `verify`. The following is an example of a configu
               <sourceDirectory>${project.basedir}/src/main/scala</sourceDirectory>
               <testSourceDirectory>${project.basedir}/src/test/scala</testSourceDirectory>
               <configLocation>${project.basedir}/lib/scalastyle_config.xml</configLocation>
+              <testConfigLocation>${project.basedir}/lib/scalastyle_test_config.xml</testConfigLocation>
               <outputFile>${project.basedir}/scalastyle-output.xml</outputFile>
               <outputEncoding>UTF-8</outputEncoding>
             </configuration>

src/it/test_config/invoker.properties

@@ -0,0 +1,2 @@
+invoker.goals=clean compile
+invoker.buildResult=failure

src/it/test_config/pom.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>it.scalastyle-maven-plugin</groupId>
+    <artifactId>basic</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>Test for basic criteria</name>
+    <description>Test for basic criteria</description>
+    <packaging>pom</packaging>
+    <dependencies>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>@project.groupId@</groupId>
+                <artifactId>@project.artifactId@</artifactId>
+                <version>@project.version@</version>
+                <configuration>
+              <verbose>true</verbose>
+              <failOnViolation>true</failOnViolation>
+              <includeTestSourceDirectory>true</includeTestSourceDirectory>
+              <failOnWarning>false</failOnWarning>
+              <sourceDirectory>${src.it}/testsrc</sourceDirectory>
+              <sourceDirectories>
+                <dir>${src.it}/testsrc</dir>
+              </sourceDirectories>
+              <testSourceDirectories>
+                <dir>${src.it}/testsrc2</dir>
+              </testSourceDirectories>
+              <configLocation>${src.it}/scalastyle_config.xml</configLocation>
+              <testConfigLocation>${src.it}/scalastyle_error.xml</testConfigLocation>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>scalastyle</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

src/it/test_config/validate.groovy

@@ -0,0 +1,14 @@
+try {
+
+def file = new File(basedir, 'target')
+assert !file.exists()
+
+assert new File(basedir, "build.log").readLines().grep(~/.*warning.*Foobar.scala message=File length exceeds.*/).size() == 1
+assert new File(basedir, "build.log").readLines().grep(~/.*error.*Foobar2.scala message=File length exceeds.*/).size() == 1
+
+return true
+
+} catch(Throwable e) {
+  e.printStackTrace()
+  return false
+}

src/main/java/org/scalastyle/maven/plugin/ScalastyleViolationCheckMojo.java

@@ -61,7 +61,7 @@ public class ScalastyleViolationCheckMojo extends AbstractMojo {
 
     /**
      * <p>
-     * Specifies the location of the scalstyle XML configuration file to use.
+     * Specifies the location of the scalstyle XML configuration file for source directory.
      * </p>
      * <p>
      * Potential values are a filesystem path, a URL, or a classpath resource.
@@ -77,6 +77,24 @@ public class ScalastyleViolationCheckMojo extends AbstractMojo {
     @Parameter(property = "scalastyle.config.location", required = true, defaultValue = "default_config.xml")
     private String configLocation;
 
+    /**
+     * <p>
+     * Specifies the location of the scalstyle XML configuration file for test source directory.
+     * </p>
+     * <p>
+     * Potential values are a filesystem path, a URL, or a classpath resource.
+     * </p>
+     * <p>
+     * This parameter is resolved as file, classpath resource then URL.
+     * </p>
+     * <p>
+     * Source directory config location is used if non is specified in configuration
+     * </p>
+     * <p/>
+     */
+    @Parameter(property = "scalastyle.test.config.location")
+    private String testConfigLocation;
+
     /**
      * Specifies the path and filename to save the Scalastyle output.
      */
@@ -208,12 +226,21 @@ public void execute() throws MojoFailureException, MojoExecutionException {
 
     private void performCheck() throws MojoFailureException, MojoExecutionException {
         try {
-            ScalastyleConfiguration configuration = ScalastyleConfiguration.readFromXml(getConfigFile(configLocation));
+            ScalastyleConfiguration srcConfiguration = ScalastyleConfiguration.readFromXml(getConfigFile(configLocation));
+            ScalastyleConfiguration testConfiguration = srcConfiguration;
+
+            if (testConfigLocation != null) {
+                testConfiguration = ScalastyleConfiguration.readFromXml(getConfigFile(testConfigLocation));
+            }
+
             long start = now();
             final scala.Option<ClassLoader> none = scala.Option$.MODULE$.apply(null);
             ScalastyleChecker<FileSpec> sc = new ScalastyleChecker<FileSpec>(none);
 
-            List<Message<FileSpec>> messages = sc.checkFilesAsJava(configuration, getFilesToProcess());
+            List<Message<FileSpec>> messages = new ArrayList<Message<FileSpec>>();
+            messages.addAll(sc.checkFilesAsJava(srcConfiguration, getSrcFilesToProcess()));
+            messages.addAll(sc.checkFilesAsJava(testConfiguration, getTestFilesToProcess()));
+
 
             Config config = ConfigFactory.load(sc.getClass().getClassLoader());
             OutputResult outputResult = new TextOutput<FileSpec>(config, verbose, quiet).output(messages);
@@ -307,13 +334,12 @@ private URLClassLoader getClassLoaderWithProjectResources() throws MojoFailureEx
         return new URLClassLoader(urls.toArray(new URL[urls.size()]), Thread.currentThread().getContextClassLoader());
     }
 
-    private List<FileSpec> getFilesToProcess() {
-        List<FileSpec> all = new ArrayList<FileSpec>();
-
-        all.addAll(getFiles("sourceDirectory", sourceDirectoriesAsList(), inputEncoding));
-        all.addAll(getFiles("testSourceDirectory", testSourceDirectoriesAsList(), inputEncoding));
+    private List<FileSpec> getSrcFilesToProcess() {
+        return getFiles("sourceDirectory", sourceDirectoriesAsList(), inputEncoding);
+    }
 
-        return all;
+    private List<FileSpec> getTestFilesToProcess() {
+        return getFiles("testSourceDirectory", testSourceDirectoriesAsList(), inputEncoding);
     }
 
     private List<FileSpec> getFiles(String name, List<File> dirs, String encoding) {