You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/08/20 13:26:02 UTC
[isis] 05/05: ISIS-2100: makes
IsisIntegrationTestAbstractWithFixtures helper methods
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2-antora
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f1351e22cd6da3b782213760eae7f52049bde875
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Aug 8 17:31:45 2019 +0200
ISIS-2100: makes IsisIntegrationTestAbstractWithFixtures helper methods
... consistent with FixtureScripts methods
---
.../simple/integtests/tests/SimpleObject_IntegTest.java | 2 +-
.../simple/integtests/tests/SimpleObjects_IntegTest.java | 4 ++--
.../fixtures/IsisIntegrationTestAbstractWithFixtures.java | 8 ++++----
.../extensions/fixtures/fixturescripts/FixtureScripts.java | 14 ++++++++++----
4 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/examples/apps/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java b/examples/apps/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
index 50fb5f3..7901c41 100644
--- a/examples/apps/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
+++ b/examples/apps/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
@@ -49,7 +49,7 @@ public class SimpleObject_IntegTest extends SimpleModuleIntegTestAbstract {
@BeforeEach
public void setUp() {
// given
- simpleObject = fixtureScripts.runBuilderScript(SimpleObject_persona.FOO.builder());
+ simpleObject = fixtureScripts.runPersona(SimpleObject_persona.FOO);
}
public static class Name extends SimpleObject_IntegTest {
diff --git a/examples/apps/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java b/examples/apps/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
index 2a30537..c64b414 100644
--- a/examples/apps/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
+++ b/examples/apps/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
@@ -49,7 +49,7 @@ public class SimpleObjects_IntegTest extends SimpleModuleIntegTestAbstract {
public void happyCase() {
// given
- fixtureScripts.runFixtureScript(new SimpleObject_persona.PersistAll());
+ fixtureScripts.run(new SimpleObject_persona.PersistAll());
transactionService.flushTransaction();
// when
@@ -86,7 +86,7 @@ public class SimpleObjects_IntegTest extends SimpleModuleIntegTestAbstract {
public void whenAlreadyExists() {
// given
- fixtureScripts.runBuilderScript(SimpleObject_persona.FIZZ.builder());
+ fixtureScripts.runPersona(SimpleObject_persona.FIZZ);
transactionService.flushTransaction();
// expect
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisIntegrationTestAbstractWithFixtures.java b/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisIntegrationTestAbstractWithFixtures.java
index 89a9f0a..740e18f 100644
--- a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisIntegrationTestAbstractWithFixtures.java
+++ b/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisIntegrationTestAbstractWithFixtures.java
@@ -34,19 +34,19 @@ import org.apache.isis.integtestsupport.IsisIntegrationTestAbstact;
public abstract class IsisIntegrationTestAbstractWithFixtures extends IsisIntegrationTestAbstact {
- protected void runFixtureScript(final FixtureScript... fixtureScriptList) {
+ protected void run(final FixtureScript... fixtureScriptList) {
this.fixtureScripts.run(fixtureScriptList);
}
- protected <T> T runBuilderScript(final BuilderScriptAbstract<T> fixtureScript) {
+ protected <T> T runBuilder(final BuilderScriptAbstract<T> fixtureScript) {
return this.fixtureScripts.runBuilderScript(fixtureScript);
}
- protected <T> void runPersonaScripts(final PersonaWithBuilderScript<? extends BuilderScriptAbstract<T>>... personaScripts) {
+ protected <T> void runPersonas(final PersonaWithBuilderScript<? extends BuilderScriptAbstract<T>>... personaScripts) {
this.fixtureScripts.runPersonas(personaScripts);
}
- protected <T> T runPersonaScript(final PersonaWithBuilderScript<? extends BuilderScriptAbstract<T>> personaScript) {
+ protected <T> T runPersona(final PersonaWithBuilderScript<? extends BuilderScriptAbstract<T>> personaScript) {
return this.fixtureScripts.runPersona(personaScript);
}
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java b/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java
index 677c376..a098f74 100644
--- a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java
+++ b/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java
@@ -380,13 +380,12 @@ public abstract class FixtureScripts extends AbstractService {
* @return
*/
@Programmatic
- public <T> T runBuilderScript(final BuilderScriptAbstract<T> builderScript) {
-
+ public <T> T runBuilder(final BuilderScriptAbstract<T> builderScript) {
return transactionService.executeWithinTransaction(()->{
return runBuilderScriptNonTransactional(builderScript);
});
}
-
+
/**
* Runs the builderScript without its own transactional boundary.<br>
* The caller is responsible to provide a transactional context/boundary.
@@ -542,6 +541,13 @@ public abstract class FixtureScripts extends AbstractService {
public void runFixtureScript(final FixtureScript... fixtureScriptList) {
run(fixtureScriptList);
}
-
+
+ /**
+ * @deprecated renamed to {@link #runBuilder(BuilderScriptAbstract)}
+ */
+ @Programmatic
+ public <T> T runBuilderScript(final BuilderScriptAbstract<T> builderScript) {
+ return runBuilder(builderScript);
+ }
}
\ No newline at end of file