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/12/11 15:03:40 UTC

isis git commit: ISIS-973: simplifying and refining fixture script framework.

Repository: isis
Updated Branches:
  refs/heads/master 563d706c0 -> 2bb66d83f


ISIS-973: simplifying and refining fixture script framework.


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2bb66d83
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2bb66d83
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2bb66d83

Branch: refs/heads/master
Commit: 2bb66d83f17b692a5ff1d81709d317436071ec1a
Parents: 563d706
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Dec 11 13:38:14 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Dec 11 13:38:14 2014 +0000

----------------------------------------------------------------------
 .../applib/fixturescripts/FixtureScript.java    | 57 +++++++++++++++-----
 .../runner/opts/OptionHandlerFixture.java       | 23 +++++---
 ...onHandlerFixtureFromEnvironmentVariable.java |  4 +-
 .../simple/scenario/SimpleObjectsFixture.java   |  8 +--
 .../integtests/ToDoItemsIntegTestFixture.java   |  2 +-
 .../complete/ToDoItemCompleteForBuyStamps.java  |  5 --
 .../ToDoItemCompleteForWriteBlogPost.java       |  5 --
 .../todo/scenarios/ToDoItemsRecreate.java       | 26 ++++-----
 .../ToDoItemsRecreateAndCompleteSeveral.java    | 34 ++++++++++--
 .../tests/ToDoItemContributionsIntegTest.java   | 10 ++--
 .../integration/tests/ToDoItemIntegTest.java    | 10 ++--
 .../src/main/webapp/WEB-INF/isis.properties     |  2 +-
 12 files changed, 121 insertions(+), 65 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/2bb66d83/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 8b63c4f..dc6befe 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
@@ -358,6 +358,30 @@ public abstract class FixtureScript
             return fixtureResultList.lookup(key, cls);
         }
 
+        /**
+         * Executes a child {@link FixtureScript fixture script}, injecting services into it first, and (for any results
+         * that are {@link org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
+         * uses a key that is derived from the fixture's class name.
+         */
+         public void executeChild(FixtureScript callingFixtureScript, FixtureScript childFixtureScript) {
+            executeChild(callingFixtureScript, null, childFixtureScript);
+        }
+
+        /**
+         * Executes a child {@link FixtureScript fixture script}, injecting services into it first, and (for any results
+         * that are {@link org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
+         * uses a key that overriding the default name of the fixture script with one more meaningful in the context of this fixture.
+         */
+        public void executeChild(FixtureScript callingFixtureScript, String localNameOverride, FixtureScript childFixtureScript) {
+
+            childFixtureScript.setParentPath(callingFixtureScript.pathWith(""));
+            if(localNameOverride != null) {
+                childFixtureScript.setLocalName(localNameOverride);
+            }
+            callingFixtureScript.getContainer().injectServicesInto(childFixtureScript);
+            executeChildIfNotAlready(childFixtureScript);
+        }
+
 
         static enum As { EXEC, SKIP }
 
@@ -438,6 +462,18 @@ public abstract class FixtureScript
             return ((n / roundTo) + 1) * roundTo;
         }
 
+
+        private Map<Class, Object> userData = Maps.newHashMap();
+        public void setUserData(Object object) {
+            userData.put(object.getClass(), object);
+        }
+        public <T> T getUserData(Class<T> cls) {
+            return (T) userData.get(cls);
+        }
+        public <T> T clearUserData(Class<T> cls) {
+            return (T) userData.remove(cls);
+        }
+
     }
 
     //endregion
@@ -494,24 +530,18 @@ public abstract class FixtureScript
             final String localNameOverride,
             final FixtureScript childFixtureScript,
             final ExecutionContext executionContext) {
-        executeChild(localNameOverride, childFixtureScript, executionContext);
+        executionContext.executeChild(this, localNameOverride, childFixtureScript);
     }
 
     /**
-     * Executes a child {@link FixtureScript fixture script}, overriding its default name with one more
-     * meaningful in the context of this fixture.
+     * @deprecated - use instead {@link org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext#executeChild(FixtureScript, String, FixtureScript)}.
      */
