Skip to content

Commit

Permalink
Always specify coreVersion in tests
Browse files Browse the repository at this point in the history 
#148
  • Loading branch information
@sghill
sghill committed May 27, 2020
1 parent 08f80f0 commit ad2f304
Show file tree
Hide file tree
Showing 5 changed files with 145 additions and 21 deletions.
66 changes: 58 additions & 8 deletions src/test/groovy/org/jenkinsci/gradle/plugins/jpi/AbstractManifestIntegrationSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {

def 'should have defaults'() {
given:
build << """\
jenkinsPlugin {
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
""".stripIndent()
def expected = [
'Long-Name' : projectName,
'Support-Dynamic-Loading': 'true',
Expand All @@ -38,6 +43,7 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
'Manifest-Version' : '1.0',
'Short-Name' : projectName,
'Minimum-Java-Version' : System.getProperty('java.specification.version'),
'Jenkins-Version' : TestSupport.RECENT_JENKINS_VERSION,
]
when:
def actual = generateManifestThroughGradle()
Expand All @@ -48,12 +54,12 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {

def 'should populate Long-Name from Short-Name if unset'() {
given:
build << '''
build << """\
jenkinsPlugin {
coreVersion = '2.222.3'
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
shortName = 'hello'
}
'''.stripIndent()
""".stripIndent()

when:
def actual = generateManifestThroughGradle(projectVersion, 'hello')
Expand All @@ -64,13 +70,13 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {

def 'should populate Long-Name'() {
given:
build << '''
build << """\
jenkinsPlugin {
coreVersion = '2.222.3'
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
shortName = 'hello'
displayName = 'The Hello Plugin'
}
'''.stripIndent()
""".stripIndent()

when:
def actual = generateManifestThroughGradle(projectVersion, 'hello')
Expand All @@ -80,6 +86,12 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
}

def 'should populate Plugin-Version from project version if not defined'() {
given:
build << """\
jenkinsPlugin {
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
""".stripIndent()
when:
def actual = generateManifestThroughGradle(null)

Expand All @@ -89,6 +101,11 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {

def 'should populate Plugin-Version from calculated project version if defined as -SNAPSHOT'() {
given:
build << """\
jenkinsPlugin {
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
""".stripIndent()
def snapshotVersion = "${projectVersion}-SNAPSHOT"

when:
Expand All @@ -103,6 +120,9 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
String expected = 'org.example.myplugin'
build << """\
group = "$expected"
jenkinsPlugin {
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
""".stripIndent()

when:
Expand Down Expand Up @@ -134,7 +154,7 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
String name = 'TestPlugin'
build << """\
jenkinsPlugin {
coreVersion = '2.150.1'
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
""".stripIndent()
projectDir.newFolder('src', 'main', 'java', 'my', 'example')
Expand All @@ -158,6 +178,7 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
build << """\
jenkinsPlugin {
compatibleSinceVersion = '$expected'
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
""".stripIndent()

Expand All @@ -172,6 +193,9 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
given:
build << """\
targetCompatibility = $input
jenkinsPlugin {
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
""".stripIndent()
expect:
Expand All @@ -192,6 +216,7 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
build << """\
jenkinsPlugin {
maskClasses = '$expected'
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
""".stripIndent()

Expand All @@ -208,6 +233,7 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
build << """\
jenkinsPlugin {
pluginFirstClassLoader = $value
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
""".stripIndent()
Expand All @@ -227,6 +253,7 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
build << """\
jenkinsPlugin {
sandboxStatus = $value
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
""".stripIndent()
Expand All @@ -243,6 +270,9 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
def 'should populate Plugin-Dependencies with expected format for sole required dependency'() {
given:
build << """\
jenkinsPlugin {
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
dependencies {
api 'org.jenkins-ci.plugins:ant:1.2'
}
Expand All @@ -258,6 +288,9 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
def 'should populate Plugin-Dependencies with expected ordered format for multiple required dependencies'() {
given:
build << """\
jenkinsPlugin {
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
dependencies {
api 'org.jenkinsci.plugins:git:1.1.15'
implementation 'org.jenkins-ci.plugins:ant:1.2'
Expand All @@ -274,6 +307,9 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
def 'should populate Plugin-Dependencies with expected format for sole optional dependency'() {
given:
build << """\
jenkinsPlugin {
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
java {
registerFeature('ant') {
usingSourceSet(sourceSets.main)
Expand All @@ -294,6 +330,9 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
def 'should populate Plugin-Dependencies with expected ordered format for multiple optional dependencies'() {
given:
build << """\
jenkinsPlugin {
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
java {
registerFeature('git') {
usingSourceSet(sourceSets.main)
Expand All @@ -318,6 +357,9 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
def 'should populate Plugin-Dependencies with expected ordered format for multiple dependencies'() {
given:
build << """\
jenkinsPlugin {
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
java {
registerFeature('folder') {
usingSourceSet(sourceSets.main)
Expand Down Expand Up @@ -348,6 +390,10 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
def 'can use bom to manage plugin dependencies'() {
given:
build << """\
jenkinsPlugin {
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
dependencies {
api platform("io.jenkins.tools.bom:bom-2.138.x:4")
implementation 'org.jenkins-ci.plugins.workflow:workflow-api'
Expand All @@ -365,6 +411,7 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
given:
build << """\
jenkinsPlugin {
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
developers {
developer {
id 'abayer'
Expand All @@ -386,6 +433,7 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
given:
build << """\
jenkinsPlugin {
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
developers {
developer {
id 'abayer'
Expand All @@ -411,7 +459,7 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
given:
build << """\
jenkinsPlugin {
coreVersion = '2.150.1'
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
""".stripIndent()
projectDir.newFolder('src', 'main', 'java', 'my', 'example')
Expand Down Expand Up @@ -440,6 +488,7 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
build << """\
jenkinsPlugin {
shortName = 'unchanged'
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
""".stripIndent()
def firstRun = runTask()
Expand All @@ -458,6 +507,7 @@ abstract class AbstractManifestIntegrationSpec extends IntegrationSpec {
build << """\
jenkinsPlugin {
shortName = 'before'
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
""".stripIndent()
def firstRun = runTask()
Expand Down
13 changes: 9 additions & 4 deletions src/test/groovy/org/jenkinsci/gradle/plugins/jpi/ConfigurePublishingIntegrationSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,12 @@ class ConfigurePublishingIntegrationSpec extends IntegrationSpec {

def 'does not create sources and javadoc jars if configurePublishing is disabled'() {
given:
build << '''
build << """
jenkinsPlugin {
configurePublishing = false
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
'''.stripIndent()
""".stripIndent()
when:
gradleRunner()
.withArguments('build')
Expand All @@ -81,6 +82,7 @@ class ConfigurePublishingIntegrationSpec extends IntegrationSpec {
}
jenkinsPlugin {
configurePublishing = false
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
""".stripIndent()

Expand All @@ -106,6 +108,7 @@ class ConfigurePublishingIntegrationSpec extends IntegrationSpec {
}
jenkinsPlugin {
configurePublishing = false
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
afterEvaluate {
Expand Down Expand Up @@ -149,6 +152,7 @@ class ConfigurePublishingIntegrationSpec extends IntegrationSpec {
build << """
jenkinsPlugin {
$declaration
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
version = '$version'
""".stripIndent()
Expand Down Expand Up @@ -176,6 +180,7 @@ class ConfigurePublishingIntegrationSpec extends IntegrationSpec {
build << """
jenkinsPlugin {
configurePublishing = false
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
version = '$version'
""".stripIndent()
Expand All @@ -199,8 +204,8 @@ class ConfigurePublishingIntegrationSpec extends IntegrationSpec {
def version = '12.1'
build << """
jenkinsPlugin {
coreVersion = '2.222.3'
$declaration
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
version = '$version'
""".stripIndent()
Expand Down Expand Up @@ -235,8 +240,8 @@ class ConfigurePublishingIntegrationSpec extends IntegrationSpec {
given:
build << """
jenkinsPlugin {
coreVersion = '2.222.3'
$declaration
coreVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
}
""".stripIndent()

Expand Down
Loading

0 comments on commit ad2f304

Please sign in to comment.