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 2014/05/23 20:18:36 UTC
[2/2] git commit: ISIS-776: FixtureScripts#findFixtureScriptFor
ISIS-776: FixtureScripts#findFixtureScriptFor
... moved up from todo app, also overloaded to search by fixture class name (instead of its qualifed name)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bf63ac19
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bf63ac19
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bf63ac19
Branch: refs/heads/master
Commit: bf63ac195ec81a8217611f4ee93687e750775d56
Parents: d5cf401
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri May 23 19:18:28 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri May 23 19:18:28 2014 +0100
----------------------------------------------------------------------
.../applib/fixturescripts/FixtureResult.java | 2 ++
.../applib/fixturescripts/FixtureScripts.java | 19 +++++++++++++++++++
.../fixture/todo/ToDoItemsFixturesService.java | 16 +++-------------
3 files changed, 24 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/bf63ac19/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResult.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResult.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResult.java
index 095327f..647a114 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResult.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResult.java
@@ -20,8 +20,10 @@ package org.apache.isis.applib.fixturescripts;
import org.apache.isis.applib.AbstractViewModel;
import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.Paged;
import org.apache.isis.applib.annotation.Title;
+@Paged(500)
public class FixtureResult extends AbstractViewModel {
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/bf63ac19/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java
index fd00004..acb4d7c 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java
@@ -182,6 +182,25 @@ public abstract class FixtureScripts extends AbstractService {
return fixtureScript.validateRun(parameters);
}
+ protected FixtureScript findFixtureScriptFor(String qualifiedName) {
+ List<FixtureScript> fixtureScripts = fixtureScriptList;
+ for (FixtureScript fs : fixtureScripts) {
+ if(fs.getQualifiedName().contains(qualifiedName)) {
+ return fs;
+ }
+ }
+ return null;
+ }
+ protected FixtureScript findFixtureScriptFor(Class<? extends FixtureScript> fixtureScriptClass) {
+ List<FixtureScript> fixtureScripts = fixtureScriptList;
+ for (FixtureScript fs : fixtureScripts) {
+ if(fixtureScriptClass.isAssignableFrom(fs.getClass())) {
+ return fs;
+ }
+ }
+ return null;
+ }
+
// //////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/bf63ac19/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java
index 5b5722b..914eee8 100644
--- a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java
@@ -18,6 +18,8 @@
*/
package fixture.todo;
+import fixture.todo.scenarios.RecreateToDoItemsAndCompleteSeveralForCurrent;
+
import java.util.List;
import org.apache.isis.applib.annotation.MemberOrder;
@@ -49,18 +51,6 @@ public class ToDoItemsFixturesService extends FixtureScripts {
@Prototype
@MemberOrder(sequence="20")
public List<FixtureResult> recreateToDoItemsForCurrent() {
- return findFixtureScriptFor("recreate-current").run(null);
- }
- public String disableRecreateToDoItemsForCurrent() {
- return findFixtureScriptFor("recreate-current") == null? "Could not find fixture script 'recreate-current'": null;
- }
- private FixtureScript findFixtureScriptFor(String qualifiedName) {
- List<FixtureScript> fixtureScripts = choices0RunFixtureScript();
- for (FixtureScript fs : fixtureScripts) {
- if(fs.getQualifiedName().contains(qualifiedName)) {
- return fs;
- }
- }
- return null;
+ return findFixtureScriptFor(RecreateToDoItemsAndCompleteSeveralForCurrent.class).run(null);
}
}