+    @Deprecated
     protected void executeChild(
             final String localNameOverride,
             final FixtureScript childFixtureScript,
             final ExecutionContext executionContext) {
-
-        childFixtureScript.setParentPath(pathWith(""));
-        if(localNameOverride != null) {
-            childFixtureScript.setLocalName(localNameOverride);
-        }
-        getContainer().injectServicesInto(childFixtureScript);
-        executionContext.executeChildIfNotAlready(childFixtureScript);
+        executionContext.executeChild(this, localNameOverride, childFixtureScript);
     }
 
     /**
@@ -524,16 +554,17 @@ public abstract class FixtureScript
     protected void execute(
             final FixtureScript childFixtureScript,
             final ExecutionContext executionContext) {
-        executeChild(childFixtureScript, executionContext);
+        executionContext.executeChild(this, childFixtureScript);
     }
 
     /**
-     * Executes a child {@link FixtureScript fixture script} (simply using its default name).
+     * @deprecated - use instead {@link org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext#executeChild(org.apache.isis.applib.fixturescripts.FixtureScript, org.apache.isis.applib.fixturescripts.FixtureScript)}
      */
+    @Deprecated
     protected void executeChild(
             final FixtureScript childFixtureScript,
             final ExecutionContext executionContext) {
-        executeChild(null, childFixtureScript, executionContext);
+        executionContext.executeChild(this, childFixtureScript);
     }
 
     //endregion

http://git-wip-us.apache.org/repos/asf/isis/blob/2bb66d83/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixture.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixture.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixture.java
index 26be12b..4ab2fa3 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixture.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixture.java
@@ -19,23 +19,26 @@
 
 package org.apache.isis.core.runtime.runner.opts;
 
-import static org.apache.isis.core.runtime.runner.Constants.FIXTURE_LONG_OPT;
-import static org.apache.isis.core.runtime.runner.Constants.FIXTURE_OPT;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.optionhandler.BootPrinter;
 import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.system.SystemConstants;
 
