Migrated tests from JRubyJarIntegrationSpec and deleted the latter

ysb33r · ysb33r · commit 4abeb5b61c09 · 2019-05-05T18:18:50.000+02:00
diff --git a/jar-plugin/src/integTest/groovy/com/github/jrubygradle/jar/JRubyJarIntegrationSpec.groovy b/jar-plugin/src/integTest/groovy/com/github/jrubygradle/jar/JRubyJarIntegrationSpec.groovy
@@ -46,104 +46,5 @@ class JRubyJarIntegrationSpec extends Specification {
         }
     }
 
-    def "Building a Jar with a custom configuration and 'java' plugin is applied"() {
-        given: "Java plugin applied before JRuby Jar plugin"
-        project.apply plugin : 'java'
-        Task jrubyJar = project.tasks.getByName('jrubyJar')
-        File expectedDir = new File(TESTROOT, 'libs/')
-        File expectedJar = new File(expectedDir, 'test-jruby.jar')
-
-        when: "I set the main class"
-        project.configure(jrubyJar) {
-            mainClass 'bogus.does.not.exist'
-        }
-        project.evaluate()
-
-        and: "I actually build the JAR"
-        jrubyJar.execute()
-        def builtJar = fileNames(project.zipTree(expectedJar))
-
-        then: "I expect to see jruby.home unpacked "
-        builtJar.contains("META-INF/jruby.home/lib/ruby".toString())
-
-        and: "I expect the new main class to be listed in the manifest"
-        jrubyJar.manifest.effectiveManifest.attributes['Main-Class']?.contains('bogus.does.not.exist')
-    }
-
-    def "Setting the jrubyVersion to an older version of JRuby should update jar-dependencies"() {
-        given: "a version of JRuby which doesn't bundle jar-dependencies"
-        Configuration config = project.configurations.create('spockConfig')
-        final String version = '1.7.11'
-        JRubyJar task = project.task('spock-jar', type: JRubyJar) {
-            configuration config.name
-            jrubyVersion version
-        }
-
-        when:
-        project.evaluate()
-
-        then: "the JRuby version and jar-dependencies versions should be set"
-        config.dependencies.find { it.name == 'jar-dependencies' }
-    }
-
-    @Issue("https://github.com/jruby-gradle/jruby-gradle-plugin/issues/168")
-    def "configuring a new jrubyMainsVersion should update the dependency graph properly"() {
-        Configuration config = project.configurations.create('spockConfig')
-        final String version = '0.3.0'
-        JRubyJar task = project.task('spock-jar', type: JRubyJar) {
-            configuration config.name
-            jrubyMainsVersion version
-        }
-
-        when:
-        project.evaluate()
-
-        then: "the custom version should be included in the custom config"
-        config.dependencies.find { it.name == 'jruby-mains' && it.version == version }
-        config.dependencies.findAll({ it.name == 'jruby-mains' }).size() == 1
-    }
-
-    /*
-        @Ignore('should be an integration test since we add jar-dependencies')
-    def "prepareTask should have its configuration lazily set"() {
-        given:
-        Task prepareTask = jarTask.dependsOn.find { it instanceof JRubyPrepare }
-
-        when:
-        project.evaluate()
-
-        then:
-        prepareTask.dependencies.find { (it instanceof Configuration) && (it.name == jarTask.configuration) }
-    }
-
-        def "Adding a default main class"() {
-        when: "Setting a default main class"
-        project.configure(jarTask) {
-            defaultMainClass()
-        }
-        jarTask.addJRubyDependency()
-        jarTask.applyConfig()
-
-        then: "Then the attribute should be set to the default in the manifest"
-        jarTask.manifest.attributes.'Main-Class' == DEFAULT_MAIN_CLASS
-    }
-
-        @Ignore('should be an integration test since we add jar-dependencies')
-    @Issue('https://github.com/jruby-gradle/jruby-gradle-plugin/issues/115')
-    def "jrubyVersion is lazily evaluated"() {
-        given:
-        final String version = '1.7.11'
-
-        when:
-        project.jruby {
-            defaultVersion version
-        }
-        project.evaluate()
-
-        then:
-        project.tasks.findByName('jrubyJar').jrubyVersion == version
-    }
-
-     */
 }
 
diff --git a/jar-plugin/src/integTest/groovy/com/github/jrubygradle/jar/JRubyJarTestKitSpec.groovy b/jar-plugin/src/integTest/groovy/com/github/jrubygradle/jar/JRubyJarTestKitSpec.groovy
@@ -9,6 +9,8 @@ import spock.lang.Issue
 import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
 
