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 2021/04/17 15:48:29 UTC
[isis] branch ISIS-2616 created (now 145eb75)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-2616
in repository https://gitbox.apache.org/repos/asf/isis.git.
at 145eb75 ISIS-2616: improves choices for fixutre scripts
This branch includes the following new commits:
new 145eb75 ISIS-2616: improves choices for fixutre scripts
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[isis] 01/01: ISIS-2616: improves choices for fixutre scripts
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2616
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 145eb7502e0cdac08fb6eb4986cea68ca9e3b925
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Apr 17 16:48:06 2021 +0100
ISIS-2616: improves choices for fixutre scripts
---
.../applib/fixturescripts/FixtureScripts.java | 24 +++++++++++++---------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
index 70c440a..273fe47 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
@@ -282,6 +282,10 @@ public class FixtureScripts {
public String default0RunFixtureScript() {
+ final Set<String> choices = choices0RunFixtureScript();
+ if(choices.size() == 1) {
+ return choices.iterator().next();
+ }
Class<? extends FixtureScript> defaultScript = getSpecification().getRunScriptDefaultScriptClass();
if(defaultScript == null) {
return null;
@@ -343,26 +347,26 @@ public class FixtureScripts {
@Programmatic
public void run(final FixtureScript... fixtureScriptList) {
-
+
val singleScript = toSingleScript(fixtureScriptList);
String parameters = null;
-
+
isisInteractionFactory.runAnonymous(()->{
transactionService.runWithinCurrentTransactionElseCreateNew(()->{
runScript(singleScript, parameters);
- });
+ });
});
-
+
}
@SafeVarargs
@Programmatic
public final void runPersonas(PersonaWithBuilderScript<? extends BuilderScriptAbstract<?>> ... personaScripts) {
for (val personaWithBuilderScript : personaScripts) {
-
+
val script = _Casts.<PersonaWithBuilderScript<BuilderScriptAbstract<Object>>>
uncheckedCast(personaWithBuilderScript);
-
+
runPersona(script);
}
}
@@ -380,7 +384,7 @@ public class FixtureScripts {
*/
@Programmatic
public <T> T runBuilder(final BuilderScriptAbstract<T> builderScript) {
-
+
return isisInteractionFactory.callAnonymous(()->
transactionService.callWithinCurrentTransactionElseCreateNew(()->
runBuilderScriptNonTransactional(builderScript)
@@ -502,7 +506,7 @@ public class FixtureScripts {
}
// -- DEPRECATIONS
-
+
/**
* @deprecated renamed to {@link #runPersona(PersonaWithBuilderScript)}
*/
@@ -510,7 +514,7 @@ public class FixtureScripts {
public <T> T fixtureScript(final PersonaWithBuilderScript<BuilderScriptAbstract<T>> persona) {
return runPersona(persona);
}
-
+
/**
* @deprecated renamed to {@link #run(FixtureScript...)}
*/
@@ -530,4 +534,4 @@ public class FixtureScripts {
-}
\ No newline at end of file
+}