+import static org.apache.isis.core.runtime.runner.Constants.FIXTURE_LONG_OPT;
+import static org.apache.isis.core.runtime.runner.Constants.FIXTURE_OPT;
+
 public class OptionHandlerFixture extends OptionHandlerAbstract {
 
-    private String fixture;
+    private static final Logger LOG = LoggerFactory.getLogger(OptionHandlerFixture.class);
+
+    private String fixtureClassName;
 
     public OptionHandlerFixture() {
         super();
@@ -50,13 +53,19 @@ public class OptionHandlerFixture extends OptionHandlerAbstract {
 
     @Override
     public boolean handle(final CommandLine commandLine, final BootPrinter bootPrinter, final Options options) {
-        fixture = commandLine.getOptionValue(Constants.FIXTURE_OPT);
+        fixtureClassName = commandLine.getOptionValue(Constants.FIXTURE_OPT);
         return true;
     }
 
     @Override
     public void primeConfigurationBuilder(final IsisConfigurationBuilder isisConfigurationBuilder) {
-        isisConfigurationBuilder.add(SystemConstants.FIXTURE_KEY, fixture);
+        prime(isisConfigurationBuilder, SystemConstants.FIXTURE_KEY, fixtureClassName);
+        prime(isisConfigurationBuilder, "isis.persistor.datanucleus.install-fixtures", "true");
+    }
+
+    private static void prime(IsisConfigurationBuilder isisConfigurationBuilder, String key, String value) {
+        LOG.info("priming: " + key + "=" + value);
+        isisConfigurationBuilder.add(key, value);
     }
 
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/2bb66d83/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixtureFromEnvironmentVariable.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixtureFromEnvironmentVariable.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixtureFromEnvironmentVariable.java
index 81c604a..d72a4ce 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixtureFromEnvironmentVariable.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixtureFromEnvironmentVariable.java
@@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory;
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.optionhandler.BootPrinter;
 import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
+import org.apache.isis.core.runtime.system.SystemConstants;
 
 public class OptionHandlerFixtureFromEnvironmentVariable extends OptionHandlerAbstract {
 
@@ -57,8 +58,7 @@ public class OptionHandlerFixtureFromEnvironmentVariable extends OptionHandlerAb
         if(fixtureClassName == null) {
             return;
         }
-        prime(isisConfigurationBuilder, "isis.persistor.datanucleus.install-fixtures", "true");
-        prime(isisConfigurationBuilder, "isis.fixtures", fixtureClassName);
+        prime(isisConfigurationBuilder, SystemConstants.FIXTURE_KEY, fixtureClassName);
     }
 
     private static void prime(IsisConfigurationBuilder isisConfigurationBuilder, String key, String value) {

http://git-wip-us.apache.org/repos/asf/isis/blob/2bb66d83/example/application/simpleapp/fixture/src/main/java/fixture/simple/scenario/SimpleObjectsFixture.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/fixture/src/main/java/fixture/simple/scenario/SimpleObjectsFixture.java b/example/application/simpleapp/fixture/src/main/java/fixture/simple/scenario/SimpleObjectsFixture.java
index 12582e6..c44af4b 100644
--- a/example/application/simpleapp/fixture/src/main/java/fixture/simple/scenario/SimpleObjectsFixture.java
+++ b/example/application/simpleapp/fixture/src/main/java/fixture/simple/scenario/SimpleObjectsFixture.java
@@ -35,11 +35,11 @@ public class SimpleObjectsFixture extends FixtureScript {
     @Override
     protected void execute(ExecutionContext executionContext) {
 
-        executeChild(new SimpleObjectsTearDownFixture(), executionContext);
+        executionContext.executeChild(this, new SimpleObjectsTearDownFixture());
 
-        executeChild(new SimpleObjectForFoo(), executionContext);
-        executeChild(new SimpleObjectForBar(), executionContext);
-        executeChild(new SimpleObjectForBaz(), executionContext);
+        executionContext.executeChild(this, new SimpleObjectForFoo());
+        executionContext.executeChild(this, new SimpleObjectForBar());
+        executionContext.executeChild(this, new SimpleObjectForBaz());
     }
 
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/2bb66d83/example/application/todoapp/fixture/src/main/java/fixture/todo/integtests/ToDoItemsIntegTestFixture.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/fixture/src/main/java/fixture/todo/integtests/ToDoItemsIntegTestFixture.java b/example/application/todoapp/fixture/src/main/java/fixture/todo/integtests/ToDoItemsIntegTestFixture.java
index 6953e3f..2634839 100644
--- a/example/application/todoapp/fixture/src/main/java/fixture/todo/integtests/ToDoItemsIntegTestFixture.java
+++ b/example/application/todoapp/fixture/src/main/java/fixture/todo/integtests/ToDoItemsIntegTestFixture.java
@@ -34,7 +34,7 @@ public class ToDoItemsIntegTestFixture extends FixtureScript {
 
     @Override
     protected void execute(ExecutionContext executionContext) {
-        executeChild(new ToDoItemsRecreateAndCompleteSeveral(), executionContext);
+        executionContext.executeChild(this, new ToDoItemsRecreateAndCompleteSeveral());
     }
 
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/2bb66d83/example/application/todoapp/fixture/src/main/java/fixture/todo/items/actions/complete/ToDoItemCompleteForBuyStamps.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/fixture/src/main/java/fixture/todo/items/actions/complete/ToDoItemCompleteForBuyStamps.java b/example/application/todoapp/fixture/src/main/java/fixture/todo/items/actions/complete/ToDoItemCompleteForBuyStamps.java
index 0d29846..b05bf36 100644
--- a/example/application/todoapp/fixture/src/main/java/fixture/todo/items/actions/complete/ToDoItemCompleteForBuyStamps.java
+++ b/example/application/todoapp/fixture/src/main/java/fixture/todo/items/actions/complete/ToDoItemCompleteForBuyStamps.java
@@ -24,11 +24,6 @@ public class ToDoItemCompleteForBuyStamps extends ToDoItemCompleteAbstract {
 
     @Override
     protected void execute(ExecutionContext executionContext) {
-
-        // prereqs
-        executeChild(new ToDoItemForBuyStamps(), executionContext);
-
-        // this fixture
         complete(ToDoItemForBuyStamps.DESCRIPTION, executionContext);
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/2bb66d83/example/application/todoapp/fixture/src/main/java/fixture/todo/items/actions/complete/ToDoItemCompleteForWriteBlogPost.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/fixture/src/main/java/fixture/todo/items/actions/complete/ToDoItemCompleteForWriteBlogPost.java b/example/application/todoapp/fixture/src/main/java/fixture/todo/items/actions/complete/ToDoItemCompleteForWriteBlogPost.java
index 8db5d90..4b620f4 100644
--- a/example/application/todoapp/fixture/src/main/java/fixture/todo/items/actions/complete/ToDoItemCompleteForWriteBlogPost.java
+++ b/example/application/todoapp/fixture/src/main/java/fixture/todo/items/actions/complete/ToDoItemCompleteForWriteBlogPost.java
@@ -24,11 +24,6 @@ public class ToDoItemCompleteForWriteBlogPost extends ToDoItemCompleteAbstract {
 
     @Override
     protected void execute(ExecutionContext executionContext) {
-
-        // prereqs
-        executeChild(new ToDoItemForWriteBlogPost(), executionContext);
-
-        // this fixture
         complete(ToDoItemForWriteBlogPost.DESCRIPTION, executionContext);
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/2bb66d83/example/application/todoapp/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreate.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreate.java b/example/application/todoapp/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreate.java
index 1985407..5e61cc2 100644
--- a/example/application/todoapp/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreate.java
+++ b/example/application/todoapp/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreate.java
@@ -62,20 +62,20 @@ public class ToDoItemsRecreate extends FixtureScript {
                 Util.coalesce(getOwnedBy(), getContainer().getUser().getName()));
 
         // prereqs
-        executeChild(new ToDoItemsDelete(), executionContext);
+        executionContext.executeChild(this, new ToDoItemsDelete());
 
         // create items
-        executeChild(new ToDoItemForBuyMilk(), executionContext);
-        executeChild(new ToDoItemForBuyBread(), executionContext);
-        executeChild(new ToDoItemForBuyStamps(), executionContext);
-        executeChild(new ToDoItemForPickUpLaundry(), executionContext);
-        executeChild(new ToDoItemForMowLawn(), executionContext);
-        executeChild(new ToDoItemForVacuumHouse(), executionContext);
-        executeChild(new ToDoItemForSharpenKnives(), executionContext);
-        executeChild(new ToDoItemForWriteToPenPal(), executionContext);
-        executeChild(new ToDoItemForWriteBlogPost(), executionContext);
-        executeChild(new ToDoItemForOrganizeBrownBag(), executionContext);
-        executeChild(new ToDoItemForSubmitConferenceSession(), executionContext);
-        executeChild(new ToDoItemForStageIsisRelease(), executionContext);
+        executionContext.executeChild(this, new ToDoItemForBuyMilk());
+        executionContext.executeChild(this, new ToDoItemForBuyBread());
+        executionContext.executeChild(this, new ToDoItemForBuyStamps());
+        executionContext.executeChild(this, new ToDoItemForPickUpLaundry());
+        executionContext.executeChild(this, new ToDoItemForMowLawn());
+        executionContext.executeChild(this, new ToDoItemForVacuumHouse());
+        executionContext.executeChild(this, new ToDoItemForSharpenKnives());
+        executionContext.executeChild(this, new ToDoItemForWriteToPenPal());
+        executionContext.executeChild(this, new ToDoItemForWriteBlogPost());
+        executionContext.executeChild(this, new ToDoItemForOrganizeBrownBag());
+        executionContext.executeChild(this, new ToDoItemForSubmitConferenceSession());
+        executionContext.executeChild(this, new ToDoItemForStageIsisRelease());
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/2bb66d83/example/application/todoapp/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateAndCompleteSeveral.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateAndCompleteSeveral.java b/example/application/todoapp/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateAndCompleteSeveral.java
index c14afd5..d0645a2 100644
--- a/example/application/todoapp/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateAndCompleteSeveral.java
+++ b/example/application/todoapp/fixture/src/main/java/fixture/todo/scenarios/ToDoItemsRecreateAndCompleteSeveral.java
@@ -20,6 +20,19 @@ package fixture.todo.scenarios;
 
 import fixture.todo.items.actions.complete.ToDoItemCompleteForBuyStamps;
 import fixture.todo.items.actions.complete.ToDoItemCompleteForWriteBlogPost;
+import fixture.todo.items.create.ToDoItemForBuyBread;
+import fixture.todo.items.create.ToDoItemForBuyMilk;
+import fixture.todo.items.create.ToDoItemForBuyStamps;
+import fixture.todo.items.create.ToDoItemForMowLawn;
+import fixture.todo.items.create.ToDoItemForOrganizeBrownBag;
+import fixture.todo.items.create.ToDoItemForPickUpLaundry;
+import fixture.todo.items.create.ToDoItemForSharpenKnives;
+import fixture.todo.items.create.ToDoItemForStageIsisRelease;
+import fixture.todo.items.create.ToDoItemForSubmitConferenceSession;
+import fixture.todo.items.create.ToDoItemForVacuumHouse;
+import fixture.todo.items.create.ToDoItemForWriteBlogPost;
+import fixture.todo.items.create.ToDoItemForWriteToPenPal;
+import fixture.todo.items.delete.ToDoItemsDelete;
 import fixture.todo.util.Util;
 
 import org.apache.isis.applib.fixturescripts.FixtureScript;
@@ -50,11 +63,24 @@ public class ToDoItemsRecreateAndCompleteSeveral extends FixtureScript {
                 "ownedBy",
                 Util.coalesce(getOwnedBy(), getContainer().getUser().getName()));
 
-        // prereqs
-        executeChild(new ToDoItemsRecreate(), executionContext);
+        executionContext.executeChild(this, new ToDoItemsDelete());
+
+        // create items
+        executionContext.executeChild(this, new ToDoItemForBuyMilk());
+        executionContext.executeChild(this, new ToDoItemForBuyBread());
+        executionContext.executeChild(this, new ToDoItemForBuyStamps());
+        executionContext.executeChild(this, new ToDoItemForPickUpLaundry());
+        executionContext.executeChild(this, new ToDoItemForMowLawn());
+        executionContext.executeChild(this, new ToDoItemForVacuumHouse());
+        executionContext.executeChild(this, new ToDoItemForSharpenKnives());
+        executionContext.executeChild(this, new ToDoItemForWriteToPenPal());
+        executionContext.executeChild(this, new ToDoItemForWriteBlogPost());
+        executionContext.executeChild(this, new ToDoItemForOrganizeBrownBag());
+        executionContext.executeChild(this, new ToDoItemForSubmitConferenceSession());
+        executionContext.executeChild(this, new ToDoItemForStageIsisRelease());
 
         // this fixture
-        executeChild(new ToDoItemCompleteForBuyStamps(), executionContext);
-        executeChild(new ToDoItemCompleteForWriteBlogPost(), executionContext);
+        executionContext.executeChild(this, new ToDoItemCompleteForBuyStamps());
+        executionContext.executeChild(this, new ToDoItemCompleteForWriteBlogPost());
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/2bb66d83/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemContributionsIntegTest.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemContributionsIntegTest.java b/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemContributionsIntegTest.java
index 0427ec9..f377f52 100644
--- a/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemContributionsIntegTest.java
+++ b/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemContributionsIntegTest.java
@@ -21,7 +21,7 @@ package integration.tests;
 import dom.todo.ToDoItem;
 import dom.todo.ToDoItemContributions;
 import dom.todo.ToDoItems;
-import fixture.todo.integtests.ToDoItemsIntegTestFixture;
+import fixture.todo.scenarios.ToDoItemsRecreateAndCompleteSeveral;
 
 import java.util.List;
 import javax.inject.Inject;
@@ -37,12 +37,12 @@ import static org.junit.Assert.assertThat;
 
 public abstract class ToDoItemContributionsIntegTest extends AbstractToDoIntegTest {
 
-    ToDoItemsIntegTestFixture fixture;
+    ToDoItemsRecreateAndCompleteSeveral fixtureScript;
 
     @Before
     public void setUpData() throws Exception {
-        // executing the fixtures directly allows us to look up the results later.
-        fixtureScripts.runFixtureScript(fixture = new ToDoItemsIntegTestFixture(), null);
+        fixtureScript = new ToDoItemsRecreateAndCompleteSeveral();
+        fixtureScripts.runFixtureScript(fixtureScript, null);
     }
 
     @Inject
@@ -58,7 +58,7 @@ public abstract class ToDoItemContributionsIntegTest extends AbstractToDoIntegTe
     @Before
     public void setUp() throws Exception {
 
-        toDoItem = wrap(fixture.lookup("integ-test/to-do-items-recreate-and-complete-several/to-do-item-complete-for-buy-stamps/item-1", ToDoItem.class));
+        toDoItem = wrap(fixtureScript.lookup("to-do-items-recreate-and-complete-several/to-do-item-complete-for-buy-stamps/item-1", ToDoItem.class));
         assertThat(toDoItem, is(not(nullValue())));
 
         toDoItemContributionsWrapped = wrap(toDoItemContributions);

http://git-wip-us.apache.org/repos/asf/isis/blob/2bb66d83/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java b/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
index 15735ae..d4eab58 100644
--- a/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
+++ b/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
@@ -21,7 +21,7 @@ package integration.tests;
 import dom.todo.ToDoItem;
 import dom.todo.ToDoItemSubscriptions;
 import dom.todo.ToDoItems;
-import fixture.todo.integtests.ToDoItemsIntegTestFixture;
+import fixture.todo.scenarios.ToDoItemsRecreateAndCompleteSeveral;
 
 import java.math.BigDecimal;
 import java.nio.charset.Charset;
@@ -61,12 +61,12 @@ import static org.junit.Assert.assertThat;
 
 public class ToDoItemIntegTest extends AbstractToDoIntegTest {
 
-    ToDoItemsIntegTestFixture fixture;
+    ToDoItemsRecreateAndCompleteSeveral fixtureScript;
 
     @Before
     public void setUpData() throws Exception {
-        // executing the fixtures directly allows us to look up the results later.
-        fixtureScripts.runFixtureScript(fixture = new ToDoItemsIntegTestFixture(), null);
+        fixtureScript = new ToDoItemsRecreateAndCompleteSeveral();
+        fixtureScripts.runFixtureScript(fixtureScript, null);
     }
 
     @Inject
@@ -100,7 +100,7 @@ public class ToDoItemIntegTest extends AbstractToDoIntegTest {
             final List<ToDoItem> all = wrap(toDoItems).notYetComplete();
             toDoItem = wrap(all.get(0));
 
-            toDoItem = wrap(fixture.lookup("integ-test/to-do-items-recreate-and-complete-several/to-do-items-recreate/to-do-item-for-buy-bread/item-1", ToDoItem.class));
+            toDoItem = wrap(fixtureScript.lookup("to-do-items-recreate-and-complete-several/to-do-item-for-buy-bread/item-1", ToDoItem.class));
             assertThat(toDoItem, is(not(nullValue())));
 
             nextTransaction();

http://git-wip-us.apache.org/repos/asf/isis/blob/2bb66d83/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties b/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties
index e402f32..805a6c3 100644
--- a/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -199,7 +199,7 @@ isis.services = \
 # in-memory object store, the fixtures are installed on every run.  For other
 # object stores, they are used only when the object store is first initialized.
 #
-isis.fixtures=fixture.todo.scenarios.ToDoItemsRecreateForSven
+#isis.fixtures=fixture.todo.scenarios.ToDoItemsRecreateForSven
 
 
 #