Updating plugin id in all tests

ghale · Jun 30, 2014 · 95c33d4 · 95c33d4
1 parent 00e181c
commit 95c33d4
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/src/test/groovy/com/terrafolio/gradle/plugins/jenkins/test/JenkinsPluginTest.groovy b/src/test/groovy/com/terrafolio/gradle/plugins/jenkins/test/JenkinsPluginTest.groovy
@@ -10,9 +10,11 @@ import org.gradle.api.execution.TaskExecutionGraph
 import org.gradle.api.plugins.BasePlugin
 
 class JenkinsPluginTest extends PluginProjectSpec {
+    static final String PLUGINID = 'com.terrafolio.jenkins'
+
     @Override
     String getPluginName() {
-        return 'jenkins'
+        return PLUGINID
     }
 
     def setup() {
@@ -122,7 +124,7 @@ class JenkinsPluginTest extends PluginProjectSpec {
 
     def "checkAllServerValues checks only selected servers" () {
         setup:
-        def JenkinsPlugin plugin = project.plugins.findPlugin('jenkins')
+        def JenkinsPlugin plugin = project.plugins.findPlugin(PLUGINID)
         def mockConsole = Mock(MockConsoleInterface)
         def testFactory = new DefaultConsoleFactory() {
             def Object getConsole() {
@@ -155,7 +157,7 @@ class JenkinsPluginTest extends PluginProjectSpec {
 
     def "checkAllServerValues handles only insecure servers" () {
         setup:
-        def JenkinsPlugin plugin = project.plugins.findPlugin('jenkins')
+        def JenkinsPlugin plugin = project.plugins.findPlugin(PLUGINID)
         def mockConsole = Mock(MockConsoleInterface)
         def testFactory = new DefaultConsoleFactory() {
             def Object getConsole() {
@@ -187,7 +189,7 @@ class JenkinsPluginTest extends PluginProjectSpec {
 
     def "checkAllServerValues handles task that does not need credentials" () {
         setup:
-        def JenkinsPlugin plugin = project.plugins.findPlugin('jenkins')
+        def JenkinsPlugin plugin = project.plugins.findPlugin(PLUGINID)
         def mockConsole = Mock(MockConsoleInterface)
         def testFactory = new DefaultConsoleFactory() {
             def Object getConsole() {
@@ -224,7 +226,7 @@ class JenkinsPluginTest extends PluginProjectSpec {
 
     def "checkAllServerValues checks all secure servers" () {
         setup:
-        def JenkinsPlugin plugin = project.plugins.findPlugin('jenkins')
+        def JenkinsPlugin plugin = project.plugins.findPlugin(PLUGINID)
         def mockConsole = Mock(MockConsoleInterface)
         def testFactory = new DefaultConsoleFactory() {
             def Object getConsole() {
@@ -281,7 +283,7 @@ class JenkinsPluginTest extends PluginProjectSpec {
 
     def "checkAllServerValues throws exception on missing username" () {
         setup:
-        def JenkinsPlugin plugin = project.plugins.findPlugin('jenkins')
+        def JenkinsPlugin plugin = project.plugins.findPlugin(PLUGINID)
         project.jenkins.servers {
             test1 {
                 url 'testUrl'
@@ -303,7 +305,7 @@ class JenkinsPluginTest extends PluginProjectSpec {
 
     def "checkAllServerValues throws exception on missing password" () {
         setup:
-        def JenkinsPlugin plugin = project.plugins.findPlugin('jenkins')
+        def JenkinsPlugin plugin = project.plugins.findPlugin(PLUGINID)
         project.jenkins.servers {
             test1 {
                 url 'testUrl'
@@ -325,7 +327,7 @@ class JenkinsPluginTest extends PluginProjectSpec {
 
     def "checkAllServerValues throws exception on missing url" () {
         setup:
-        def JenkinsPlugin plugin = project.plugins.findPlugin('jenkins')
+        def JenkinsPlugin plugin = project.plugins.findPlugin(PLUGINID)
         project.jenkins.servers {
             test1 {
                 username 'testuser'

diff --git a/...est/groovy/com/terrafolio/gradle/plugins/jenkins/test/dsl/JenkinsConfigurationTest.groovy b/...est/groovy/com/terrafolio/gradle/plugins/jenkins/test/dsl/JenkinsConfigurationTest.groovy
@@ -45,7 +45,7 @@ class JenkinsConfigurationTest extends ProjectSpec {
     """
 
     def setup() {
-        project.apply plugin: 'jenkins'
+        project.apply plugin: 'com.terrafolio.jenkins'
     }
 
     def "configure adds jenkins job" () {

diff --git a/...est/groovy/com/terrafolio/gradle/plugins/jenkins/test/dsl/JenkinsJobDefinitionTest.groovy b/...est/groovy/com/terrafolio/gradle/plugins/jenkins/test/dsl/JenkinsJobDefinitionTest.groovy
@@ -4,7 +4,7 @@ import nebula.test.ProjectSpec
 
 class JenkinsJobDefinitionTest extends ProjectSpec {
     def setup() {
-        project.apply plugin: 'jenkins'
+        project.apply plugin: 'com.terrafolio.jenkins'
     }
 
     def "configure sets name" () {

diff --git a/src/test/groovy/com/terrafolio/gradle/plugins/jenkins/test/dsl/JenkinsJobTest.groovy b/src/test/groovy/com/terrafolio/gradle/plugins/jenkins/test/dsl/JenkinsJobTest.groovy
@@ -8,7 +8,7 @@ import org.custommonkey.xmlunit.XMLUnit
 class JenkinsJobTest extends ProjectSpec {
 
     def setup() {
-        project.apply plugin: 'jenkins'
+        project.apply plugin: 'com.terrafolio.jenkins'
     }
 
     def "configure adds to definition"() {

diff --git a/src/test/groovy/com/terrafolio/gradle/plugins/jenkins/test/dsl/JenkinsViewTest.groovy b/src/test/groovy/com/terrafolio/gradle/plugins/jenkins/test/dsl/JenkinsViewTest.groovy
@@ -11,7 +11,7 @@ import org.custommonkey.xmlunit.XMLUnit
 class JenkinsViewTest extends ProjectSpec {
 
     def setup() {
-        project.apply plugin: 'jenkins'
+        project.apply plugin: 'com.terrafolio.jenkins'
     }
 
     def "configure with dsl closure generates correct xml" () {

diff --git a/...test/groovy/com/terrafolio/gradle/plugins/jenkins/test/tasks/JenkinsPluginTaskSpec.groovy b/...test/groovy/com/terrafolio/gradle/plugins/jenkins/test/tasks/JenkinsPluginTaskSpec.groovy
@@ -34,7 +34,7 @@ abstract class JenkinsPluginTaskSpec extends ProjectSpec {
     """
 
     def setup() {
-        project.apply plugin: 'jenkins'
+        project.apply plugin: 'com.terrafolio.jenkins'
 
         project.ext.branches = [
                 master: [parents: []],