This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch attempting-to-bring-in-bdd-specs in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 796608c05986ec71271bd3c31fa8eefda3b16a51 Author: Dan Haywood <[email protected]> AuthorDate: Tue Aug 30 22:30:12 2022 +0100 still don't have bdd features being found... --- .../domainapp/webapp/bdd/{stepdefs => specs}/BddStepDefsModule.java | 2 +- .../bdd/{stepdefs/infrastructure => specs}/BootstrapStepDef.java | 4 +--- .../src/test/java/domainapp/webapp/bdd/specs/CucumberSpec.java | 1 - .../java/domainapp/webapp/bdd/{ => specs}/CucumberTestAbstract.java | 2 +- .../webapp/bdd/{stepdefs/fixtures => specs}/DomainAppDemoStepDef.java | 2 +- .../webapp/bdd/{stepdefs/domain => specs}/SimpleObjectsContext.java | 2 +- .../bdd/{stepdefs/domain => specs}/SimpleObjectsGivenThenStepDef.java | 3 +-- .../bdd/{stepdefs/domain => specs}/SimpleObjectsWhenStepDef.java | 3 +-- .../bdd/{stepdefs/infrastructure => specs}/TransactionalStepDef.java | 2 +- .../java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java | 2 +- webapp-tests/src/test/resources/junit-platform.properties | 2 +- 11 files changed, 10 insertions(+), 15 deletions(-) diff --git a/webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/BddStepDefsModule.java b/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/BddStepDefsModule.java similarity index 88% rename from webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/BddStepDefsModule.java rename to webapp-tests/src/test/java/domainapp/webapp/bdd/specs/BddStepDefsModule.java index ae49680..1925e7c 100644 --- a/webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/BddStepDefsModule.java +++ b/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/BddStepDefsModule.java @@ -1,4 +1,4 @@ -package domainapp.webapp.bdd.stepdefs; +package domainapp.webapp.bdd.specs; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/infrastructure/BootstrapStepDef.java b/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/BootstrapStepDef.java similarity index 69% rename from webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/infrastructure/BootstrapStepDef.java rename to webapp-tests/src/test/java/domainapp/webapp/bdd/specs/BootstrapStepDef.java index cb62838..d163021 100644 --- a/webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/infrastructure/BootstrapStepDef.java +++ b/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/BootstrapStepDef.java @@ -1,9 +1,7 @@ -package domainapp.webapp.bdd.stepdefs.infrastructure; +package domainapp.webapp.bdd.specs; import org.apache.isis.applib.annotation.PriorityPrecedence; -import domainapp.webapp.bdd.CucumberTestAbstract; - public class BootstrapStepDef extends CucumberTestAbstract { @io.cucumber.java.Before(order= PriorityPrecedence.FIRST) diff --git a/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/CucumberSpec.java b/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/CucumberSpec.java index 1198cb1..c315fef 100644 --- a/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/CucumberSpec.java +++ b/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/CucumberSpec.java @@ -31,7 +31,6 @@ import static io.cucumber.junit.platform.engine.Constants.GLUE_PROPERTY_NAME; @Suite @IncludeEngines("cucumber") @SelectClasspathResource("domainapp/webapp/bdd/specs") -//@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "domainapp.webapp.bdd.stepdefs") public class CucumberSpec { } diff --git a/webapp-tests/src/test/java/domainapp/webapp/bdd/CucumberTestAbstract.java b/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/CucumberTestAbstract.java similarity index 97% rename from webapp-tests/src/test/java/domainapp/webapp/bdd/CucumberTestAbstract.java rename to webapp-tests/src/test/java/domainapp/webapp/bdd/specs/CucumberTestAbstract.java index 43c9e50..d19ba11 100644 --- a/webapp-tests/src/test/java/domainapp/webapp/bdd/CucumberTestAbstract.java +++ b/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/CucumberTestAbstract.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package domainapp.webapp.bdd; +package domainapp.webapp.bdd.specs; import domainapp.webapp.integtests.WebAppIntegTestAbstract; import io.cucumber.spring.CucumberContextConfiguration; diff --git a/webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/fixtures/DomainAppDemoStepDef.java b/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/DomainAppDemoStepDef.java similarity index 91% rename from webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/fixtures/DomainAppDemoStepDef.java rename to webapp-tests/src/test/java/domainapp/webapp/bdd/specs/DomainAppDemoStepDef.java index 6f1953a..7c9dd0d 100644 --- a/webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/fixtures/DomainAppDemoStepDef.java +++ b/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/DomainAppDemoStepDef.java @@ -1,4 +1,4 @@ -package domainapp.webapp.bdd.stepdefs.fixtures; +package domainapp.webapp.bdd.specs; import javax.inject.Inject; diff --git a/webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/domain/SimpleObjectsContext.java b/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/SimpleObjectsContext.java similarity index 89% rename from webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/domain/SimpleObjectsContext.java rename to webapp-tests/src/test/java/domainapp/webapp/bdd/specs/SimpleObjectsContext.java index 707bc2d..b5cf9fa 100644 --- a/webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/domain/SimpleObjectsContext.java +++ b/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/SimpleObjectsContext.java @@ -1,4 +1,4 @@ -package domainapp.webapp.bdd.stepdefs.domain; +package domainapp.webapp.bdd.specs; import org.springframework.stereotype.Service; diff --git a/webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/domain/SimpleObjectsGivenThenStepDef.java b/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/SimpleObjectsGivenThenStepDef.java similarity index 94% rename from webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/domain/SimpleObjectsGivenThenStepDef.java rename to webapp-tests/src/test/java/domainapp/webapp/bdd/specs/SimpleObjectsGivenThenStepDef.java index 77f3b10..b174784 100644 --- a/webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/domain/SimpleObjectsGivenThenStepDef.java +++ b/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/SimpleObjectsGivenThenStepDef.java @@ -1,4 +1,4 @@ -package domainapp.webapp.bdd.stepdefs.domain; +package domainapp.webapp.bdd.specs; import java.util.List; @@ -13,7 +13,6 @@ import lombok.val; import domainapp.modules.simple.dom.so.SimpleObject; import domainapp.modules.simple.dom.so.SimpleObjects; -import domainapp.webapp.bdd.CucumberTestAbstract; import io.cucumber.java.en.Given; import io.cucumber.java.en.Then; diff --git a/webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/domain/SimpleObjectsWhenStepDef.java b/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/SimpleObjectsWhenStepDef.java similarity index 91% rename from webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/domain/SimpleObjectsWhenStepDef.java rename to webapp-tests/src/test/java/domainapp/webapp/bdd/specs/SimpleObjectsWhenStepDef.java index ab7efb4..f9864cd 100644 --- a/webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/domain/SimpleObjectsWhenStepDef.java +++ b/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/SimpleObjectsWhenStepDef.java @@ -1,4 +1,4 @@ -package domainapp.webapp.bdd.stepdefs.domain; +package domainapp.webapp.bdd.specs; import java.util.UUID; @@ -9,7 +9,6 @@ import static org.junit.jupiter.api.Assertions.fail; import org.apache.isis.applib.services.wrapper.InvalidException; import domainapp.modules.simple.dom.so.SimpleObjects; -import domainapp.webapp.bdd.CucumberTestAbstract; import io.cucumber.java.en.When; public class SimpleObjectsWhenStepDef extends CucumberTestAbstract { diff --git a/webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/infrastructure/TransactionalStepDef.java b/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/TransactionalStepDef.java similarity index 96% rename from webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/infrastructure/TransactionalStepDef.java rename to webapp-tests/src/test/java/domainapp/webapp/bdd/specs/TransactionalStepDef.java index b14eae3..3626c47 100644 --- a/webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/infrastructure/TransactionalStepDef.java +++ b/webapp-tests/src/test/java/domainapp/webapp/bdd/specs/TransactionalStepDef.java @@ -1,4 +1,4 @@ -package domainapp.webapp.bdd.stepdefs.infrastructure; +package domainapp.webapp.bdd.specs; import javax.inject.Inject; diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java index 5bd91c0..037ebab 100644 --- a/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java +++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java @@ -18,7 +18,7 @@ import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstra import domainapp.modules.simple.SimpleModule; import domainapp.webapp.application.ApplicationModule; -import domainapp.webapp.bdd.stepdefs.BddStepDefsModule; +import domainapp.webapp.bdd.specs.BddStepDefsModule; @SpringBootTest( classes = { diff --git a/webapp-tests/src/test/resources/junit-platform.properties b/webapp-tests/src/test/resources/junit-platform.properties index 17785d9..d4347d9 100644 --- a/webapp-tests/src/test/resources/junit-platform.properties +++ b/webapp-tests/src/test/resources/junit-platform.properties @@ -2,7 +2,7 @@ cucumber.publish.quiet=true cucumber.filter.tags=not @backlog and not @ignore -#cucumber.glue=domainapp.webapp.bdd.stepdefs +cucumber.glue=domainapp.webapp.bdd.specs #we are using built-in reporting plugins cucumber.plugin=pretty, html:target/cucumber-reports/cucumber-report.html
