Merge pull request #52 from jhoch-palantir/jhoch/issue51/no-annotatio…

…n-processor-field Handles missing <annotationProcessing> tag (.idea)
palantir · Jan 6, 2017 · 2336f24 · 2336f24
2 parents 957e67c + 3cb4a9c
commit 2336f24
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 0 deletions.
diff --git a/src/main/groovy/org/inferred/gradle/ProcessorsPlugin.groovy b/src/main/groovy/org/inferred/gradle/ProcessorsPlugin.groovy
@@ -199,6 +199,10 @@ class ProcessorsPlugin implements Plugin<Project> {
       throw new GradleException("Unable to find CompilerConfiguration element")
     }
 
+    if (compilerConfiguration.annotationProcessing.isEmpty()) {
+      new Node(compilerConfiguration, "annotationProcessing")
+    }
+
     compilerConfiguration.annotationProcessing.replaceNode{
       annotationProcessing() {
         profile(default: 'true', name: 'Default', enabled: 'true') {

diff --git a/src/test/groovy/org/inferred/gradle/ProcessorsPluginFunctionalTest.groovy b/src/test/groovy/org/inferred/gradle/ProcessorsPluginFunctionalTest.groovy
@@ -572,6 +572,93 @@ public class ProcessorsPluginFunctionalTest {
     assertEquals(expected, sourceFolderUrls.toSet())
   }
 
+  @Test
+  public void testAnnotationProcessingInIdeaCompilerXml() throws IOException {
+    buildFile << """
+      apply plugin: 'java'
+      apply plugin: 'idea'
+      apply plugin: 'org.inferred.processors'
+    """
+
+    new File(testProjectDir.newFolder('.idea'), 'compiler.xml') << """
+      <?xml version="1.0" encoding="UTF-8"?>
+      <project version="4">
+        <component name="CompilerConfiguration">
+          <annotationProcessing/>
+        </component>
+      </project>
+    """.trim()
+
+    File testProjectDirRoot = testProjectDir.getRoot()
+    GradleRunner.create()
+            .withProjectDir(testProjectDirRoot)
+            .withArguments("idea", "--stacktrace")
+            .build()
+
+    def xml = new XmlSlurper().parse(testProjectDirRoot.toPath().resolve(".idea/compiler.xml").toFile())
+
+    def expected = new XmlSlurper().parseText("""
+      <?xml version="1.0" encoding="UTF-8"?>
+      <project version="4">
+        <component name="CompilerConfiguration">
+          <annotationProcessing>
+            <profile default="true" name="Default" enabled="true">
+              <sourceOutputDir name="generated_src"/>
+              <sourceTestOutputDir name="generated_testSrc"/>
+              <outputRelativeToContentRoot value="true"/>
+              <processorPath useClasspath="true"/>
+            </profile>
+          </annotationProcessing>
+        </component>
+      </project>
+    """.trim())
+
+    assertEquals(expected, xml)
+  }
+
+  @Test
+  public void testNoAnnotationProcessingInIdeaCompilerXml() throws IOException {
+    buildFile << """
+      apply plugin: 'java'
+      apply plugin: 'idea'
+      apply plugin: 'org.inferred.processors'
+    """
+
+    new File(testProjectDir.newFolder('.idea'), 'compiler.xml') << """
+      <?xml version="1.0" encoding="UTF-8"?>
+      <project version="4">
+        <component name="CompilerConfiguration">
+        </component>
+      </project>
+    """.trim()
+
+    File testProjectDirRoot = testProjectDir.getRoot()
+    GradleRunner.create()
+            .withProjectDir(testProjectDirRoot)
+            .withArguments("idea", "--stacktrace")
+            .build()
+
+    def xml = new XmlSlurper().parse(testProjectDirRoot.toPath().resolve(".idea/compiler.xml").toFile())
+
+    def expected = new XmlSlurper().parseText("""
+      <?xml version="1.0" encoding="UTF-8"?>
+      <project version="4">
+        <component name="CompilerConfiguration">
+          <annotationProcessing>
+            <profile default="true" name="Default" enabled="true">
+              <sourceOutputDir name="generated_src"/>
+              <sourceTestOutputDir name="generated_testSrc"/>
+              <outputRelativeToContentRoot value="true"/>
+              <processorPath useClasspath="true"/>
+            </profile>
+          </annotationProcessing>
+        </component>
+      </project>
+    """.trim())
+
+    assertEquals(expected, xml)
+  }
+
   @Test
   public void testOnlyApplyToSubProject() {
     testProjectDir.newFolder("projectA")