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/12 23:49:42 UTC
[1/2] ISIS-776: allow fixture scripts take a param;
refactoring todo app's fixtures
Repository: isis
Updated Branches:
refs/heads/master 5f15fa74c -> ed5254864
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_notes.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_notes.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_notes.java
index 3ad42aa..3b05564 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_notes.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_notes.java
@@ -30,7 +30,7 @@ import java.util.List;
import dom.todo.ToDoItem;
import dom.todo.ToDoItemSubscriptions;
import dom.todo.ToDoItems;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
import org.junit.After;
import org.junit.Before;
@@ -47,7 +47,7 @@ public class ToDoItemTest_notes extends ToDoIntegTest {
@Before
public void setUp() throws Exception {
// given
- scenarioExecution().install(new ToDoItemsFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
final List<ToDoItem> all = wrap(service(ToDoItems.class)).notYetComplete();
toDoItem = wrap(all.get(0));
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_ownedBy.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_ownedBy.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_ownedBy.java
index 034d7f7..ff976b7 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_ownedBy.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_ownedBy.java
@@ -27,7 +27,7 @@ import java.util.List;
import dom.todo.ToDoItem;
import dom.todo.ToDoItems;
import dom.todo.ToDoItem.Category;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
import org.junit.Before;
import org.junit.Test;
@@ -38,7 +38,7 @@ public class ToDoItemTest_ownedBy extends ToDoIntegTest {
@Before
public void setUp() throws Exception {
- scenarioExecution().install(new ToDoItemsFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
final List<ToDoItem> all = wrap(service(ToDoItems.class)).notYetComplete();
toDoItem = wrap(all.get(0));
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_subcategory.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_subcategory.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_subcategory.java
index c8142bf..b572041 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_subcategory.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_subcategory.java
@@ -26,7 +26,7 @@ import java.util.List;
import dom.todo.ToDoItem;
import dom.todo.ToDoItem.Subcategory;
import dom.todo.ToDoItems;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
import org.junit.Before;
import org.junit.Test;
@@ -37,7 +37,7 @@ public class ToDoItemTest_subcategory extends ToDoIntegTest {
@Before
public void setUp() throws Exception {
- scenarioExecution().install(new ToDoItemsFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
final List<ToDoItem> all = wrap(service(ToDoItems.class)).notYetComplete();
toDoItem = wrap(all.get(0));
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/repo/ToDoItemsTest_finders.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/repo/ToDoItemsTest_finders.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/repo/ToDoItemsTest_finders.java
index 08461d2..dcc9398 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/repo/ToDoItemsTest_finders.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/repo/ToDoItemsTest_finders.java
@@ -26,7 +26,7 @@ import java.util.List;
import dom.todo.ToDoItem;
import dom.todo.ToDoItems;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
import org.hamcrest.Matchers;
import org.junit.Before;
@@ -39,7 +39,7 @@ public class ToDoItemsTest_finders extends ToDoIntegTest {
@Before
public void setUp() throws Exception {
- scenarioExecution().install(new ToDoItemsFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
final List<ToDoItem> notYetCompleteItems = wrap(service(ToDoItems.class)).notYetComplete();
final List<ToDoItem> completedItems = wrap(service(ToDoItems.class)).complete();
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/smoke/ToDoItemTest_title.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/smoke/ToDoItemTest_title.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/smoke/ToDoItemTest_title.java
index 5d46249..932d7bf 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/smoke/ToDoItemTest_title.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/smoke/ToDoItemTest_title.java
@@ -27,7 +27,7 @@ import java.util.List;
import dom.todo.ToDoItem;
import dom.todo.ToDoItems;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
import org.joda.time.LocalDate;
import org.junit.Before;
@@ -44,7 +44,7 @@ public class ToDoItemTest_title extends ToDoIntegTest {
@Before
public void setUp() throws Exception {
- scenarioExecution().install(new ToDoItemsFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
final List<ToDoItem> all = wrap(service(ToDoItems.class)).notYetComplete();
toDoItem = wrap(all.get(0));
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE-no-fixtures.launch
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE-no-fixtures.launch b/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE-no-fixtures.launch
deleted file mode 100644
index bc280d9..0000000
--- a/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE-no-fixtures.launch
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/isis-core-webserver/src/main/java/org/apache/isis/WebServer.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
-<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--port 8080 --type SERVER_PROTOTYPE"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart_wicket_restful_jdo-webapp"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE.launch
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE.launch b/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE.launch
new file mode 100644
index 0000000..bc280d9
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE.launch
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/isis-core-webserver/src/main/java/org/apache/isis/WebServer.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
+<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--port 8080 --type SERVER_PROTOTYPE"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart_wicket_restful_jdo-webapp"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-SERVER-no-fixtures.launch
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-SERVER-no-fixtures.launch b/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-SERVER-no-fixtures.launch
deleted file mode 100644
index 721d7b7..0000000
--- a/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-SERVER-no-fixtures.launch
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/isis-core-webserver/src/main/java/org/apache/isis/WebServer.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
-<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--port 8080 --type SERVER"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart_wicket_restful_jdo-webapp"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-SERVER.launch
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-SERVER.launch b/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-SERVER.launch
new file mode 100644
index 0000000..721d7b7
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/ide/eclipse/launch/ToDoApp-SERVER.launch
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/isis-core-webserver/src/main/java/org/apache/isis/WebServer.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
+<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--port 8080 --type SERVER"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart_wicket_restful_jdo-webapp"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
index a542934..bdfb955 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -235,7 +235,7 @@ isis.services = \
# object stores, they are used only when the object store is first initialized.
#
#isis.fixtures.prefix=
-isis.fixtures=fixture.todo.ToDoItemsFixture
+isis.fixtures=fixture.todo.scenarios.ToDoItemsRecreateForSven
#
[2/2] git commit: ISIS-776: allow fixture scripts take a param;
refactoring todo app's fixtures
Posted by da...@apache.org.
ISIS-776: allow fixture scripts take a param; refactoring todo app's fixtures
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ed525486
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ed525486
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ed525486
Branch: refs/heads/master
Commit: ed5254864c5a56bdad05eaf9c6d0a9d8b7a248a1
Parents: 5f15fa7
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon May 12 22:46:50 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon May 12 22:46:50 2014 +0100
----------------------------------------------------------------------
.../fixturescripts/CompositeFixtureScript.java | 18 ++--
.../applib/fixturescripts/FixtureScript.java | 18 +++-
.../applib/fixturescripts/FixtureScripts.java | 25 ++++-
.../fixturescripts/SimpleFixtureScript.java | 2 +-
.../fixture/todo/ToDoItemsCompleteForUser.java | 92 ----------------
.../fixture/todo/ToDoItemsCreateForUser.java | 105 -------------------
.../fixture/todo/ToDoItemsDeleteForUser.java | 60 -----------
.../java/fixture/todo/ToDoItemsFixture.java | 38 -------
.../fixture/todo/ToDoItemsFixturesService.java | 17 +--
.../fixture/todo/ToDoItemsResetForUser.java | 76 --------------
.../integtests/ToDoItemsIntegTestFixture.java | 46 ++++++++
.../todo/scenarios/ToDoItemsDeleteFor.java | 47 +++++++++
.../todo/scenarios/ToDoItemsDeleteForSven.java | 34 ++++++
...emsRecreateAndCompleteSeveralForCurrent.java | 40 +++++++
.../todo/scenarios/ToDoItemsRecreateFor.java | 49 +++++++++
.../scenarios/ToDoItemsRecreateForDick.java | 36 +++++++
.../todo/scenarios/ToDoItemsRecreateForJoe.java | 36 +++++++
.../scenarios/ToDoItemsRecreateForSven.java | 37 +++++++
.../fixture/todo/simple/ToDoItemsComplete.java | 83 +++++++++++++++
.../fixture/todo/simple/ToDoItemsCreate.java | 97 +++++++++++++++++
.../fixture/todo/simple/ToDoItemsDelete.java | 62 +++++++++++
.../src/main/java/fixture/todo/simple/Util.java | 55 ++++++++++
.../integration/glue/CatalogOfFixturesGlue.java | 6 +-
...oDoItemContributionsTest_updateCategory.java | 4 +-
.../tests/actions/ToDoItemTest_completed.java | 4 +-
.../tests/actions/ToDoItemTest_duplicate.java | 4 +-
.../actions/ToDoItemTest_notYetCompleted.java | 4 +-
.../ToDoItemContributionsTest_similarTo.java | 4 +-
.../colls/ToDoItemTest_dependencies_add.java | 4 +-
.../colls/ToDoItemTest_dependencies_remove.java | 4 +-
.../ToDoItemTest_dependencies_addedEvent.java | 5 +-
.../ToDoItemContributionsTest_priority.java | 4 +-
.../tests/props/ToDoItemTest_attachment.java | 4 +-
.../tests/props/ToDoItemTest_category.java | 4 +-
.../tests/props/ToDoItemTest_cost.java | 4 +-
.../tests/props/ToDoItemTest_description.java | 4 +-
.../tests/props/ToDoItemTest_dueBy.java | 4 +-
.../tests/props/ToDoItemTest_notes.java | 4 +-
.../tests/props/ToDoItemTest_ownedBy.java | 4 +-
.../tests/props/ToDoItemTest_subcategory.java | 4 +-
.../tests/repo/ToDoItemsTest_finders.java | 4 +-
.../tests/smoke/ToDoItemTest_title.java | 4 +-
.../launch/ToDoApp-PROTOTYPE-no-fixtures.launch | 23 ----
.../ide/eclipse/launch/ToDoApp-PROTOTYPE.launch | 23 ++++
.../launch/ToDoApp-SERVER-no-fixtures.launch | 23 ----
.../ide/eclipse/launch/ToDoApp-SERVER.launch | 23 ++++
.../src/main/webapp/WEB-INF/isis.properties | 2 +-
47 files changed, 764 insertions(+), 486 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/CompositeFixtureScript.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/CompositeFixtureScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/CompositeFixtureScript.java
index aec034a..3d84150 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/CompositeFixtureScript.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/CompositeFixtureScript.java
@@ -34,20 +34,20 @@ public abstract class CompositeFixtureScript extends FixtureScript {
public CompositeFixtureScript(final String localName) {
this(localName, localName, defaultDiscoverability());
}
- public CompositeFixtureScript(String friendlyName, final String localName) {
+ public CompositeFixtureScript(final String friendlyName, final String localName) {
this(friendlyName, localName, defaultDiscoverability());
}
- public CompositeFixtureScript(final FixtureScript parent, String friendlyName, final String localName) {
+ public CompositeFixtureScript(final FixtureScript parent, final String friendlyName, final String localName) {
this(parent, friendlyName, localName, defaultDiscoverability());
}
- public CompositeFixtureScript(final String localName, Discoverability discoverability) {
+ public CompositeFixtureScript(final String localName, final Discoverability discoverability) {
super(localName, localName, discoverability);
}
- public CompositeFixtureScript(String friendlyName, final String localName, Discoverability discoverability) {
+ public CompositeFixtureScript(String friendlyName, final String localName, final Discoverability discoverability) {
super(friendlyName, localName, discoverability);
}
- public CompositeFixtureScript(final FixtureScript parent, String friendlyName, final String localName, Discoverability discoverability) {
+ public CompositeFixtureScript(final FixtureScript parent, final String friendlyName, final String localName, final Discoverability discoverability) {
super(parent, friendlyName, localName, discoverability);
}
@@ -57,14 +57,14 @@ public abstract class CompositeFixtureScript extends FixtureScript {
/**
* Adds a child {@link FixtureScript fixture script} (simply using its default name).
*/
- protected final void add(FixtureScript fixtureScript) {
+ protected final void add(final FixtureScript fixtureScript) {
add(null, fixtureScript);
}
/**
* Adds a child {@link FixtureScript fixture script}, overriding its default name with one more
* meaningful in the context of this fixture.
*/
- protected final void add(String localNameOverride, FixtureScript fixtureScript) {
+ protected final void add(final String localNameOverride, final FixtureScript fixtureScript) {
fixtureScript.setParentPath(pathWith(""));
if(localNameOverride != null) {
fixtureScript.setLocalName(localNameOverride);
@@ -80,10 +80,10 @@ public abstract class CompositeFixtureScript extends FixtureScript {
*/
protected abstract void addChildren();
- protected void doRun(FixtureResultList fixtureResults) {
+ protected void doRun(final String parameters, final FixtureResultList fixtureResults) {
addChildren();
for (final FixtureScript child : children) {
- child.doRun(fixtureResults);
+ child.doRun(parameters, fixtureResults);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
index befb5e8..5a4917b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
@@ -152,7 +152,7 @@ public abstract class FixtureScript
/**
* Whether this fixture script is {@link Discoverability discoverable} (in other words
- * whether it will be listed to be run in the {@link FixtureScripts#runFixtureScript(FixtureScript) run fixture script} action.
+ * whether it will be listed to be run in the {@link FixtureScripts#runFixtureScript(FixtureScript, String) run fixture script} action.
*
* <p>
* By default {@link CompositeFixtureScript}s are {@link Discoverability#DISCOVERABLE discoverable}, while
@@ -170,14 +170,22 @@ public abstract class FixtureScript
// //////////////////////////////////////
@Programmatic
- public final List<FixtureResult> run() {
+ public final List<FixtureResult> run(final String parameters) {
FixtureResultList fixtureResults = new FixtureResultList(fixtureScripts);
- doRun(fixtureResults);
+ doRun(parameters, fixtureResults);
return fixtureResults.getResults();
}
@Programmatic
- protected abstract void doRun(FixtureResultList fixtureResults);
+ protected abstract void doRun(final String parameters, final FixtureResultList fixtureResults);
+
+ /**
+ * Optional hook to validate parameters.
+ */
+ @Programmatic
+ public String validateRun(final String parameters) {
+ return null;
+ }
// //////////////////////////////////////
@@ -188,7 +196,7 @@ public abstract class FixtureScript
@Programmatic
public final void install() {
- run();
+ run(null);
}
// //////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/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 4dc983a..866aa1d 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
@@ -34,6 +34,11 @@ import org.reflections.util.ClasspathHelper;
import org.apache.isis.applib.AbstractService;
import org.apache.isis.applib.DomainObjectContainer;
+import org.apache.isis.applib.annotation.DescribedAs;
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.MultiLine;
+import org.apache.isis.applib.annotation.Named;
+import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.applib.annotation.Prototype;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
@@ -99,24 +104,34 @@ public abstract class FixtureScripts extends AbstractService {
// //////////////////////////////////////
@Prototype
- public List<FixtureResult> runFixtureScript(final FixtureScript fixtureScript) {
- return fixtureScript.run();
+ @MemberOrder(sequence="10")
+ public List<FixtureResult> runFixtureScript(
+ final FixtureScript fixtureScript,
+ @Named("Parameters")
+ @DescribedAs("Script-specific parameters (if any). The format depends on the script implementation (eg key=value, CSV, JSON, XML etc)")
+ @MultiLine(numberOfLines=10)
+ @Optional
+ final String parameters) {
+ return fixtureScript.run(parameters);
}
public List<FixtureScript> choices0RunFixtureScript() {
return fixtureScriptList;
}
- public String disableRunFixtureScript(final FixtureScript fixtureScript) {
+ public String disableRunFixtureScript(final FixtureScript fixtureScript, final String parameters) {
return fixtureScriptList.isEmpty()? "No fixture scripts found under package '" + packagePrefix + "'": null;
}
+ public String validateRunFixtureScript(final FixtureScript fixtureScript, final String parameters) {
+ return fixtureScript.validateRun(parameters);
+ }
// //////////////////////////////////////
- String mementoFor(FixtureScript fs) {
+ String mementoFor(final FixtureScript fs) {
return mementoService.create()
.set("path", fs.getParentPath())
.asString();
}
- void initOf(String mementoStr, FixtureScript fs) {
+ void initOf(final String mementoStr, final FixtureScript fs) {
Memento memento = mementoService.parse(mementoStr);
fs.setParentPath(memento.get("path", String.class));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/SimpleFixtureScript.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/SimpleFixtureScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/SimpleFixtureScript.java
index a9f4079..99ad065 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/SimpleFixtureScript.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/SimpleFixtureScript.java
@@ -51,6 +51,6 @@ public abstract class SimpleFixtureScript extends FixtureScript {
// //////////////////////////////////////
@Programmatic
- protected abstract void doRun(FixtureResultList fixtureResults);
+ protected abstract void doRun(String parameters, FixtureResultList fixtureResults);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsCompleteForUser.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsCompleteForUser.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsCompleteForUser.java
deleted file mode 100644
index b425fa6..0000000
--- a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsCompleteForUser.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package fixture.todo;
-
-import java.util.Collection;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Collections2;
-
-import dom.todo.ToDoItem;
-import dom.todo.ToDoItems;
-
-import org.apache.isis.applib.fixturescripts.FixtureResultList;
-import org.apache.isis.applib.fixturescripts.SimpleFixtureScript;
-
-public class ToDoItemsCompleteForUser extends SimpleFixtureScript {
-
- // //////////////////////////////////////
- // Constructor
- // //////////////////////////////////////
-
- private final String user;
-
- public ToDoItemsCompleteForUser(String user) {
- super(friendlyNameFor(user), localNameFor(user));
- this.user = user;
- }
-
- static String localNameFor(String user) {
- return user != null? user: "current";
- }
-
- static String friendlyNameFor(String user) {
- return "Complete selected ToDoItems for " + (user != null ? "'" + user + "'" : "current user");
- }
-
- @Override
- protected void doRun(final FixtureResultList resultList) {
- final String ownedBy = user != null? user: getContainer().getUser().getName();
- installFor(ownedBy, resultList);
- getContainer().flush();
- }
-
- private void installFor(final String user, final FixtureResultList resultList) {
- complete(user, "Buy stamps", resultList);
- complete(user, "Write blog post", resultList);
-
- getContainer().flush();
- }
-
- private void complete(final String user, String description, final FixtureResultList resultList) {
- final ToDoItem toDoItem = findToDoItem(description, user);
- toDoItem.setComplete(true);
- resultList.add(this, toDoItem);
- }
-
- private ToDoItem findToDoItem(final String description, final String user) {
- final Collection<ToDoItem> filtered = Collections2.filter(toDoItems.allToDos(), new Predicate<ToDoItem>() {
- @Override
- public boolean apply(ToDoItem input) {
- return Objects.equal(description, input.getDescription()) &&
- Objects.equal(user, input.getOwnedBy());
- }
- });
- return filtered.isEmpty()? null: filtered.iterator().next();
- }
-
-
- // //////////////////////////////////////
- // Injected services
- // //////////////////////////////////////
-
- @javax.inject.Inject
- private ToDoItems toDoItems;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsCreateForUser.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsCreateForUser.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsCreateForUser.java
deleted file mode 100644
index 9f81af1..0000000
--- a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsCreateForUser.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package fixture.todo;
-
-import java.math.BigDecimal;
-
-import dom.todo.ToDoItem;
-import dom.todo.ToDoItem.Category;
-import dom.todo.ToDoItem.Subcategory;
-import dom.todo.ToDoItems;
-
-import org.joda.time.LocalDate;
-
-import org.apache.isis.applib.clock.Clock;
-import org.apache.isis.applib.fixturescripts.FixtureResultList;
-import org.apache.isis.applib.fixturescripts.SimpleFixtureScript;
-
-public class ToDoItemsCreateForUser extends SimpleFixtureScript {
-
- // //////////////////////////////////////
- // Constructor
- // //////////////////////////////////////
-
- private final String user;
-
- public ToDoItemsCreateForUser(String user) {
- super(friendlyNameFor(user), localNameFor(user));
- this.user = user;
- }
-
- static String localNameFor(String user) {
- return user != null? user: "current";
- }
-
- static String friendlyNameFor(String user) {
- return "Create ToDoItems for " + (user != null ? "'" + user + "'" : "current user");
- }
-
- @Override
- protected void doRun(final FixtureResultList resultList) {
- final String ownedBy = user != null? user: getContainer().getUser().getName();
- installFor(ownedBy, resultList);
- getContainer().flush();
- }
-
- private void installFor(final String user, final FixtureResultList resultList) {
-
- createToDoItemForUser("Buy milk", Category.Domestic, Subcategory.Shopping, user, daysFromToday(0), new BigDecimal("0.75"), resultList);
- createToDoItemForUser("Buy bread", Category.Domestic, Subcategory.Shopping, user, daysFromToday(0), new BigDecimal("1.75"), resultList);
- createToDoItemForUser("Buy stamps", Category.Domestic, Subcategory.Shopping, user, daysFromToday(0), new BigDecimal("10.00"), resultList);
- createToDoItemForUser("Pick up laundry", Category.Domestic, Subcategory.Chores, user, daysFromToday(6), new BigDecimal("7.50"), resultList);
- createToDoItemForUser("Mow lawn", Category.Domestic, Subcategory.Garden, user, daysFromToday(6), null, resultList);
- createToDoItemForUser("Vacuum house", Category.Domestic, Subcategory.Housework, user, daysFromToday(3), null, resultList);
- createToDoItemForUser("Sharpen knives", Category.Domestic, Subcategory.Chores, user, daysFromToday(14), null, resultList);
-
- createToDoItemForUser("Write to penpal", Category.Other, Subcategory.Other, user, null, null, resultList);
-
- createToDoItemForUser("Write blog post", Category.Professional, Subcategory.Marketing, user, daysFromToday(7), null, resultList);
- createToDoItemForUser("Organize brown bag", Category.Professional, Subcategory.Consulting, user, daysFromToday(14), null, resultList);
- createToDoItemForUser("Submit conference session", Category.Professional, Subcategory.Education, user, daysFromToday(21), null, resultList);
- createToDoItemForUser("Stage Isis release", Category.Professional, Subcategory.OpenSource, user, null, null, resultList);
-
- getContainer().flush();
- }
-
- // //////////////////////////////////////
-
- private ToDoItem createToDoItemForUser(
- final String description,
- final Category category, Subcategory subcategory,
- final String user,
- final LocalDate dueBy, final BigDecimal cost, FixtureResultList resultList) {
- ToDoItem newToDo = toDoItems.newToDo(description, category, subcategory, user, dueBy, cost);
- return resultList.add(this, newToDo);
- }
-
- private static LocalDate daysFromToday(final int i) {
- final LocalDate date = new LocalDate(Clock.getTimeAsDateTime());
- return date.plusDays(i);
- }
-
-
- // //////////////////////////////////////
- // Injected services
- // //////////////////////////////////////
-
- @javax.inject.Inject
- private ToDoItems toDoItems;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsDeleteForUser.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsDeleteForUser.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsDeleteForUser.java
deleted file mode 100644
index ed3b242..0000000
--- a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsDeleteForUser.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package fixture.todo;
-
-import org.apache.isis.applib.fixturescripts.FixtureResultList;
-import org.apache.isis.applib.fixturescripts.SimpleFixtureScript;
-import org.apache.isis.objectstore.jdo.applib.service.support.IsisJdoSupport;
-
-public class ToDoItemsDeleteForUser extends SimpleFixtureScript {
-
- // //////////////////////////////////////
- // Constructor
- // //////////////////////////////////////
-
- private final String user;
-
- public ToDoItemsDeleteForUser(final String user) {
- super(friendlyNameFor(user), localNameFor(user));
- this.user = user;
- }
-
- static String localNameFor(final String user) {
- return user != null? user: "current";
- }
-
- static String friendlyNameFor(final String user) {
- return "Delete ToDoItems for " + (user != null ? "'" + user + "'" : "current user");
- }
-
- @Override
- protected void doRun(final FixtureResultList resultList) {
- final String ownedBy = user != null? user: getContainer().getUser().getName();
- isisJdoSupport.executeUpdate("delete from \"ToDoItem\" where \"ownedBy\" = '" + ownedBy + "'");
- getContainer().flush();
- }
-
- // //////////////////////////////////////
- // Injected services
- // //////////////////////////////////////
-
- @javax.inject.Inject
- private IsisJdoSupport isisJdoSupport;
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java
deleted file mode 100644
index 3d561ad..0000000
--- a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package fixture.todo;
-
-import org.apache.isis.applib.fixturescripts.FixtureScript;
-
-/**
- * Refactored to reuse the newer {@link FixtureScript} API.
- */
-public class ToDoItemsFixture extends ToDoItemsResetForUser {
-
- public ToDoItemsFixture() {
- this(null);
- }
-
- public ToDoItemsFixture(String user) {
- super(user);
- setDiscoverability(Discoverability.NON_DISCOVERABLE);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/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 12ba74a..5e59b73 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,9 +18,9 @@
*/
package fixture.todo;
-import java.util.Collections;
import java.util.List;
+import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Named;
import org.apache.isis.applib.annotation.Prototype;
import org.apache.isis.applib.fixturescripts.FixtureResult;
@@ -37,18 +37,21 @@ public class ToDoItemsFixturesService extends FixtureScripts {
super("fixture.todo");
}
+
@Prototype
- public List<FixtureResult> runFixtureScriptForCurrent() {
- return findFixtureScriptFor("current").run();
+ @MemberOrder(sequence="20")
+ public List<FixtureResult> recreateToDoItemsForCurrent() {
+ return findFixtureScriptFor("recreate-current").run(null);
}
- public String disableRunFixtureScriptForCurrent() {
- return findFixtureScriptFor("current") == null? "Could not find fixture script 'current'": 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) {
- fs.getQualifiedName().equals(qualifiedName);
- return fs;
+ if(fs.getQualifiedName().contains(qualifiedName)) {
+ return fs;
+ }
}
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsResetForUser.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsResetForUser.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsResetForUser.java
deleted file mode 100644
index 527067a..0000000
--- a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsResetForUser.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package fixture.todo;
-
-import org.apache.isis.applib.fixturescripts.CompositeFixtureScript;
-
-public class ToDoItemsResetForUser extends CompositeFixtureScript {
-
- // //////////////////////////////////////
- // Subclasses
- // //////////////////////////////////////
-
- public static final class ToDoItemResetForDick extends ToDoItemsResetForUser {
- public ToDoItemResetForDick() {
- super("dick");
- }
- }
-
- public static final class ToDoItemResetForJoe extends ToDoItemsResetForUser {
- public ToDoItemResetForJoe() {
- super("joe");
- }
- }
-
- public static final class ToDoItemResetForSven extends ToDoItemsResetForUser {
- public ToDoItemResetForSven() {
- super("sven");
- }
- }
-
- // //////////////////////////////////////
- // Constructor
- // //////////////////////////////////////
-
- private String user;
-
- public ToDoItemsResetForUser() {
- this(null);
- }
-
- public ToDoItemsResetForUser(String user) {
- super(friendlyNameFor(localNameFor(user)), localNameFor(user));
- this.user = user;
- }
-
- static String localNameFor(String user) {
- return user != null? user: "current";
- }
-
- static String friendlyNameFor(String user) {
- return "Reset ToDoItems for " + (user != null ? "'" + user + "'" : "current user");
- }
-
- @Override
- protected void addChildren() {
- add("delete", new ToDoItemsDeleteForUser(user));
- add("create", new ToDoItemsCreateForUser(user));
- add("complete", new ToDoItemsCompleteForUser(user));
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/integtests/ToDoItemsIntegTestFixture.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/integtests/ToDoItemsIntegTestFixture.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/integtests/ToDoItemsIntegTestFixture.java
new file mode 100644
index 0000000..9eaaa07
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/integtests/ToDoItemsIntegTestFixture.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package fixture.todo.integtests;
+
+import fixture.todo.simple.ToDoItemsComplete;
+import fixture.todo.simple.ToDoItemsCreate;
+import fixture.todo.simple.ToDoItemsDelete;
+
+import org.apache.isis.applib.fixturescripts.CompositeFixtureScript;
+import org.apache.isis.applib.fixturescripts.FixtureScript;
+
+/**
+ * Refactored to reuse the newer {@link FixtureScript} API.
+ */
+public class ToDoItemsIntegTestFixture extends CompositeFixtureScript {
+
+ public ToDoItemsIntegTestFixture() {
+ super("demo");
+ setDiscoverability(Discoverability.NON_DISCOVERABLE);
+ }
+
+ @Override
+ protected void addChildren() {
+ add("delete", ToDoItemsDelete.forCurrent());
+ add("create", ToDoItemsCreate.forCurrent());
+ add("complete", ToDoItemsComplete.forCurrent());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsDeleteFor.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsDeleteFor.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsDeleteFor.java
new file mode 100644
index 0000000..9e7021c
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsDeleteFor.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package fixture.todo.scenarios;
+
+import com.google.common.base.Strings;
+
+import fixture.todo.simple.ToDoItemsDelete;
+
+import org.apache.isis.applib.fixturescripts.CompositeFixtureScript;
+import org.apache.isis.applib.fixturescripts.FixtureResultList;
+
+public final class ToDoItemsDeleteFor extends CompositeFixtureScript {
+ public ToDoItemsDeleteFor() {
+ super("Delete ToDoItems for specified user", "delete-specified");
+ }
+
+ @Override
+ protected void doRun(final String parameters, final FixtureResultList fixtureResults) {
+ super.doRun(parameters, fixtureResults);
+ }
+
+ @Override
+ public String validateRun(final String parameters) {
+ return Strings.isNullOrEmpty(parameters) ? "Specify the owner of the ToDoItems to be deleted" : null;
+ }
+
+ @Override
+ protected void addChildren() {
+ add("delete", ToDoItemsDelete.forUser(null));
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsDeleteForSven.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsDeleteForSven.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsDeleteForSven.java
new file mode 100644
index 0000000..fa84c80
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsDeleteForSven.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package fixture.todo.scenarios;
+
+import fixture.todo.simple.ToDoItemsDelete;
+
+import org.apache.isis.applib.fixturescripts.CompositeFixtureScript;
+
+public final class ToDoItemsDeleteForSven extends CompositeFixtureScript {
+ public ToDoItemsDeleteForSven() {
+ super("Delete ToDoItems for 'sven'", "delete-sven");
+ }
+
+ @Override
+ protected void addChildren() {
+ add("delete", ToDoItemsDelete.forUser("sven"));
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateAndCompleteSeveralForCurrent.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateAndCompleteSeveralForCurrent.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateAndCompleteSeveralForCurrent.java
new file mode 100644
index 0000000..e64dd45
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateAndCompleteSeveralForCurrent.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package fixture.todo.scenarios;
+
+import fixture.todo.simple.ToDoItemsComplete;
+import fixture.todo.simple.ToDoItemsCreate;
+import fixture.todo.simple.ToDoItemsDelete;
+
+import org.apache.isis.applib.fixturescripts.CompositeFixtureScript;
+
+public class ToDoItemsRecreateAndCompleteSeveralForCurrent extends CompositeFixtureScript {
+
+ public ToDoItemsRecreateAndCompleteSeveralForCurrent() {
+ super("Recreate ToDoItems and complete several for current user", "recreate-current");
+ }
+
+ @Override
+ protected void addChildren() {
+ add("delete", ToDoItemsDelete.forCurrent());
+ add("create", ToDoItemsCreate.forCurrent());
+ add("complete", ToDoItemsComplete.forCurrent());
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateFor.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateFor.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateFor.java
new file mode 100644
index 0000000..bfa508e
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateFor.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package fixture.todo.scenarios;
+
+import com.google.common.base.Strings;
+
+import fixture.todo.simple.ToDoItemsCreate;
+import fixture.todo.simple.ToDoItemsDelete;
+
+import org.apache.isis.applib.fixturescripts.CompositeFixtureScript;
+import org.apache.isis.applib.fixturescripts.FixtureResultList;
+
+public final class ToDoItemsRecreateFor extends CompositeFixtureScript {
+ public ToDoItemsRecreateFor() {
+ super("Recreate ToDoItems for specified user", "recreate-specified");
+ }
+
+ @Override
+ protected void doRun(String parameters, FixtureResultList fixtureResults) {
+ super.doRun(parameters, fixtureResults);
+ }
+
+ @Override
+ public String validateRun(String parameters) {
+ return Strings.isNullOrEmpty(parameters) ? "Specify the owner of the ToDoItems to be recreated" : null;
+ }
+
+ @Override
+ protected void addChildren() {
+ add("delete", ToDoItemsDelete.forUser(null));
+ add("create", ToDoItemsCreate.forUser(null));
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateForDick.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateForDick.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateForDick.java
new file mode 100644
index 0000000..27c3e66
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateForDick.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package fixture.todo.scenarios;
+
+import fixture.todo.simple.ToDoItemsCreate;
+import fixture.todo.simple.ToDoItemsDelete;
+
+import org.apache.isis.applib.fixturescripts.CompositeFixtureScript;
+
+public final class ToDoItemsRecreateForDick extends CompositeFixtureScript {
+ public ToDoItemsRecreateForDick() {
+ super("Recreate ToDoItems for 'dick'", "recreate-dick");
+ }
+
+ @Override
+ protected void addChildren() {
+ add("delete", ToDoItemsDelete.forUser("dick"));
+ add("create", ToDoItemsCreate.forUser("dick"));
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateForJoe.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateForJoe.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateForJoe.java
new file mode 100644
index 0000000..80d2bee
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateForJoe.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package fixture.todo.scenarios;
+
+import fixture.todo.simple.ToDoItemsCreate;
+import fixture.todo.simple.ToDoItemsDelete;
+
+import org.apache.isis.applib.fixturescripts.CompositeFixtureScript;
+
+public final class ToDoItemsRecreateForJoe extends CompositeFixtureScript {
+ public ToDoItemsRecreateForJoe() {
+ super("Recreate ToDoItems for 'joe'", "recreate-joe");
+ }
+
+ @Override
+ protected void addChildren() {
+ add("delete", ToDoItemsDelete.forUser("joe"));
+ add("create", ToDoItemsCreate.forUser("joe"));
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateForSven.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateForSven.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateForSven.java
new file mode 100644
index 0000000..ad3ca3d
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateForSven.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package fixture.todo.scenarios;
+
+import fixture.todo.simple.ToDoItemsCreate;
+import fixture.todo.simple.ToDoItemsDelete;
+
+import org.apache.isis.applib.fixturescripts.CompositeFixtureScript;
+
+public final class ToDoItemsRecreateForSven extends CompositeFixtureScript {
+ public ToDoItemsRecreateForSven() {
+ super("Recreate ToDoItems for 'sven'", "recreate-sven");
+ }
+
+ @Override
+ protected void addChildren() {
+ add("delete", ToDoItemsDelete.forUser("sven"));
+ add("create", ToDoItemsCreate.forUser("sven"));
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsComplete.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsComplete.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsComplete.java
new file mode 100644
index 0000000..a874e38
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsComplete.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package fixture.todo.simple;
+
+import java.util.Collection;
+
+import com.google.common.base.Objects;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
+
+import dom.todo.ToDoItem;
+import dom.todo.ToDoItems;
+
+import org.apache.isis.applib.fixturescripts.FixtureResultList;
+import org.apache.isis.applib.fixturescripts.SimpleFixtureScript;
+
+public class ToDoItemsComplete extends SimpleFixtureScript {
+
+ //region > factory methods & constructor
+ public static ToDoItemsComplete forCurrent() {
+ return new ToDoItemsComplete(null);
+ }
+
+ public static ToDoItemsComplete forUser(final String user) {
+ return new ToDoItemsComplete(user);
+ }
+
+ private final String user;
+ private ToDoItemsComplete(final String user) {
+ super(Util.friendlyNameFor("Complete selected ToDoItems for ", user), Util.localNameFor(user));
+ this.user = user;
+ }
+ //endregion
+
+ //region > doRun
+ @Override
+ protected void doRun(String parameters, final FixtureResultList resultList) {
+ final String ownedBy = Util.coalesce(user, parameters, getContainer().getUser().getName());
+ installFor(ownedBy, resultList);
+ getContainer().flush();
+ }
+
+ private void installFor(final String user, final FixtureResultList resultList) {
+ complete(user, "Buy stamps", resultList);
+ complete(user, "Write blog post", resultList);
+
+ getContainer().flush();
+ }
+
+ private void complete(final String user, final String description, final FixtureResultList resultList) {
+ final ToDoItem toDoItem = findToDoItem(description, user);
+ toDoItem.setComplete(true);
+ resultList.add(this, toDoItem);
+ }
+
+ private ToDoItem findToDoItem(final String description, final String user) {
+ final Collection<ToDoItem> filtered = Collections2.filter(getContainer().allInstances(ToDoItem.class), new Predicate<ToDoItem>() {
+ @Override
+ public boolean apply(ToDoItem input) {
+ return Objects.equal(description, input.getDescription()) &&
+ Objects.equal(user, input.getOwnedBy());
+ }
+ });
+ return filtered.isEmpty()? null: filtered.iterator().next();
+ }
+ //endregion
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsCreate.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsCreate.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsCreate.java
new file mode 100644
index 0000000..6e14f83
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsCreate.java
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package fixture.todo.simple;
+
+import java.math.BigDecimal;
+
+import dom.todo.ToDoItem;
+import dom.todo.ToDoItem.Category;
+import dom.todo.ToDoItem.Subcategory;
+import dom.todo.ToDoItems;
+
+import org.joda.time.LocalDate;
+
+import org.apache.isis.applib.clock.Clock;
+import org.apache.isis.applib.fixturescripts.FixtureResultList;
+import org.apache.isis.applib.fixturescripts.SimpleFixtureScript;
+
+public class ToDoItemsCreate extends SimpleFixtureScript {
+
+ //region > factory methods & constructor
+ public static ToDoItemsCreate forCurrent() {
+ return new ToDoItemsCreate(null);
+ }
+
+ public static ToDoItemsCreate forUser(final String user) {
+ return new ToDoItemsCreate(user);
+ }
+
+ private final String user;
+
+ private ToDoItemsCreate(final String user) {
+ super(Util.friendlyNameFor("Create ToDoItems for ", user), Util.localNameFor(user));
+ this.user = user;
+ }
+ //endregion
+
+ //region > doRun
+ @Override
+ protected void doRun(final String parameters, final FixtureResultList resultList) {
+ final String ownedBy = Util.coalesce(user, parameters, getContainer().getUser().getName());
+ installFor(ownedBy, resultList);
+ getContainer().flush();
+ }
+
+ private void installFor(final String user, final FixtureResultList resultList) {
+
+ createToDoItemForUser("Buy milk", Category.Domestic, Subcategory.Shopping, user, Util.daysFromToday(0), new BigDecimal("0.75"), resultList);
+ createToDoItemForUser("Buy bread", Category.Domestic, Subcategory.Shopping, user, Util.daysFromToday(0), new BigDecimal("1.75"), resultList);
+ createToDoItemForUser("Buy stamps", Category.Domestic, Subcategory.Shopping, user, Util.daysFromToday(0), new BigDecimal("10.00"), resultList);
+ createToDoItemForUser("Pick up laundry", Category.Domestic, Subcategory.Chores, user, Util.daysFromToday(6), new BigDecimal("7.50"), resultList);
+ createToDoItemForUser("Mow lawn", Category.Domestic, Subcategory.Garden, user, Util.daysFromToday(6), null, resultList);
+ createToDoItemForUser("Vacuum house", Category.Domestic, Subcategory.Housework, user, Util.daysFromToday(3), null, resultList);
+ createToDoItemForUser("Sharpen knives", Category.Domestic, Subcategory.Chores, user, Util.daysFromToday(14), null, resultList);
+
+ createToDoItemForUser("Write to penpal", Category.Other, Subcategory.Other, user, null, null, resultList);
+
+ createToDoItemForUser("Write blog post", Category.Professional, Subcategory.Marketing, user, Util.daysFromToday(7), null, resultList);
+ createToDoItemForUser("Organize brown bag", Category.Professional, Subcategory.Consulting, user, Util.daysFromToday(14), null, resultList);
+ createToDoItemForUser("Submit conference session", Category.Professional, Subcategory.Education, user, Util.daysFromToday(21), null, resultList);
+ createToDoItemForUser("Stage Isis release", Category.Professional, Subcategory.OpenSource, user, null, null, resultList);
+
+ getContainer().flush();
+ }
+
+ private ToDoItem createToDoItemForUser(
+ final String description,
+ final Category category, Subcategory subcategory,
+ final String user,
+ final LocalDate dueBy, final BigDecimal cost, FixtureResultList resultList) {
+ ToDoItem newToDo = toDoItems.newToDo(description, category, subcategory, user, dueBy, cost);
+ return resultList.add(this, newToDo);
+ }
+ //endregion
+
+ //region > injected services
+ @javax.inject.Inject
+ private ToDoItems toDoItems;
+ //endregion
+
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsDelete.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsDelete.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsDelete.java
new file mode 100644
index 0000000..c28828c
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsDelete.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package fixture.todo.simple;
+
+import org.apache.isis.applib.fixturescripts.FixtureResultList;
+import org.apache.isis.applib.fixturescripts.SimpleFixtureScript;
+import org.apache.isis.objectstore.jdo.applib.service.support.IsisJdoSupport;
+
+public class ToDoItemsDelete extends SimpleFixtureScript {
+
+ //region > factory methods & constructor
+ public static ToDoItemsDelete forCurrent() {
+ return new ToDoItemsDelete(null);
+ }
+
+ public static ToDoItemsDelete forUser(final String user) {
+ return new ToDoItemsDelete(user);
+ }
+
+ private final String user;
+
+ private ToDoItemsDelete(final String user) {
+ super(Util.friendlyNameFor("Delete ToDoItems for ", user), Util.localNameFor(user));
+ this.user = user;
+ }
+ //endregion
+
+ //region > doRun
+ @Override
+ protected void doRun(final String parameters, final FixtureResultList resultList) {
+ final String ownedBy = Util.coalesce(user, parameters, getContainer().getUser().getName());
+ installFor(ownedBy);
+ getContainer().flush();
+ }
+
+ private void installFor(final String ownedBy) {
+ isisJdoSupport.executeUpdate("delete from \"ToDoItem\" where \"ownedBy\" = '" + ownedBy + "'");
+ }
+ //endregion
+
+ //region > injected services
+ @javax.inject.Inject
+ private IsisJdoSupport isisJdoSupport;
+ //endregion
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/Util.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/Util.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/Util.java
new file mode 100644
index 0000000..60d2f24
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/Util.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package fixture.todo.simple;
+
+import org.joda.time.LocalDate;
+
+import org.apache.isis.applib.clock.Clock;
+
+
+public final class Util {
+
+ private Util(){}
+
+ static String localNameFor(final String user) {
+ return coalesce(user, "current");
+ }
+
+ static String friendlyNameFor(final String prefix, final String user) {
+ return prefix + quotedElseCurrent(user);
+ }
+
+ static String quotedElseCurrent(final String user) {
+ return user != null ? "'" + user + "'" : "current user";
+ }
+
+ static String coalesce(final String... strings) {
+ for (String str : strings) {
+ if(str != null) { return str; }
+ }
+ return null;
+ }
+
+
+ static LocalDate daysFromToday(final int i) {
+ final LocalDate date = new LocalDate(Clock.getTimeAsDateTime());
+ return date.plusDays(i);
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java
index af0d92d..cbf2c39 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java
@@ -18,8 +18,8 @@ package integration.glue;
import cucumber.api.java.Before;
import dom.todo.ToDoItem;
-import fixture.todo.ToDoItemsResetForUser;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
+import fixture.todo.scenarios.ToDoItemsRecreateAndCompleteSeveralForCurrent;
import org.apache.isis.core.specsupport.scenarios.InMemoryDB;
import org.apache.isis.core.specsupport.specs.CukeGlueAbstract;
@@ -41,7 +41,7 @@ public class CatalogOfFixturesGlue extends CukeGlueAbstract {
@Before(value={"@integration", "@ToDoItemsFixture"}, order=20000)
public void integrationFixtures() throws Throwable {
- scenarioExecution().install(new ToDoItemsResetForUser());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemContributionsTest_updateCategory.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemContributionsTest_updateCategory.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemContributionsTest_updateCategory.java
index 02b5123..1fa945a 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemContributionsTest_updateCategory.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemContributionsTest_updateCategory.java
@@ -29,7 +29,7 @@ import dom.todo.ToDoItemContributions;
import dom.todo.ToDoItems;
import dom.todo.ToDoItem.Category;
import dom.todo.ToDoItem.Subcategory;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
import org.joda.time.LocalDate;
import org.junit.After;
@@ -45,7 +45,7 @@ public class ToDoItemContributionsTest_updateCategory extends ToDoIntegTest {
@Before
public void setUp() throws Exception {
- scenarioExecution().install(new ToDoItemsFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
final ToDoItems toDoItems = wrap(service(ToDoItems.class));
toDoItemContributions = wrap(service(ToDoItemContributions.class));
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemTest_completed.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemTest_completed.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemTest_completed.java
index d907776..112563f 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemTest_completed.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemTest_completed.java
@@ -28,7 +28,7 @@ import java.util.List;
import dom.todo.ToDoItem;
import dom.todo.ToDoItemSubscriptions;
import dom.todo.ToDoItems;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
import org.junit.After;
import org.junit.Before;
@@ -41,7 +41,7 @@ public class ToDoItemTest_completed extends ToDoIntegTest {
@Before
public void setUp() throws Exception {
- scenarioExecution().install(new ToDoItemsFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
final List<ToDoItem> all = wrap(service(ToDoItems.class)).notYetComplete();
toDoItem = wrap(all.get(0));
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemTest_duplicate.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemTest_duplicate.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemTest_duplicate.java
index 3f85fb1..c8eb383 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemTest_duplicate.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemTest_duplicate.java
@@ -27,7 +27,7 @@ import java.util.List;
import dom.todo.ToDoItem;
import dom.todo.ToDoItems;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
import org.joda.time.LocalDate;
import org.junit.Before;
@@ -42,7 +42,7 @@ public class ToDoItemTest_duplicate extends ToDoIntegTest {
@Before
public void setUp() throws Exception {
- scenarioExecution().install(new ToDoItemsFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
final List<ToDoItem> all = wrap(service(ToDoItems.class)).notYetComplete();
toDoItem = wrap(all.get(0));
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemTest_notYetCompleted.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemTest_notYetCompleted.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemTest_notYetCompleted.java
index 616679e..2c57217 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemTest_notYetCompleted.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemTest_notYetCompleted.java
@@ -26,7 +26,7 @@ import java.util.List;
import dom.todo.ToDoItem;
import dom.todo.ToDoItems;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
import org.junit.After;
import org.junit.Before;
@@ -38,7 +38,7 @@ public class ToDoItemTest_notYetCompleted extends ToDoIntegTest {
@Before
public void setUp() throws Exception {
- scenarioExecution().install(new ToDoItemsFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
final List<ToDoItem> all = wrap(service(ToDoItems.class)).notYetComplete();
toDoItem = wrap(all.get(0));
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/colls/ToDoItemContributionsTest_similarTo.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/colls/ToDoItemContributionsTest_similarTo.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/colls/ToDoItemContributionsTest_similarTo.java
index dd292cd..8124a2e 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/colls/ToDoItemContributionsTest_similarTo.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/colls/ToDoItemContributionsTest_similarTo.java
@@ -29,7 +29,7 @@ import dom.todo.ToDoItemContributions;
import dom.todo.ToDoItems;
import dom.todo.ToDoItem.Category;
import dom.todo.ToDoItem.Subcategory;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
import org.joda.time.LocalDate;
import org.junit.After;
@@ -45,7 +45,7 @@ public class ToDoItemContributionsTest_similarTo extends ToDoIntegTest {
@Before
public void setUp() throws Exception {
- scenarioExecution().install(new ToDoItemsFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
final ToDoItems toDoItems = wrap(service(ToDoItems.class));
toDoItemContributions = wrap(service(ToDoItemContributions.class));
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/colls/ToDoItemTest_dependencies_add.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/colls/ToDoItemTest_dependencies_add.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/colls/ToDoItemTest_dependencies_add.java
index 813fd92..d303535 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/colls/ToDoItemTest_dependencies_add.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/colls/ToDoItemTest_dependencies_add.java
@@ -30,7 +30,7 @@ import java.util.List;
import dom.todo.ToDoItem;
import dom.todo.ToDoItemSubscriptions;
import dom.todo.ToDoItems;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
import org.junit.After;
import org.junit.Before;
@@ -49,7 +49,7 @@ public class ToDoItemTest_dependencies_add extends ToDoIntegTest {
@Before
public void setUp() throws Exception {
- scenarioExecution().install(new ToDoItemsFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
final List<ToDoItem> items = wrap(service(ToDoItems.class)).notYetComplete();
toDoItem = wrap(items.get(0));
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/colls/ToDoItemTest_dependencies_remove.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/colls/ToDoItemTest_dependencies_remove.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/colls/ToDoItemTest_dependencies_remove.java
index 29fe5f8..7f4713a 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/colls/ToDoItemTest_dependencies_remove.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/colls/ToDoItemTest_dependencies_remove.java
@@ -30,7 +30,7 @@ import java.util.List;
import dom.todo.ToDoItem;
import dom.todo.ToDoItemSubscriptions;
import dom.todo.ToDoItems;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
import org.junit.After;
import org.junit.Before;
@@ -49,7 +49,7 @@ public class ToDoItemTest_dependencies_remove extends ToDoIntegTest {
@Before
public void setUp() throws Exception {
// given
- scenarioExecution().install(new ToDoItemsFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
final List<ToDoItem> items = wrap(service(ToDoItems.class)).notYetComplete();
toDoItem = wrap(items.get(0));
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/events/ToDoItemTest_dependencies_addedEvent.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/events/ToDoItemTest_dependencies_addedEvent.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/events/ToDoItemTest_dependencies_addedEvent.java
index 6cfd491..5823076 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/events/ToDoItemTest_dependencies_addedEvent.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/events/ToDoItemTest_dependencies_addedEvent.java
@@ -24,11 +24,12 @@ import java.util.List;
import dom.todo.ToDoItem;
import dom.todo.ToDoItems;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.eventbus.CollectionAddedToEvent;
import org.apache.isis.applib.services.eventbus.EventBusService;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -55,7 +56,7 @@ public class ToDoItemTest_dependencies_addedEvent extends ToDoIntegTest {
@Before
public void setUp() throws Exception {
- scenarioExecution().install(new ToDoItemsFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
final List<ToDoItem> items = wrap(service(ToDoItems.class)).notYetComplete();
toDoItem = wrap(items.get(0));
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemContributionsTest_priority.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemContributionsTest_priority.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemContributionsTest_priority.java
index cce36a2..4b5e19d 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemContributionsTest_priority.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemContributionsTest_priority.java
@@ -27,7 +27,7 @@ import java.util.List;
import dom.todo.ToDoItem;
import dom.todo.ToDoItemContributions;
import dom.todo.ToDoItems;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
import org.junit.Before;
import org.junit.Test;
@@ -40,7 +40,7 @@ public class ToDoItemContributionsTest_priority extends ToDoIntegTest {
@Before
public void setUp() throws Exception {
- scenarioExecution().install(new ToDoItemsFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
final ToDoItems toDoItems = wrap(service(ToDoItems.class));
toDoItemContributions = service(ToDoItemContributions.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_attachment.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_attachment.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_attachment.java
index 7607b58..d419ef1 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_attachment.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_attachment.java
@@ -29,7 +29,7 @@ import javax.activation.MimeType;
import dom.todo.ToDoItem;
import dom.todo.ToDoItems;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
import org.junit.After;
import org.junit.Before;
@@ -45,7 +45,7 @@ public class ToDoItemTest_attachment extends ToDoIntegTest {
@Before
public void setUp() throws Exception {
- scenarioExecution().install(new ToDoItemsFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
final List<ToDoItem> all = wrap(service(ToDoItems.class)).notYetComplete();
toDoItem = wrap(all.get(0));
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_category.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_category.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_category.java
index 0c12ce7..88f3521 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_category.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_category.java
@@ -26,7 +26,7 @@ import java.util.List;
import dom.todo.ToDoItem;
import dom.todo.ToDoItems;
import dom.todo.ToDoItem.Category;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
import org.junit.Before;
import org.junit.Test;
@@ -37,7 +37,7 @@ public class ToDoItemTest_category extends ToDoIntegTest {
@Before
public void setUp() throws Exception {
- scenarioExecution().install(new ToDoItemsFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
final List<ToDoItem> all = wrap(service(ToDoItems.class)).notYetComplete();
toDoItem = wrap(all.get(0));
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_cost.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_cost.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_cost.java
index ebc7ce2..172c4da 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_cost.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_cost.java
@@ -27,7 +27,7 @@ import java.util.List;
import dom.todo.ToDoItem;
import dom.todo.ToDoItems;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
import org.junit.Before;
import org.junit.Test;
@@ -40,7 +40,7 @@ public class ToDoItemTest_cost extends ToDoIntegTest {
@Before
public void setUp() throws Exception {
// given
- scenarioExecution().install(new ToDoItemsFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
final List<ToDoItem> all = wrap(service(ToDoItems.class)).notYetComplete();
toDoItem = wrap(all.get(0));
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_description.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_description.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_description.java
index df85deb..4e1c1fa 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_description.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_description.java
@@ -30,7 +30,7 @@ import java.util.List;
import dom.todo.ToDoItem;
import dom.todo.ToDoItemSubscriptions;
import dom.todo.ToDoItems;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
import org.junit.After;
import org.junit.Before;
@@ -45,7 +45,7 @@ public class ToDoItemTest_description extends ToDoIntegTest {
@Before
public void setUp() throws Exception {
- scenarioExecution().install(new ToDoItemsFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
final List<ToDoItem> all = wrap(service(ToDoItems.class)).notYetComplete();
toDoItem = wrap(all.get(0));
http://git-wip-us.apache.org/repos/asf/isis/blob/ed525486/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_dueBy.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_dueBy.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_dueBy.java
index ae0c305..b658fc1 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_dueBy.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/props/ToDoItemTest_dueBy.java
@@ -26,7 +26,7 @@ import java.util.List;
import dom.todo.ToDoItem;
import dom.todo.ToDoItems;
-import fixture.todo.ToDoItemsFixture;
+import fixture.todo.integtests.ToDoItemsIntegTestFixture;
import org.joda.time.LocalDate;
import org.junit.After;
@@ -41,7 +41,7 @@ public class ToDoItemTest_dueBy extends ToDoIntegTest {
@Before
public void setUp() throws Exception {
- scenarioExecution().install(new ToDoItemsFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture());
final List<ToDoItem> all = wrap(service(ToDoItems.class)).notYetComplete();
toDoItem = wrap(all.get(0));