diff --git a/acceptance-test/pom.xml b/acceptance-test/pom.xml index 8ae4424..5206f68 100644 --- a/acceptance-test/pom.xml +++ b/acceptance-test/pom.xml @@ -31,36 +31,18 @@ cucumber-java8 ${cucumber.version} test - - - apiguardian-api - org.apiguardian - - io.cucumber - cucumber-junit + cucumber-junit-platform-engine ${cucumber.version} test - - - apiguardian-api - org.apiguardian - - io.cucumber cucumber-spring ${cucumber.version} test - - - apiguardian-api - org.apiguardian - - diff --git a/acceptance-test/src/test/kotlin/packagename/AcceptanceTest.kt b/acceptance-test/src/test/kotlin/packagename/AcceptanceTest.kt index c73d4e3..7b64872 100644 --- a/acceptance-test/src/test/kotlin/packagename/AcceptanceTest.kt +++ b/acceptance-test/src/test/kotlin/packagename/AcceptanceTest.kt @@ -4,8 +4,6 @@ import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatThrownBy import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith -import org.junit.platform.runner.JUnitPlatform -import org.junit.runner.RunWith import org.mockito.Mock import org.mockito.Mockito import org.mockito.junit.jupiter.MockitoExtension @@ -16,7 +14,6 @@ import packagename.domain.port.ObtainExample import java.util.* @ExtendWith(MockitoExtension::class) -@RunWith(JUnitPlatform::class) class AcceptanceTest { @Test diff --git a/acceptance-test/src/test/kotlin/packagename/cucumber/ExampleStepDef.kt b/acceptance-test/src/test/kotlin/packagename/cucumber/ExampleStepDef.kt index caeec1e..2ca3cc7 100644 --- a/acceptance-test/src/test/kotlin/packagename/cucumber/ExampleStepDef.kt +++ b/acceptance-test/src/test/kotlin/packagename/cucumber/ExampleStepDef.kt @@ -38,8 +38,9 @@ class ExampleStepDef(restTemplate: TestRestTemplate, exampleDao: ExampleDao) : E init { - DataTableType { row: Map -> Example(row["code"].toString().toLong(), row["description"].toString()) } - DataTableType { row: Map -> ExampleEntity(code = row["code"].toString().toLong(), description = row["description"].toString()) } +// DataTableType { row: Map -> Example(row["code"].toString().toLong(), row["description"].toString()) } +// DataTableType { row: Map -> ExampleEntity(code = row["code"].toString().toLong(), description = row["description"].toString()) } + Before { _ -> exampleDao.deleteAll() } After { _ -> exampleDao.deleteAll() } diff --git a/acceptance-test/src/test/kotlin/packagename/cucumber/RunCucumberExampleTest.kt b/acceptance-test/src/test/kotlin/packagename/cucumber/RunCucumberExampleTest.kt index 56f90b0..fd4ec49 100644 --- a/acceptance-test/src/test/kotlin/packagename/cucumber/RunCucumberExampleTest.kt +++ b/acceptance-test/src/test/kotlin/packagename/cucumber/RunCucumberExampleTest.kt @@ -1,13 +1,16 @@ package packagename.cucumber -import io.cucumber.junit.Cucumber -import io.cucumber.junit.CucumberOptions -import org.junit.runner.RunWith +import io.cucumber.junit.platform.engine.Constants.* +import org.junit.platform.suite.api.* -@RunWith(Cucumber::class) -@CucumberOptions(features = ["classpath:features/example.feature"], - strict = true, - plugin = ["json:target/cucumber/example.json", "json:target/cucumber/example.xml"], - tags = "@Example", - glue = ["classpath:packagename.cucumber"]) +@Suite +@IncludeEngines("cucumber") +@SelectClasspathResource("features") +@ConfigurationParameters( + ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "packagename.cucumber"), // this is the part where the stepdef file is + ConfigurationParameter(key = FILTER_TAGS_PROPERTY_NAME, value = "@Example"), + ConfigurationParameter(key = JUNIT_PLATFORM_NAMING_STRATEGY_PROPERTY_NAME, value = "long"), + ConfigurationParameter(key = PLUGIN_PUBLISH_QUIET_PROPERTY_NAME, value = "true"), + ConfigurationParameter(key = PLUGIN_PROPERTY_NAME, value = "json:target/cucumber/cucumber.json") +) class RunCucumberExampleTest diff --git a/pom.xml b/pom.xml index 5aa9e33..0ad81a0 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,9 @@ 1.5.31 ${java.version} ${java.version} - 2.5.5 - 6.11.0 + 5.8.1 + 2.5.6 + 7.0.0 1.5.11 1.1.1 @@ -81,6 +82,13 @@ ${project.version} + + org.junit + junit-bom + ${junit-jupiter.version} + pom + import + org.springframework.boot spring-boot-dependencies @@ -111,27 +119,12 @@ org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.platform - junit-platform-engine - test - - - org.junit.vintage - junit-vintage-engine - test - - - org.junit.platform - junit-platform-launcher + junit-jupiter test org.junit.platform - junit-platform-runner + junit-platform-suite test