diff --git a/build.gradle b/build.gradle index 50347d9..db2699b 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ apply plugin: 'java-test-fixtures' group = 'io.provs' -version = '0.8.7-SNAPSHOT' +version = '0.8.8-SNAPSHOT' repositories { mavenCentral() diff --git a/src/test/kotlin/io/provs/ContainerProcessorTest.kt b/src/test/kotlin/io/provs/ContainerProcessorTest.kt index ee45f1f..50c40b0 100644 --- a/src/test/kotlin/io/provs/ContainerProcessorTest.kt +++ b/src/test/kotlin/io/provs/ContainerProcessorTest.kt @@ -1,5 +1,6 @@ package io.provs +import io.provs.test.defaultTestContainer import io.provs.test.tags.CONTAINERTEST import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Tag diff --git a/src/test/kotlin/io/provs/UtilsTest.kt b/src/test/kotlin/io/provs/UtilsTest.kt index 0ced15b..0d4cfa5 100644 --- a/src/test/kotlin/io/provs/UtilsTest.kt +++ b/src/test/kotlin/io/provs/UtilsTest.kt @@ -1,5 +1,6 @@ package io.provs +import io.provs.test.defaultTestContainer import io.provs.test.tags.CONTAINERTEST import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Tag diff --git a/src/test/kotlin/io/provs/processors/ContainerUbuntuHostProcessorTest.kt b/src/test/kotlin/io/provs/processors/ContainerUbuntuHostProcessorTest.kt index dc9a4d0..fc159a6 100644 --- a/src/test/kotlin/io/provs/processors/ContainerUbuntuHostProcessorTest.kt +++ b/src/test/kotlin/io/provs/processors/ContainerUbuntuHostProcessorTest.kt @@ -1,8 +1,8 @@ package io.provs.processors -import io.provs.DEFAULT_START_MODE_TEST_CONTAINER +import io.provs.test.DEFAULT_START_MODE_TEST_CONTAINER import io.provs.platforms.SHELL -import io.provs.testDockerWithSudo +import io.provs.test.testDockerWithSudo import io.provs.test.tags.CONTAINERTEST import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test diff --git a/src/testFixtures/kotlin/io/provs/test/TestSetup.kt b/src/testFixtures/kotlin/io/provs/test/TestSetup.kt index 6a46684..29edab0 100644 --- a/src/testFixtures/kotlin/io/provs/test/TestSetup.kt +++ b/src/testFixtures/kotlin/io/provs/test/TestSetup.kt @@ -1,20 +1,22 @@ -package io.provs +package io.provs.test +import io.provs.Prov import io.provs.processors.ContainerStartMode import io.provs.processors.ContainerUbuntuHostProcessor val DEFAULT_START_MODE_TEST_CONTAINER = ContainerStartMode.USE_RUNNING_ELSE_CREATE -val testDockerWithSudo = !"true".equals(System.getProperty("testdockerwithoutsudo")?.toLowerCase()) +val testDockerWithSudo = "true" != System.getProperty("testdockerwithoutsudo")?.toLowerCase() const val defaultTestContainerName = "provs_test" -fun defaultTestContainer(): Prov { +fun defaultTestContainer(imageName: String = "ubuntu"): Prov { return Prov.newInstance( ContainerUbuntuHostProcessor( defaultTestContainerName, startMode = DEFAULT_START_MODE_TEST_CONTAINER, - sudo = testDockerWithSudo + sudo = testDockerWithSudo, + dockerImage = imageName ) ) }