fix(regression): add created source files to spoon input

.travis.yml

@@ -30,4 +30,8 @@ script:
 - cd src/test/projects/hello-world-with-test
 - mvn spoon:check
 - cd ../../../..
+# try processor on javacc-generate
+- cd src/test/projects/javacc-generate
+- mvn package
+- cd ../../../..
 

README.md

@@ -265,6 +265,13 @@ Then, the plugin is automatically discovered ([through prefix resolution](https:
 
 ## Changelogs
 
+* Version 3.4.1
+ * Allow analysis of generated source files, even if the generating pluging missbehaves see https://github.com/SpoonLabs/spoon-maven-plugin/pull/70
+
+* Version 3.4
+ * Replacement of srcFolder(s) parameter with new includeSrc parameter
+ * Allow analysis of test dependencies, see https://github.com/SpoonLabs/spoon-maven-plugin/pull/68
+
 * Version 3.3
  * Update to Spoon 8.1
  * Fixes noclasspath, see https://github.com/INRIA/spoon/issues/3325

src/main/java/fr/inria/gforge/spoon/configuration/AbstractSpoonConfigurationBuilder.java

@@ -36,12 +36,24 @@ protected AbstractSpoonConfigurationBuilder(SpoonMojoGenerate spoon,
  @Override
  public SpoonConfigurationBuilder addInputFolder() throws SpoonMavenPluginException {
  final List<File> srcDir = new ArrayList<>();
- if(spoon.isIncludeSrcDirectories()) {
+ if (spoon.isIncludeSrcDirectories()) {
  srcDir.add(new File(spoon.getProject().getBuild().getSourceDirectory()));
+ if (!spoon.getSkipGeneratedSources()) {
+ for (String s : spoon.getProject().getCompileSourceRoots()) {
+ srcDir.add(new File(s));
+ }
+ }
  }
  if(spoon.isIncludeTestDirectories()) {
  srcDir.add(new File(spoon.getProject().getBuild().getTestSourceDirectory()));
+ if (!spoon.getSkipGeneratedSources()) {
+ for (String s : spoon.getProject().getTestCompileSourceRoots()) {
+ srcDir.add(new File(s));
+ }
+ }
  }
+
+
  srcDir.removeIf(file -> !file.exists());
 
  if (srcDir.isEmpty()) {

src/test/java/fr/inria/gforge/spoon/unit/SpoonConfigurationBuilderTest.java

@@ -7,12 +7,14 @@
 import fr.inria.gforge.spoon.logging.ReportFactory;
 import org.apache.maven.plugin.testing.MojoRule;
 import org.apache.maven.plugin.testing.resources.TestResources;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
 import java.io.File;
 import java.util.Arrays;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertTrue;
 
 public final class SpoonConfigurationBuilderTest {
  @Rule
@@ -44,7 +46,7 @@ public void testConfigurationOfTheEnableCommentsKeepsDefaults() throws Exception
  assertThat(config[0]).isEqualTo("--level");
  assertThat(config[1]).isEqualTo("INFO");
  }
-
+ 
  @Test
  public void testConfigurationOfTheDefaultInputFolder() throws Exception {
  final File basedir = resources.getBasedir("hello-world");
@@ -55,7 +57,7 @@ public void testConfigurationOfTheDefaultInputFolder() throws Exception {
  assertThat(config[0]).isEqualTo("--level");
  assertThat(config[1]).isEqualTo("INFO");
  assertThat(config[2]).isEqualTo("-i");
- assertThat(config[3]).isEqualTo(basedir + File.separator + "src" + File.separator + "main" + File.separator + "java");
+ assertTrue(Arrays.stream(config).anyMatch(v->v.contains(basedir + File.separator + "src" + File.separator + "main" + File.separator + "java")));
  }
 
  @Test

src/test/projects/hello-world-with-test/pom.xml

@@ -22,7 +22,6 @@
  <plugin>
  <groupId>fr.inria.gforge.spoon</groupId>
  <artifactId>spoon-maven-plugin</artifactId>
- <version>3.4-SNAPSHOT</version>
  <executions>
  <execution>
  <phase>generate-sources</phase>

src/test/projects/javacc-generate/pom.xml

@@ -0,0 +1,66 @@
+<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>test.javacc.spoon</groupId>
+ <artifactId>foo</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <properties>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+ <dependencies>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>javacc</id>
+ <goals>
+ <goal>javacc</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>net.java.dev.javacc</groupId>
+ <artifactId>javacc</artifactId>
+ <version>7.0.6</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>fr.inria.gforge.spoon</groupId>
+ <artifactId>spoon-maven-plugin</artifactId>
+ <version>3.5-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <includeTest>false</includeTest>
+ <includeSource>true</includeSource>
+ <noClasspath>false</noClasspath>
+ <debug>true</debug>
+ <processors>
+ <processor>fr.inria.gforge.spoon.mojo.CountStatementProcessor</processor>
+ </processors>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>fr.inria.gforge.spoon</groupId>
+ <artifactId>processors</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>

src/test/projects/javacc-generate/src/main/java/test/javacc/spoon/App.java

@@ -0,0 +1,19 @@
+package test.javacc.spoon;
+
+import generate.javacc.spoon.Example;
+/**
+ * Hello world!
+ */
+public final class App {
+ private App() {
+ }
+
+ /**
+ * Says hello to the world.
+ * @param args The arguments of the program.
+ */
+ public static void main(String[] args) {
+ Example example = new Example(System.in);
+ System.out.println("Hello World!");
+ }
+}

src/test/projects/javacc-generate/src/main/javacc/Example.jj

@@ -0,0 +1,28 @@
+PARSER_BEGIN(Example)
+package generate.javacc.spoon;
+/** Simple brace matcher. */
+public class Example {
+
+ /** Main entry point. */
+ public static void main(String args[]) throws ParseException {
+ Example parser = new Example(System.in);
+ parser.Input();
+ }
+
+}
+
+PARSER_END(Example)
+
+/** Root production. */
+void Input() :
+{}
+{
+ MatchedBraces() ("\n"|"\r")* <EOF>
+}
+
+/** Brace matching production. */
+void MatchedBraces() :
+{}
+{
+ "{" [ MatchedBraces() ] "}"
+}