+import static com.github.jrubygradle.jar.JRubyJar.DEFAULT_MAIN_CLASS
+
 class JRubyJarTestKitSpec extends IntegrationSpecification {
 
     public static final String DEFAULT_TASK_NAME = 'jrubyJar'
@@ -17,6 +19,7 @@ class JRubyJarTestKitSpec extends IntegrationSpecification {
     String jrubyJarConfig
     String repoSetup
     String deps
+    String preamble
     String additionalContent
 
     def setup() {
@@ -36,8 +39,8 @@ class JRubyJarTestKitSpec extends IntegrationSpecification {
     }
 
     void "executing the jrubyJar task produces an executable artifact"() {
-        given:
-        withJRubyConfig """
+        setup:
+        withJRubyJarConfig """
             initScript 'main.rb'
         """
 
@@ -59,8 +62,7 @@ class JRubyJarTestKitSpec extends IntegrationSpecification {
         result.task(":validateJar").outcome == TaskOutcome.SUCCESS
 
         and: "the should not be a jruby-mains.jar or jruby-complete.jar inside the archive"
-        ZipFile zip = new ZipFile("${projectDir}/build/libs/testproject-jruby.jar")
-        !zip.entries().findAll { ZipEntry entry ->
+        !jarEntries.findAll { ZipEntry entry ->
             entry.name.matches(/(.*)jruby-complete-(.*).jar/) || entry.name.matches(/(.*)jruby-mains-(.*).jar/)
         }
 
@@ -70,7 +72,7 @@ class JRubyJarTestKitSpec extends IntegrationSpecification {
 
     @Issue("https://github.com/jruby-gradle/jruby-gradle-plugin/issues/183")
     void "creating a new task based on JRubyJar produces a jar artifact"() {
-        given:
+        setup:
         withAdditionalContent '''
             task someDifferentJar(type: JRubyJar) { 
                 initScript 'main.rb' 
@@ -96,13 +98,13 @@ class JRubyJarTestKitSpec extends IntegrationSpecification {
     @IgnoreIf({ IntegrationSpecification.OFFLINE })
     @Issue('https://github.com/jruby-gradle/jruby-gradle-plugin/pull/271')
     def 'using a more recent jar-dependencies should work'() {
-        given:
+        setup:
         withRepoSetup """
             maven { url 'http://rubygems-proxy.torquebox.org/releases' }
             mavenCentral()
         """
         withDependencies "jrubyJar 'rubygems:jar-dependencies:0.2.3'"
-        withJRubyConfig "initScript 'main.rb'"
+        withJRubyJarConfig "initScript 'main.rb'"
 
         withAdditionalContent '''
             task validateJar(type: JavaExec) {
@@ -122,7 +124,36 @@ class JRubyJarTestKitSpec extends IntegrationSpecification {
         result.output.contains("Hello from JRuby")
     }
 
-    private void withJRubyConfig(String content) {
+    void "Building a Jar with a custom configuration and 'java' plugin is applied"() {
+        setup:
+        withPreamble 'apply plugin: "java"'
+        withJRubyJarConfig "mainClass 'bogus.does.not.exist'"
+
+        when:
+        build()
+
+        then: "I expect to see jruby.home unpacked inside the jar"
+        jarEntries.find { entry ->
+            entry.name == 'META-INF/jruby.home/bin/'
+        }
+
+        and: "I expect the new main class to be listed in the manifest"
+        jarManifestContent.contains 'Main-Class: bogus.does.not.exist'
+    }
+
+    void "Adding a default main class"() {
+        setup:
+        withPreamble 'apply plugin: "java"'
+        withJRubyJarConfig "defaultMainClass()"
+
+        when:
+        build()
+
+        then: "Then the attribute should be set to the default in the manifest"
+        jarManifestContent.contains "Main-Class: ${DEFAULT_MAIN_CLASS}"
+    }
+
+    private void withJRubyJarConfig(String content) {
         jrubyJarConfig = """
         jrubyJar {
             ${content}
@@ -159,6 +190,10 @@ class JRubyJarTestKitSpec extends IntegrationSpecification {
         """
     }
 
+    private void withPreamble(String content) {
+        this.preamble = content
+    }
+
     private void writeBuildFile() {
         buildFile.text = """
         import com.github.jrubygradle.jar.JRubyJar
@@ -167,6 +202,8 @@ class JRubyJarTestKitSpec extends IntegrationSpecification {
             id 'com.github.jruby-gradle.jar'
         }
         
+        ${preamble ?: ''}
+
         jruby.defaultRepositories = false
         
         ${repoSetup ?: ''}
@@ -195,4 +232,19 @@ class JRubyJarTestKitSpec extends IntegrationSpecification {
         tasks.addAll(additionalTasks)
         gradleRunner(tasks).build()
     }
+
+    private def getJarEntries() {
+        ZipFile zip = new ZipFile("${projectDir}/build/libs/testproject-jruby.jar")
+        zip.entries()
+    }
+
+    private String getJarManifestContent() {
+        ZipFile zip = new ZipFile("${projectDir}/build/libs/testproject-jruby.jar")
+
+        ZipEntry entry = zip.entries().find { entry ->
+            entry.name == 'META-INF/MANIFEST.MF'
+        }
+
+        zip.getInputStream(entry).text
+    }
 }
