refactor to execute multiples test classes

rundeck-plugins · Apr 1, 2024 · c86b7ad · c86b7ad
1 parent f6da910
commit c86b7ad
Show file tree

Hide file tree

Showing 7 changed files with 224 additions and 226 deletions.
diff --git a/functional-test/src/test/groovy/functional/BasicIntegrationSpec.groovy b/functional-test/src/test/groovy/functional/BasicIntegrationSpec.groovy
@@ -1,23 +1,19 @@
 package functional
 
+import functional.base.BaseTestConfiguration
 import functional.util.TestUtil
 import org.rundeck.client.api.model.JobRun
-import spock.lang.Shared
 import org.testcontainers.spock.Testcontainers
 
 
 @Testcontainers
-class BasicIntegrationSpec extends TestConfiguration {
-
-    @Shared
-    public static RundeckCompose rundeckEnvironment = new RundeckCompose(new File("src/test/resources/docker/docker-compose.yml").toURI())
-
+class BasicIntegrationSpec extends BaseTestConfiguration {
 
     static String PROJ_NAME = 'ansible-test'
 
     def setupSpec() {
-        rundeckEnvironment.startCompose()
-        client = rundeckEnvironment.configureRundeck(PROJ_NAME)
+        startCompose()
+        configureRundeck(PROJ_NAME)
     }
 
     def "test simple inline playbook"(){

diff --git a/functional-test/src/test/groovy/functional/PluginGroupIntegrationSpec.groovy b/functional-test/src/test/groovy/functional/PluginGroupIntegrationSpec.groovy
@@ -1,27 +1,19 @@
 package functional
 
+import functional.base.BaseTestConfiguration
 import functional.util.TestUtil
-import org.rundeck.client.api.RundeckApi
 import org.rundeck.client.api.model.JobRun
-import org.rundeck.client.util.Client
 import org.testcontainers.spock.Testcontainers
-import spock.lang.Shared
 
 
 @Testcontainers
-class PluginGroupIntegrationSpec extends TestConfiguration {
-
-    @Shared
-    public static RundeckCompose rundeckEnvironment = new RundeckCompose(new File("src/test/resources/docker/docker-compose.yml").toURI())
-
-    @Shared
-    Client<RundeckApi> client
+class PluginGroupIntegrationSpec extends BaseTestConfiguration {
 
     static String PROJ_NAME = 'ansible-plugin-group-test'
 
     def setupSpec() {
-        rundeckEnvironment.startCompose()
-        client = rundeckEnvironment.configureRundeck(PROJ_NAME)
+        startCompose()
+        configureRundeck(PROJ_NAME)
     }
 
     def "test simple inline playbook"(){

diff --git a/functional-test/src/test/groovy/functional/RundeckCompose.groovy b/functional-test/src/test/groovy/functional/RundeckCompose.groovy
diff --git a/functional-test/src/test/groovy/functional/TestConfiguration.groovy b/functional-test/src/test/groovy/functional/TestConfiguration.groovy