Merge pull request #498 from zyro23/GRAILS-11417

fix for GRAILS-11417
grails · May 19, 2014 · b3a8e1e · b3a8e1e
2 parents ae25eb6 + 4087bb5
commit b3a8e1e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/...ain/groovy/org/codehaus/groovy/grails/resolve/maven/aether/AetherDependencyManager.groovy b/...ain/groovy/org/codehaus/groovy/grails/resolve/maven/aether/AetherDependencyManager.groovy
@@ -352,7 +352,7 @@ class AetherDependencyManager implements DependencyManager {
                         attachmentRequests << new ArtifactRequest(new DefaultArtifact(
                             artifact.groupId, artifact.artifactId, "javadoc", artifact.extension, artifact.version), repositories, null)
                     }
-                    if (includeJavadoc) {
+                    if (includeSource) {
                         attachmentRequests << new ArtifactRequest(new DefaultArtifact(
                             artifact.groupId, artifact.artifactId, "sources", artifact.extension, artifact.version), repositories, null)
                     }

diff --git a/...c/test/groovy/org/codehaus/groovy/grails/resolve/maven/AetherDependencyManagerSpec.groovy b/...c/test/groovy/org/codehaus/groovy/grails/resolve/maven/AetherDependencyManagerSpec.groovy
@@ -28,6 +28,7 @@ import org.eclipse.aether.resolution.DependencyResult
 import spock.lang.Ignore
 import spock.lang.Issue
 import spock.lang.Specification
+import spock.lang.Unroll
 
 /**
  * @author Graeme Rocher
@@ -290,11 +291,10 @@ class AetherDependencyManagerSpec extends Specification {
             files.size() == 1
     }
 
+    @Unroll
     void "Test resolve with source and javadocs"() {
         given: "A dependency manager instance"
             def dependencyManager = new AetherDependencyManager()
-            dependencyManager.includeJavadoc = true
-            dependencyManager.includeSource = true
             dependencyManager.parseDependencies {
                 repositories {
                     mavenCentral()
@@ -306,17 +306,25 @@ class AetherDependencyManagerSpec extends Specification {
             }
 
         when: "A dependency is resolved"
+            dependencyManager.includeJavadoc = includeJavadoc
+            dependencyManager.includeSource = includeSource
             def report = dependencyManager.resolve("compile")
-            println report.files.size()
-            println report.files
+
         then: "The dependencies are resolved"
-
-            report.files.find { it.name.contains('grails-bootstrap-2.2.0')}
-            report.files.find { it.name.contains('grails-bootstrap-2.2.0-sources')}
-            report.files.find { it.name.contains('grails-bootstrap-2.2.0-javadoc')}
-            report.files.find { it.name.contains('jline-1.0')}
-            report.files.find { it.name.contains('jline-1.0-sources')}
-            report.files.find { it.name.contains('jline-1.0-javadoc')}
+            dependencyResolved == report.files.any { it.name.contains('grails-bootstrap-2.2.0')}
+            sourceResolved ==     report.files.any { it.name.contains('grails-bootstrap-2.2.0-sources')}
+            javadocResolved ==    report.files.any { it.name.contains('grails-bootstrap-2.2.0-javadoc')}
+            dependencyResolved == report.files.any { it.name.contains('jline-1.0')}
+            sourceResolved ==     report.files.any { it.name.contains('jline-1.0-sources')}
+            javadocResolved ==    report.files.any { it.name.contains('jline-1.0-javadoc')}
+
+        where:
+            includeJavadoc | includeSource | dependencyResolved | javadocResolved | sourceResolved
+            false          | false         | true               | false           | false
+            true           | false         | true               | true            | false
+            false          | true          | true               | false           | true
+            true           | true          | true               | true            | true
+
     }
 
     void "Test simple dependency resolve"() {