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/27 21:19:17 UTC
[1/2] git commit: ISIS-716: reverting change back to 3.3.6...
Repository: isis
Updated Branches:
refs/heads/master 5e3751a67 -> 63e148d80
ISIS-716: reverting change back to 3.3.6...
... appeared to cause a regression in Estatio with its polymorphic relationship from CommunicationChannel#owner (to either FixedAsset or Party).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/54df9759
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/54df9759
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/54df9759
Branch: refs/heads/master
Commit: 54df9759650a3f63c162185f072648824ecb8255
Parents: 5e3751a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon May 26 19:14:43 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon May 26 19:14:43 2014 +0100
----------------------------------------------------------------------
component/objectstore/jdo/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/54df9759/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index a6c0635..c0337c7 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -29,7 +29,7 @@
<packaging>pom</packaging>
<properties>
- <datanucleus-accessplatform-jdo-rdbms.version>3.3.8</datanucleus-accessplatform-jdo-rdbms.version>
+ <datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
<datanucleus-jodatime.version>3.2.1</datanucleus-jodatime.version>
<datanucleus-maven-plugin.version>3.3.2</datanucleus-maven-plugin.version>
[2/2] git commit: ISIS-716: execute "dependent" scripts through the
ExecutionContext... ... so can track which scripts have been executed and
ensure only ever called once. This tracking is done by class name. This
allows the idiom that each script can
Posted by da...@apache.org.
ISIS-716: execute "dependent" scripts through the ExecutionContext...
... so can track which scripts have been executed and ensure only ever called once. This tracking is done by class name. This allows the idiom that each script can in effect "declare" its dependencies, making it easier to compose and reuse.
Also:
- added a new withTracing() method to print out fixtures that were executed.
- refactored/simplified the quickstart/todo app fixtures to better demonstrate the preferred pattern.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/63e148d8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/63e148d8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/63e148d8
Branch: refs/heads/master
Commit: 63e148d80e1b8f069c600a5a4396382a7e61e919
Parents: 54df975
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue May 27 19:58:25 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue May 27 19:58:25 2014 +0100
----------------------------------------------------------------------
.../fixturescripts/CompositeFixtureScript.java | 75 ---------
.../DiscoverableFixtureScript.java | 52 +++++++
.../applib/fixturescripts/FixtureScript.java | 153 +++++++++++++++++--
.../fixturescripts/SimpleFixtureScript.java | 4 +-
.../fixture/todo/ToDoItemsFixturesService.java | 6 +-
.../integtests/ToDoItemsIntegTestFixture.java | 15 +-
.../todo/scenarios/DeleteToDoItemsFor.java | 17 +--
.../todo/scenarios/DeleteToDoItemsForSven.java | 13 +-
...teToDoItemsAndCompleteSeveralForCurrent.java | 18 +--
.../todo/scenarios/RecreateToDoItemsFor.java | 19 +--
.../scenarios/RecreateToDoItemsForDick.java | 15 +-
.../todo/scenarios/RecreateToDoItemsForJoe.java | 16 +-
.../scenarios/RecreateToDoItemsForSven.java | 17 +--
.../fixture/todo/simple/ToDoItemsComplete.java | 83 ----------
.../fixture/todo/simple/ToDoItemsCreate.java | 103 -------------
.../fixture/todo/simple/ToDoItemsDelete.java | 28 ++--
.../fixture/todo/simple/ToDoItemsRecreate.java | 95 ++++++++++++
.../ToDoItemsRecreateAndCompleteSeveral.java | 72 +++++++++
...oDoItemContributionsTest_updateCategory.java | 4 +-
.../fixture/simple/SimpleObjectsFixture.java | 26 +---
.../simple/SimpleObjectsTearDownFixture.java | 36 +++++
21 files changed, 454 insertions(+), 413 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/63e148d8/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
deleted file mode 100644
index 2c672e5..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/CompositeFixtureScript.java
+++ /dev/null
@@ -1,75 +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 org.apache.isis.applib.fixturescripts;
-
-import org.apache.isis.applib.annotation.Named;
-
-@Named("Composite Script")
-public abstract class CompositeFixtureScript extends FixtureScript {
-
- private static Discoverability defaultDiscoverability() {
- return Discoverability.DISCOVERABLE;
- }
-
- /**
- * Initializes a {@link Discoverability#DISCOVERABLE} fixture, with
- * {@link #getFriendlyName()} and {@link #getLocalName()} derived from the class name.
- *
- * <p>
- * Use {@link #setDiscoverability(Discoverability)} to override.
- */
- public CompositeFixtureScript() {
- this(null, null);
- }
-
- /**
- * Initializes a {@link Discoverability#DISCOVERABLE} fixture.
- *
- * <p>
- * Use {@link #setDiscoverability(Discoverability)} to override.
- *
- * @param friendlyName - if null, will be derived from class name
- * @param localName - if null, will be derived from class name
- */
- public CompositeFixtureScript(final String friendlyName, final String localName) {
- super(friendlyName, localName, defaultDiscoverability());
- }
-
- // //////////////////////////////////////
-
- /**
- * Adds a child {@link FixtureScript fixture script}, overriding its default name with one more
- * meaningful in the context of this fixture.
- */
- protected final void execute(final String localNameOverride, final FixtureScript fixtureScript, ExecutionContext executionContext) {
- fixtureScript.setParentPath(pathWith(""));
- if(localNameOverride != null) {
- fixtureScript.setLocalName(localNameOverride);
- }
- getContainer().injectServicesInto(fixtureScript);
- fixtureScript.execute(executionContext);
- }
- /**
- * Executes a child {@link FixtureScript fixture script} (simply using its default name).
- */
- protected final void execute(final FixtureScript fixtureScript, ExecutionContext executionContext) {
- execute(null, fixtureScript, executionContext);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/63e148d8/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/DiscoverableFixtureScript.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/DiscoverableFixtureScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/DiscoverableFixtureScript.java
new file mode 100644
index 0000000..d550944
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/DiscoverableFixtureScript.java
@@ -0,0 +1,52 @@
+/*
+ * 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 org.apache.isis.applib.fixturescripts;
+
+/**
+ * A convenience subclass of {@link org.apache.isis.applib.fixturescripts.FixtureScript} that is
+ * {@link org.apache.isis.applib.fixturescripts.FixtureScript.Discoverability#DISCOVERABLE discoverable}
+ * by default.
+ */
+public abstract class DiscoverableFixtureScript extends FixtureScript {
+
+ /**
+ * Initializes a {@link Discoverability#DISCOVERABLE} fixture, with
+ * {@link #getFriendlyName()} and {@link #getLocalName()} derived from the class name.
+ *
+ * <p>
+ * Use {@link #withDiscoverability(Discoverability)} to override.
+ */
+ public DiscoverableFixtureScript() {
+ this(null, null);
+ }
+
+ /**
+ * Initializes a {@link Discoverability#DISCOVERABLE} fixture.
+ *
+ * <p>
+ * Use {@link #withDiscoverability(Discoverability)} to override.
+ *
+ * @param friendlyName - if null, will be derived from class name
+ * @param localName - if null, will be derived from class name
+ */
+ public DiscoverableFixtureScript(final String friendlyName, final String localName) {
+ super(friendlyName, localName, Discoverability.DISCOVERABLE);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/63e148d8/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 ec89201..bc6fae7 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
@@ -18,9 +18,13 @@
*/
package org.apache.isis.applib.fixturescripts;
+import java.io.PrintStream;
+import java.io.PrintWriter;
import java.util.Collections;
import java.util.List;
-
+import java.util.Map;
+import com.google.common.base.Strings;
+import com.google.common.collect.Maps;
import org.apache.isis.applib.AbstractViewModel;
import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.Named;
@@ -57,6 +61,30 @@ public abstract class FixtureScript
// //////////////////////////////////////
/**
+ * Initializes a {@link Discoverability#NON_DISCOVERABLE} fixture, with
+ * {@link #getFriendlyName()} and {@link #getLocalName()} derived from the class name.
+ *
+ * <p>
+ * Use {@link #withDiscoverability(Discoverability)} to override.
+ */
+ public FixtureScript() {
+ this(null, null);
+ }
+
+ /**
+ * Initializes a {@link Discoverability#NON_DISCOVERABLE} fixture.
+ *
+ * <p>
+ * Use {@link #withDiscoverability(Discoverability)} to override.
+ *
+ * @param friendlyName - if null, will be derived from class name
+ * @param localName - if null, will be derived from class name
+ */
+ public FixtureScript(final String friendlyName, final String localName) {
+ this(friendlyName, localName, Discoverability.NON_DISCOVERABLE);
+ }
+
+ /**
* @param friendlyName - if null, will be derived from class name
* @param localName - if null, will be derived from class name
* @param discoverability
@@ -81,6 +109,35 @@ public abstract class FixtureScript
// //////////////////////////////////////
+
+ private PrintStream tracePrintStream;
+ private PrintWriter tracePrintWriter;
+
+ /**
+ * Enable tracing of the execution to the provided {@link java.io.PrintStream}.
+ */
+ public FixtureScript withTracing(PrintStream tracePrintStream) {
+ this.tracePrintStream = tracePrintStream;
+ return this;
+ }
+
+ /**
+ * Enable tracing of the execution to the provided {@link java.io.PrintWriter}.
+ */
+ public FixtureScript withTracing(PrintWriter tracePrintWriter) {
+ this.tracePrintWriter = tracePrintWriter;
+ return this;
+ }
+
+ /**
+ * Enable tracing of the execution to stdout.
+ */
+ public FixtureScript withTracing() {
+ return withTracing(System.out);
+ }
+
+ // //////////////////////////////////////
+
/**
* Returns the first non-null string; for convenience of subclass implementations
*/
@@ -129,7 +186,7 @@ public abstract class FixtureScript
/**
* Will always be populated, initially by the default name, but can be
* {@link #setLocalName(String) overridden} if
- * {@link CompositeFixtureScript#execute(FixtureScript, org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext)} reused} within a {@link CompositeFixtureScript composite fixture script}.
+ * {@link DiscoverableFixtureScript#execute(FixtureScript, org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext)} reused} within a {@link DiscoverableFixtureScript composite fixture script}.
*/
@Hidden
public String getLocalName() {
@@ -163,16 +220,17 @@ public abstract class FixtureScript
* 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
- * {@link SimpleFixtureScript}s are {@link Discoverability#NON_DISCOVERABLE not}. This can be overridden in the
- * constructor, however.
+ * By default {@link DiscoverableFixtureScript}s are {@link Discoverability#DISCOVERABLE discoverable}, all other
+ * {@link FixtureScript}s are {@link Discoverability#NON_DISCOVERABLE not}. This can be overridden in the
+ * constructor, however or by calling the {@link #withDiscoverability(org.apache.isis.applib.fixturescripts.FixtureScript.Discoverability) setter}.
*/
@Hidden
public boolean isDiscoverable() {
return discoverability == Discoverability.DISCOVERABLE;
}
- public void setDiscoverability(Discoverability discoverability) {
+ public FixtureScript withDiscoverability(Discoverability discoverability) {
this.discoverability = discoverability;
+ return this;
}
// //////////////////////////////////////
@@ -202,6 +260,7 @@ public abstract class FixtureScript
private final String parameters;
private final FixtureResultList fixtureResults;
+ private final Map<String,Class> fixtureScriptClasses = Maps.newLinkedHashMap();
public ExecutionContext(String parameters, FixtureScripts fixtureScripts) {
fixtureResults = new FixtureResultList(fixtureScripts);
@@ -223,17 +282,65 @@ public abstract class FixtureScript
return fixtureResults.add(script, key, object);
}
+ public void executeIfNotAlready(FixtureScript fixtureScript) {
+ if(!hasExecuted(fixtureScript)) {
+ fixtureScript.execute(this);
+ executed(fixtureScript);
+ }
+ }
+
+ private boolean hasExecuted(FixtureScript fixtureScript) {
+ return fixtureScriptClasses.values().contains(fixtureScript.getClass());
+ }
+
+ private void executed(FixtureScript fixtureScript) {
+ fixtureScriptClasses.put(fixtureScript.getQualifiedName(), fixtureScript.getClass());
+ }
+
+ public StringBuilder appendExecutedTo(StringBuilder buf) {
+ final int max = maxQualifiedNameLength();
+ for (final String qualifiedName : this.fixtureScriptClasses.keySet()) {
+ buf.append(pad(qualifiedName, max))
+ .append(": ")
+ .append(fixtureScriptClasses.get(qualifiedName).getName())
+ .append("\n");
+ }
+ return buf;
+ }
+
+ private int maxQualifiedNameLength() {
+ int max = 0;
+ for (final String qualifiedName : this.fixtureScriptClasses.keySet()) {
+ max = Math.max(max, qualifiedName.length());
+ }
+ return max;
+ }
+
+ private static String pad(String str, int len) {
+ return Strings.padEnd(str, len, ' ');
+ }
+
}
@Programmatic
public final List<FixtureResult> run(final String parameters) {
final ExecutionContext executionContext = new ExecutionContext(parameters, fixtureScripts);
- execute(executionContext);
+ executionContext.executeIfNotAlready(this);
+ traceIfRequired(executionContext);
return executionContext.getResults();
}
- @Programmatic
- protected abstract void execute(final ExecutionContext executionContext);
+ private void traceIfRequired(ExecutionContext executionContext) {
+ if(tracePrintStream != null || tracePrintWriter != null) {
+ final String trace = executionContext.appendExecutedTo(new StringBuilder()).toString();
+ if(tracePrintWriter != null) {
+ tracePrintWriter.print(trace);
+ }
+ if(tracePrintStream != null) {
+ tracePrintStream.print(trace);
+ }
+ }
+ }
/**
* Optional hook to validate parameters.
@@ -247,6 +354,34 @@ public abstract class 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 execute(final String localNameOverride, final FixtureScript fixtureScript, ExecutionContext executionContext) {
+ fixtureScript.setParentPath(pathWith(""));
+ if(localNameOverride != null) {
+ fixtureScript.setLocalName(localNameOverride);
+ }
+ getContainer().injectServicesInto(fixtureScript);
+ executionContext.executeIfNotAlready(fixtureScript);
+ }
+ /**
+ * Executes a child {@link FixtureScript fixture script} (simply using its default name).
+ */
+ protected final void execute(final FixtureScript fixtureScript, ExecutionContext executionContext) {
+ execute(null, fixtureScript, executionContext);
+ }
+
+ /**
+ * Do not call directly; instead use {@link ExecutionContext#executeIfNotAlready(FixtureScript)}
+ */
+ @Programmatic
+ protected abstract void execute(final ExecutionContext executionContext);
+
+
+ // //////////////////////////////////////
+
@Override
public FixtureType getType() {
return FixtureType.DOMAIN_OBJECTS;
http://git-wip-us.apache.org/repos/asf/isis/blob/63e148d8/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 1e2b35a..886c96f 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
@@ -32,7 +32,7 @@ public abstract class SimpleFixtureScript extends FixtureScript {
* {@link #getFriendlyName()} and {@link #getLocalName()} derived from the class name.
*
* <p>
- * Use {@link #setDiscoverability(Discoverability)} to override.
+ * Use {@link #withDiscoverability(Discoverability)} to override.
*/
public SimpleFixtureScript() {
this(null, null);
@@ -42,7 +42,7 @@ public abstract class SimpleFixtureScript extends FixtureScript {
* Initializes a {@link Discoverability#NON_DISCOVERABLE} fixture.
*
* <p>
- * Use {@link #setDiscoverability(Discoverability)} to override.
+ * Use {@link #withDiscoverability(Discoverability)} to override.
*
* @param friendlyName - if null, will be derived from class name
* @param localName - if null, will be derived from class name
http://git-wip-us.apache.org/repos/asf/isis/blob/63e148d8/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 914eee8..3bda83a 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
@@ -21,7 +21,6 @@ package fixture.todo;
import fixture.todo.scenarios.RecreateToDoItemsAndCompleteSeveralForCurrent;
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;
@@ -50,7 +49,8 @@ public class ToDoItemsFixturesService extends FixtureScripts {
@Prototype
@MemberOrder(sequence="20")
- public List<FixtureResult> recreateToDoItemsForCurrent() {
- return findFixtureScriptFor(RecreateToDoItemsAndCompleteSeveralForCurrent.class).run(null);
+ public Object recreateToDoItemsForCurrentAndReturnFirst() {
+ final List<FixtureResult> run = findFixtureScriptFor(RecreateToDoItemsAndCompleteSeveralForCurrent.class).run(null);
+ return run.get(0).getObject();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/63e148d8/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
index 40b1cae..85b6143 100644
--- 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
@@ -19,29 +19,22 @@
package fixture.todo.integtests;
-import fixture.todo.simple.ToDoItemsComplete;
-import fixture.todo.simple.ToDoItemsCreate;
-import fixture.todo.simple.ToDoItemsDelete;
+import fixture.todo.simple.ToDoItemsRecreateAndCompleteSeveral;
-import org.apache.isis.applib.fixturescripts.CompositeFixtureScript;
import org.apache.isis.applib.fixturescripts.FixtureScript;
-import org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext;
/**
* Refactored to reuse the newer {@link FixtureScript} API.
*/
-public class ToDoItemsIntegTestFixture extends CompositeFixtureScript {
+public class ToDoItemsIntegTestFixture extends FixtureScript {
public ToDoItemsIntegTestFixture() {
- super(null, null);
- setDiscoverability(Discoverability.NON_DISCOVERABLE);
+ super(null, "integ-test");
}
@Override
protected void execute(ExecutionContext executionContext) {
- execute("delete", ToDoItemsDelete.forCurrent(), executionContext);
- execute("create", ToDoItemsCreate.forCurrent(), executionContext);
- execute("complete", ToDoItemsComplete.forCurrent(), executionContext);
+ execute(new ToDoItemsRecreateAndCompleteSeveral(null), executionContext);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/63e148d8/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/DeleteToDoItemsFor.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/DeleteToDoItemsFor.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/DeleteToDoItemsFor.java
index 6526fd9..b07271c 100644
--- a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/DeleteToDoItemsFor.java
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/DeleteToDoItemsFor.java
@@ -18,26 +18,19 @@
*/
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;
-import org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext;
+import com.google.common.base.Strings;
+
+public class DeleteToDoItemsFor extends ToDoItemsDelete {
-public final class DeleteToDoItemsFor extends CompositeFixtureScript {
public DeleteToDoItemsFor() {
- super(null, "delete-specified");
+ super(null);
+ withDiscoverability(Discoverability.DISCOVERABLE);
}
@Override
public String validateRun(final String parameters) {
return Strings.isNullOrEmpty(parameters) ? "Specify the owner of the ToDoItems to be deleted" : null;
}
-
- @Override
- protected void execute(ExecutionContext executionContext) {
- execute("delete", ToDoItemsDelete.forUser(null), executionContext);
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/63e148d8/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/DeleteToDoItemsForSven.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/DeleteToDoItemsForSven.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/DeleteToDoItemsForSven.java
index c7fee53..4127f87 100644
--- a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/DeleteToDoItemsForSven.java
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/DeleteToDoItemsForSven.java
@@ -20,16 +20,11 @@ package fixture.todo.scenarios;
import fixture.todo.simple.ToDoItemsDelete;
-import org.apache.isis.applib.fixturescripts.CompositeFixtureScript;
-import org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext;
+public final class DeleteToDoItemsForSven extends ToDoItemsDelete {
-public final class DeleteToDoItemsForSven extends CompositeFixtureScript {
public DeleteToDoItemsForSven() {
- super(null, "delete-sven");
- }
-
- @Override
- protected void execute(ExecutionContext executionContext) {
- execute("delete", ToDoItemsDelete.forUser("sven"), executionContext);
+ super("sven");
+ withDiscoverability(Discoverability.DISCOVERABLE);
+
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/63e148d8/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsAndCompleteSeveralForCurrent.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsAndCompleteSeveralForCurrent.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsAndCompleteSeveralForCurrent.java
index b4845bf..addb375 100644
--- a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsAndCompleteSeveralForCurrent.java
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsAndCompleteSeveralForCurrent.java
@@ -18,23 +18,13 @@
*/
package fixture.todo.scenarios;
-import fixture.todo.simple.ToDoItemsComplete;
-import fixture.todo.simple.ToDoItemsCreate;
-import fixture.todo.simple.ToDoItemsDelete;
+import fixture.todo.simple.ToDoItemsRecreateAndCompleteSeveral;
-import org.apache.isis.applib.fixturescripts.CompositeFixtureScript;
-
-public class RecreateToDoItemsAndCompleteSeveralForCurrent extends CompositeFixtureScript {
+public class RecreateToDoItemsAndCompleteSeveralForCurrent extends ToDoItemsRecreateAndCompleteSeveral {
public RecreateToDoItemsAndCompleteSeveralForCurrent() {
- super(null, "recreate-current");
- }
-
- @Override
- protected void execute(ExecutionContext executionContext) {
- execute("delete", ToDoItemsDelete.forCurrent(), executionContext);
- execute("create", ToDoItemsCreate.forCurrent(), executionContext);
- execute("complete", ToDoItemsComplete.forCurrent(), executionContext);
+ super(null);
+ withDiscoverability(Discoverability.DISCOVERABLE);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/63e148d8/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsFor.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsFor.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsFor.java
index 5c0b9ed..b51546d 100644
--- a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsFor.java
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsFor.java
@@ -18,28 +18,19 @@
*/
package fixture.todo.scenarios;
-import com.google.common.base.Strings;
+import fixture.todo.simple.ToDoItemsRecreate;
-import fixture.todo.simple.ToDoItemsCreate;
-import fixture.todo.simple.ToDoItemsDelete;
+import com.google.common.base.Strings;
-import org.apache.isis.applib.fixturescripts.CompositeFixtureScript;
-import org.apache.isis.applib.fixturescripts.FixtureResultList;
-import org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext;
+public final class RecreateToDoItemsFor extends ToDoItemsRecreate {
-public final class RecreateToDoItemsFor extends CompositeFixtureScript {
public RecreateToDoItemsFor() {
- super(null, "recreate-specified");
+ super(null);
+ withDiscoverability(Discoverability.DISCOVERABLE);
}
@Override
public String validateRun(String parameters) {
return Strings.isNullOrEmpty(parameters) ? "Specify the owner of the ToDoItems to be recreated" : null;
}
-
- @Override
- protected void execute(ExecutionContext executionContext) {
- execute("delete", ToDoItemsDelete.forUser(null), executionContext);
- execute("create", ToDoItemsCreate.forUser(null), executionContext);
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/63e148d8/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsForDick.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsForDick.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsForDick.java
index c7b30cd..1f3a1ab 100644
--- a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsForDick.java
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsForDick.java
@@ -18,19 +18,12 @@
*/
package fixture.todo.scenarios;
-import fixture.todo.simple.ToDoItemsCreate;
-import fixture.todo.simple.ToDoItemsDelete;
+import fixture.todo.simple.ToDoItemsRecreate;
-import org.apache.isis.applib.fixturescripts.CompositeFixtureScript;
+public final class RecreateToDoItemsForDick extends ToDoItemsRecreate {
-public final class RecreateToDoItemsForDick extends CompositeFixtureScript {
public RecreateToDoItemsForDick() {
- super(null, "recreate-dick");
- }
-
- @Override
- protected void execute(ExecutionContext executionContext) {
- execute("delete", ToDoItemsDelete.forUser("dick"), executionContext);
- execute("create", ToDoItemsCreate.forUser("dick"), executionContext);
+ super("dick");
+ withDiscoverability(Discoverability.DISCOVERABLE);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/63e148d8/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsForJoe.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsForJoe.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsForJoe.java
index 9178d97..0f5f78c 100644
--- a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsForJoe.java
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsForJoe.java
@@ -18,20 +18,12 @@
*/
package fixture.todo.scenarios;
-import fixture.todo.simple.ToDoItemsCreate;
-import fixture.todo.simple.ToDoItemsDelete;
+import fixture.todo.simple.ToDoItemsRecreate;
-import org.apache.isis.applib.fixturescripts.CompositeFixtureScript;
-import org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext;
+public final class RecreateToDoItemsForJoe extends ToDoItemsRecreate {
-public final class RecreateToDoItemsForJoe extends CompositeFixtureScript {
public RecreateToDoItemsForJoe() {
- super(null, "recreate-joe");
- }
-
- @Override
- protected void execute(ExecutionContext executionContext) {
- execute("delete", ToDoItemsDelete.forUser("joe"), executionContext);
- execute("create", ToDoItemsCreate.forUser("joe"), executionContext);
+ super("joe");
+ withDiscoverability(Discoverability.DISCOVERABLE);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/63e148d8/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsForSven.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsForSven.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsForSven.java
index 018f336..a162dd8 100644
--- a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsForSven.java
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/scenarios/RecreateToDoItemsForSven.java
@@ -18,21 +18,12 @@
*/
package fixture.todo.scenarios;
-import fixture.todo.simple.ToDoItemsCreate;
-import fixture.todo.simple.ToDoItemsDelete;
+import fixture.todo.simple.ToDoItemsRecreate;
-import org.apache.isis.applib.fixturescripts.CompositeFixtureScript;
-import org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext;
+public final class RecreateToDoItemsForSven extends ToDoItemsRecreate {
-public final class RecreateToDoItemsForSven extends CompositeFixtureScript {
public RecreateToDoItemsForSven() {
- super(null, "recreate-sven");
+ super("sven");
+ withDiscoverability(Discoverability.DISCOVERABLE);
}
-
- @Override
- protected void execute(ExecutionContext executionContext) {
- execute("delete", ToDoItemsDelete.forUser("sven"), executionContext);
- execute("create", ToDoItemsCreate.forUser("sven"), executionContext);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/63e148d8/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
deleted file mode 100644
index a02e00e..0000000
--- a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsComplete.java
+++ /dev/null
@@ -1,83 +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.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 org.apache.isis.applib.fixturescripts.FixtureResultList;
-import org.apache.isis.applib.fixturescripts.SimpleFixtureScript;
-import org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext;
-
-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(null, Util.localNameFor("complete", user));
- this.user = user;
- }
- //endregion
-
- //region > doRun
- @Override
- protected void execute(ExecutionContext executionContext) {
- final String ownedBy = Util.coalesce(user, executionContext.getParameters(), getContainer().getUser().getName());
- installFor(ownedBy, executionContext);
- getContainer().flush();
- }
-
- private void installFor(final String user, final ExecutionContext executionContext) {
- complete(user, "Buy stamps", executionContext);
- complete(user, "Write blog post", executionContext);
-
- getContainer().flush();
- }
-
- private void complete(final String user, final String description, final ExecutionContext executionContext) {
- final ToDoItem toDoItem = findToDoItem(description, user);
- toDoItem.setComplete(true);
- executionContext.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/63e148d8/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
deleted file mode 100644
index 09a613b..0000000
--- a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsCreate.java
+++ /dev/null
@@ -1,103 +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.simple;
-
-import dom.todo.ToDoItem;
-import dom.todo.ToDoItem.Category;
-import dom.todo.ToDoItem.Subcategory;
-import dom.todo.ToDoItems;
-
-import java.math.BigDecimal;
-import org.joda.time.LocalDate;
-import org.apache.isis.applib.fixturescripts.SimpleFixtureScript;
-import org.apache.isis.applib.services.clock.ClockService;
-
-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(null, Util.localNameFor("create", user));
- this.user = user;
- }
- //endregion
-
- //region > execute
- @Override
- protected void execute(ExecutionContext executionContext) {
- final String ownedBy = Util.coalesce(user, executionContext.getParameters(), getContainer().getUser().getName());
- installFor(ownedBy, executionContext);
- getContainer().flush();
- }
-
- private void installFor(final String user, final ExecutionContext executionContext) {
-
- createToDoItemForUser("Buy milk", Category.Domestic, Subcategory.Shopping, user, nowPlusDays(0), new BigDecimal("0.75"), executionContext);
- createToDoItemForUser("Buy bread", Category.Domestic, Subcategory.Shopping, user, nowPlusDays(0), new BigDecimal("1.75"), executionContext);
- createToDoItemForUser("Buy stamps", Category.Domestic, Subcategory.Shopping, user, nowPlusDays(0), new BigDecimal("10.00"), executionContext);
- createToDoItemForUser("Pick up laundry", Category.Domestic, Subcategory.Chores, user, nowPlusDays(6), new BigDecimal("7.50"), executionContext);
- createToDoItemForUser("Mow lawn", Category.Domestic, Subcategory.Garden, user, nowPlusDays(6), null, executionContext);
- createToDoItemForUser("Vacuum house", Category.Domestic, Subcategory.Housework, user, nowPlusDays(3), null, executionContext);
- createToDoItemForUser("Sharpen knives", Category.Domestic, Subcategory.Chores, user, nowPlusDays(14), null, executionContext);
-
- createToDoItemForUser("Write to penpal", Category.Other, Subcategory.Other, user, null, null, executionContext);
-
- createToDoItemForUser("Write blog post", Category.Professional, Subcategory.Marketing, user, nowPlusDays(7), null, executionContext);
- createToDoItemForUser("Organize brown bag", Category.Professional, Subcategory.Consulting, user, nowPlusDays(14), null, executionContext);
- createToDoItemForUser("Submit conference session", Category.Professional, Subcategory.Education, user, nowPlusDays(21), null, executionContext);
- createToDoItemForUser("Stage Isis release", Category.Professional, Subcategory.OpenSource, user, null, null, executionContext);
-
- getContainer().flush();
- }
-
- private ToDoItem createToDoItemForUser(
- final String description,
- final Category category, Subcategory subcategory,
- final String user,
- final LocalDate dueBy,
- final BigDecimal cost,
- final ExecutionContext executionContext) {
- ToDoItem newToDo = toDoItems.newToDo(description, category, subcategory, user, dueBy, cost);
- return executionContext.add(this, newToDo);
- }
-
- private LocalDate nowPlusDays(int days) {
- return clockService.now().plusDays(days);
- }
- //endregion
-
- //region > injected services
- @javax.inject.Inject
- private ToDoItems toDoItems;
-
- @javax.inject.Inject
- private ClockService clockService;
- //endregion
-
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/63e148d8/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
index ac38dea..b7fdce7 100644
--- 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
@@ -18,25 +18,18 @@
*/
package fixture.todo.simple;
-import org.apache.isis.applib.fixturescripts.FixtureResultList;
-import org.apache.isis.applib.fixturescripts.SimpleFixtureScript;
-import org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext;
+import org.apache.isis.applib.fixturescripts.FixtureScript;
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);
- }
+public class ToDoItemsDelete extends FixtureScript {
+ //region > constructor
private final String user;
-
- private ToDoItemsDelete(final String user) {
+
+ /**
+ * @param user - if null then executes for the current user or will use any {@link #run(String) parameters} provided when run.
+ */
+ public ToDoItemsDelete(final String user) {
super(null, Util.localNameFor("delete", user));
this.user = user;
}
@@ -46,13 +39,10 @@ public class ToDoItemsDelete extends SimpleFixtureScript {
@Override
protected void execute(ExecutionContext executionContext) {
final String ownedBy = Util.coalesce(user, executionContext.getParameters(), 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
http://git-wip-us.apache.org/repos/asf/isis/blob/63e148d8/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsRecreate.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsRecreate.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsRecreate.java
new file mode 100644
index 0000000..81045e9
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsRecreate.java
@@ -0,0 +1,95 @@
+/*
+ * 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 dom.todo.ToDoItem;
+import dom.todo.ToDoItem.Category;
+import dom.todo.ToDoItem.Subcategory;
+import dom.todo.ToDoItems;
+
+import java.math.BigDecimal;
+import org.joda.time.LocalDate;
+import org.apache.isis.applib.fixturescripts.FixtureScript;
+import org.apache.isis.applib.services.clock.ClockService;
+
+public class ToDoItemsRecreate extends FixtureScript {
+
+ //region > constructor
+ private final String user;
+
+ /**
+ * @param user - if null then executes for the current user or will use any {@link #run(String) parameters} provided when run.
+ */
+ public ToDoItemsRecreate(final String user) {
+ super(null, Util.localNameFor("create", user));
+ this.user = user;
+ }
+ //endregion
+
+ //region > execute
+ @Override
+ protected void execute(ExecutionContext executionContext) {
+ final String ownedBy = Util.coalesce(user, executionContext.getParameters(), getContainer().getUser().getName());
+
+ // prereqs
+ execute(new ToDoItemsDelete(null), executionContext);
+
+ // this fixture
+ createToDoItem("Buy milk", Category.Domestic, Subcategory.Shopping, ownedBy, nowPlusDays(0), new BigDecimal("0.75"), executionContext);
+ createToDoItem("Buy bread", Category.Domestic, Subcategory.Shopping, ownedBy, nowPlusDays(0), new BigDecimal("1.75"), executionContext);
+ createToDoItem("Buy stamps", Category.Domestic, Subcategory.Shopping, ownedBy, nowPlusDays(0), new BigDecimal("10.00"), executionContext);
+ createToDoItem("Pick up laundry", Category.Domestic, Subcategory.Chores, ownedBy, nowPlusDays(6), new BigDecimal("7.50"), executionContext);
+ createToDoItem("Mow lawn", Category.Domestic, Subcategory.Garden, ownedBy, nowPlusDays(6), null, executionContext);
+ createToDoItem("Vacuum house", Category.Domestic, Subcategory.Housework, ownedBy, nowPlusDays(3), null, executionContext);
+ createToDoItem("Sharpen knives", Category.Domestic, Subcategory.Chores, ownedBy, nowPlusDays(14), null, executionContext);
+
+ createToDoItem("Write to penpal", Category.Other, Subcategory.Other, ownedBy, null, null, executionContext);
+
+ createToDoItem("Write blog post", Category.Professional, Subcategory.Marketing, ownedBy, nowPlusDays(7), null, executionContext);
+ createToDoItem("Organize brown bag", Category.Professional, Subcategory.Consulting, ownedBy, nowPlusDays(14), null, executionContext);
+ createToDoItem("Submit conference session", Category.Professional, Subcategory.Education, ownedBy, nowPlusDays(21), null, executionContext);
+ createToDoItem("Stage Isis release", Category.Professional, Subcategory.OpenSource, ownedBy, null, null, executionContext);
+ }
+
+ private ToDoItem createToDoItem(
+ final String description,
+ final Category category, Subcategory subcategory,
+ final String user,
+ final LocalDate dueBy,
+ final BigDecimal cost,
+ final ExecutionContext executionContext) {
+ ToDoItem newToDo = toDoItems.newToDo(description, category, subcategory, user, dueBy, cost);
+ return executionContext.add(this, newToDo);
+ }
+
+ private LocalDate nowPlusDays(int days) {
+ return clockService.now().plusDays(days);
+ }
+ //endregion
+
+ //region > injected services
+ @javax.inject.Inject
+ private ToDoItems toDoItems;
+
+ @javax.inject.Inject
+ private ClockService clockService;
+ //endregion
+
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/63e148d8/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsRecreateAndCompleteSeveral.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsRecreateAndCompleteSeveral.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsRecreateAndCompleteSeveral.java
new file mode 100644
index 0000000..dd3c3bb
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/simple/ToDoItemsRecreateAndCompleteSeveral.java
@@ -0,0 +1,72 @@
+/*
+ * 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 dom.todo.ToDoItem;
+
+import java.util.Collection;
+import com.google.common.base.Objects;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
+import org.apache.isis.applib.fixturescripts.FixtureScript;
+
+public class ToDoItemsRecreateAndCompleteSeveral extends FixtureScript {
+
+ //region > constructor
+ private final String user;
+ /**
+ * @param user - if null then executes for the current user or will use any {@link #run(String) parameters} provided when run.
+ */
+ public ToDoItemsRecreateAndCompleteSeveral(final String user) {
+ super(null, Util.localNameFor("complete", user));
+ this.user = user;
+ }
+ //endregion
+
+ //region > doRun
+ @Override
+ protected void execute(ExecutionContext executionContext) {
+ final String ownedBy = Util.coalesce(user, executionContext.getParameters(), getContainer().getUser().getName());
+
+ // prereqs
+ execute(new ToDoItemsRecreate(null), executionContext);
+
+ // this fixture
+ complete(ownedBy, "Buy stamps", executionContext);
+ complete(ownedBy, "Write blog post", executionContext);
+ }
+
+ private void complete(final String user, final String description, final ExecutionContext executionContext) {
+ final ToDoItem toDoItem = findToDoItem(description, user);
+ toDoItem.setComplete(true);
+ executionContext.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/63e148d8/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 e959928..8f4c2bb 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
@@ -37,11 +37,9 @@ import static org.junit.Assert.assertThat;
public class ToDoItemContributionsTest_updateCategory extends ToDoIntegTest {
-
-
@Before
public void setUpData() throws Exception {
- scenarioExecution().install(new ToDoItemsIntegTestFixture());
+ scenarioExecution().install(new ToDoItemsIntegTestFixture().withTracing());
}
@Inject
http://git-wip-us.apache.org/repos/asf/isis/blob/63e148d8/example/application/simple_wicket_restful_jdo/fixture/src/main/java/fixture/simple/SimpleObjectsFixture.java
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/fixture/src/main/java/fixture/simple/SimpleObjectsFixture.java b/example/application/simple_wicket_restful_jdo/fixture/src/main/java/fixture/simple/SimpleObjectsFixture.java
index 148fc42..b96ec5d 100644
--- a/example/application/simple_wicket_restful_jdo/fixture/src/main/java/fixture/simple/SimpleObjectsFixture.java
+++ b/example/application/simple_wicket_restful_jdo/fixture/src/main/java/fixture/simple/SimpleObjectsFixture.java
@@ -22,45 +22,31 @@ package fixture.simple;
import dom.simple.SimpleObject;
import dom.simple.SimpleObjects;
-import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.objectstore.jdo.applib.service.support.IsisJdoSupport;
+import org.apache.isis.applib.fixturescripts.FixtureScript;
-public class SimpleObjectsFixture extends AbstractFixture {
+public class SimpleObjectsFixture extends FixtureScript {
-
@Override
- public void install() {
+ protected void execute(ExecutionContext executionContext) {
- isisJdoSupport.executeUpdate("delete from \"SimpleObject\"");
-
- installObjects();
-
- getContainer().flush();
- }
-
- private void installObjects() {
+ // prereqs
+ execute(new SimpleObjectsTearDownFixture(), executionContext);
+ // create
create("Foo");
create("Bar");
create("Baz");
}
-
// //////////////////////////////////////
private SimpleObject create(final String name) {
return simpleObjects.create(name);
}
-
- // //////////////////////////////////////
- // Injected services
// //////////////////////////////////////
@javax.inject.Inject
private SimpleObjects simpleObjects;
- @javax.inject.Inject
- private IsisJdoSupport isisJdoSupport;
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/63e148d8/example/application/simple_wicket_restful_jdo/fixture/src/main/java/fixture/simple/SimpleObjectsTearDownFixture.java
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/fixture/src/main/java/fixture/simple/SimpleObjectsTearDownFixture.java b/example/application/simple_wicket_restful_jdo/fixture/src/main/java/fixture/simple/SimpleObjectsTearDownFixture.java
new file mode 100644
index 0000000..2f9be56
--- /dev/null
+++ b/example/application/simple_wicket_restful_jdo/fixture/src/main/java/fixture/simple/SimpleObjectsTearDownFixture.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.simple;
+
+import org.apache.isis.applib.fixturescripts.FixtureScript;
+import org.apache.isis.objectstore.jdo.applib.service.support.IsisJdoSupport;
+
+public class SimpleObjectsTearDownFixture extends FixtureScript {
+
+ @Override
+ protected void execute(ExecutionContext executionContext) {
+ isisJdoSupport.executeUpdate("delete from \"SimpleObject\"");
+ }
+
+
+ @javax.inject.Inject
+ private IsisJdoSupport isisJdoSupport;
+
+}