Return-Path: X-Original-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E03BA25CF for ; Tue, 3 May 2011 07:19:58 +0000 (UTC) Received: (qmail 81120 invoked by uid 500); 3 May 2011 07:19:52 -0000 Delivered-To: apmail-incubator-isis-commits-archive@incubator.apache.org Received: (qmail 79732 invoked by uid 500); 3 May 2011 07:19:33 -0000 Mailing-List: contact isis-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: isis-dev@incubator.apache.org Delivered-To: mailing list isis-commits@incubator.apache.org Received: (qmail 79582 invoked by uid 99); 3 May 2011 07:19:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2011 07:19:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2011 07:19:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C88572388B42; Tue, 3 May 2011 07:18:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098945 [5/25] - in /incubator/isis/trunk/viewer: bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/ bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/ bdd/common/src/main/java/org/apache/isis/viewer/bdd/common... Date: Tue, 03 May 2011 07:18:38 -0000 To: isis-commits@incubator.apache.org From: danhaywood@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110503071847.C88572388B42@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Containment.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Containment.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Containment.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Containment.java Tue May 3 07:18:19 2011 @@ -16,61 +16,54 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections; - -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.spec.feature.ObjectMember; -import org.apache.isis.viewer.bdd.common.CellBinding; -import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; -import org.apache.isis.viewer.bdd.common.ScenarioCell; -import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; -import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsContainment; - -public class Containment extends ThatAbstract { - - private final AssertsContainment assertion; - - public Containment(final AssertsContainment assertion) { - super(assertion.getKey()); - this.assertion = assertion; - } - - @Override - protected void doThat(final PerformContext performContext, - final Iterable collection) - throws ScenarioBoundValueException { - - final ObjectMember nakedObjectMember = performContext - .getObjectMember(); - final CellBinding thatBinding = performContext.getPeer() - .getThatItBinding(); - final CellBinding arg0Binding = performContext.getPeer() - .getArg0Binding(); - - if (!arg0Binding.isFound()) { - throw ScenarioBoundValueException.current(thatBinding, - "(requires argument)"); - } - - final ScenarioCell arg0Cell = arg0Binding.getCurrentCell(); - - final ObjectAdapter containedAdapter = performContext.getPeer() - .getAdapter(null, nakedObjectMember.getSpecification(), - arg0Binding, arg0Cell); - - boolean contains = false; - for (final ObjectAdapter eachAdapter : collection) { - if (containedAdapter == eachAdapter) { - contains = true; - break; - } - } - - if (!assertion.isSatisfiedBy(contains)) { - throw ScenarioBoundValueException.current(arg0Binding, assertion - .getErrorMsgIfNotSatisfied()); - } - - } - -} +package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections; + +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.spec.feature.ObjectMember; +import org.apache.isis.viewer.bdd.common.CellBinding; +import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; +import org.apache.isis.viewer.bdd.common.ScenarioCell; +import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; +import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsContainment; + +public class Containment extends ThatAbstract { + + private final AssertsContainment assertion; + + public Containment(final AssertsContainment assertion) { + super(assertion.getKey()); + this.assertion = assertion; + } + + @Override + protected void doThat(final PerformContext performContext, final Iterable collection) + throws ScenarioBoundValueException { + + final ObjectMember nakedObjectMember = performContext.getObjectMember(); + final CellBinding thatBinding = performContext.getPeer().getThatItBinding(); + final CellBinding arg0Binding = performContext.getPeer().getArg0Binding(); + + if (!arg0Binding.isFound()) { + throw ScenarioBoundValueException.current(thatBinding, "(requires argument)"); + } + + final ScenarioCell arg0Cell = arg0Binding.getCurrentCell(); + + final ObjectAdapter containedAdapter = + performContext.getPeer().getAdapter(null, nakedObjectMember.getSpecification(), arg0Binding, arg0Cell); + + boolean contains = false; + for (final ObjectAdapter eachAdapter : collection) { + if (containedAdapter == eachAdapter) { + contains = true; + break; + } + } + + if (!assertion.isSatisfiedBy(contains)) { + throw ScenarioBoundValueException.current(arg0Binding, assertion.getErrorMsgIfNotSatisfied()); + } + + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Emptiness.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Emptiness.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Emptiness.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Emptiness.java Tue May 3 07:18:19 2011 @@ -16,40 +16,37 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections; - -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.viewer.bdd.common.CellBinding; -import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; -import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; -import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsEmpty; - -public class Emptiness extends ThatAbstract { - - private final AssertsEmpty assertion; - - public Emptiness(final AssertsEmpty assertion) { - super(assertion.getKey()); - this.assertion = assertion; - } - - @Override - protected void doThat(final PerformContext performContext, - final Iterable collection) - throws ScenarioBoundValueException { - - boolean empty = true; - for (@SuppressWarnings("unused") - final ObjectAdapter eachObject : collection) { - empty = false; - } - - if (!assertion.isSatisfiedBy(empty)) { - CellBinding thatItBinding = performContext.getPeer() - .getThatItBinding(); - throw ScenarioBoundValueException.current(thatItBinding, assertion - .getErrorMsgIfNotSatisfied()); - } - } - -} +package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections; + +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.viewer.bdd.common.CellBinding; +import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; +import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; +import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsEmpty; + +public class Emptiness extends ThatAbstract { + + private final AssertsEmpty assertion; + + public Emptiness(final AssertsEmpty assertion) { + super(assertion.getKey()); + this.assertion = assertion; + } + + @Override + protected void doThat(final PerformContext performContext, final Iterable collection) + throws ScenarioBoundValueException { + + boolean empty = true; + for (@SuppressWarnings("unused") + final ObjectAdapter eachObject : collection) { + empty = false; + } + + if (!assertion.isSatisfiedBy(empty)) { + final CellBinding thatItBinding = performContext.getPeer().getThatItBinding(); + throw ScenarioBoundValueException.current(thatItBinding, assertion.getErrorMsgIfNotSatisfied()); + } + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedAddTo.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedAddTo.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedAddTo.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedAddTo.java Tue May 3 07:18:19 2011 @@ -16,30 +16,28 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections; - -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.consent.Consent; -import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation; -import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; -import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsValidity; -import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ProposedArgumentValidityAbstract; - -public class ProposedAddTo extends ProposedArgumentValidityAbstract { - - public ProposedAddTo(final AssertsValidity assertion) { - super(assertion); - } - - @Override - protected Consent determineConsent(final PerformContext performContext, - final ObjectAdapter toValidateAdapter) { - - final ObjectAdapter onAdapter = performContext.getOnAdapter(); - final OneToManyAssociation otma = (OneToManyAssociation) performContext - .getObjectMember(); - - return otma.isValidToAdd(onAdapter, toValidateAdapter); - } - -} +package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections; + +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.consent.Consent; +import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation; +import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; +import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsValidity; +import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ProposedArgumentValidityAbstract; + +public class ProposedAddTo extends ProposedArgumentValidityAbstract { + + public ProposedAddTo(final AssertsValidity assertion) { + super(assertion); + } + + @Override + protected Consent determineConsent(final PerformContext performContext, final ObjectAdapter toValidateAdapter) { + + final ObjectAdapter onAdapter = performContext.getOnAdapter(); + final OneToManyAssociation otma = (OneToManyAssociation) performContext.getObjectMember(); + + return otma.isValidToAdd(onAdapter, toValidateAdapter); + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedRemoveFrom.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedRemoveFrom.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedRemoveFrom.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedRemoveFrom.java Tue May 3 07:18:19 2011 @@ -16,30 +16,28 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections; - -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.consent.Consent; -import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation; -import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; -import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsValidity; -import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ProposedArgumentValidityAbstract; - -public class ProposedRemoveFrom extends ProposedArgumentValidityAbstract { - - public ProposedRemoveFrom(final AssertsValidity assertion) { - super(assertion); - } - - @Override - protected Consent determineConsent(final PerformContext performContext, - final ObjectAdapter toValidateAdapter) { - - final ObjectAdapter onAdapter = performContext.getOnAdapter(); - final OneToManyAssociation otma = (OneToManyAssociation) performContext - .getObjectMember(); - - return otma.isValidToRemove(onAdapter, toValidateAdapter); - } - -} +package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections; + +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.consent.Consent; +import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation; +import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; +import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsValidity; +import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ProposedArgumentValidityAbstract; + +public class ProposedRemoveFrom extends ProposedArgumentValidityAbstract { + + public ProposedRemoveFrom(final AssertsValidity assertion) { + super(assertion); + } + + @Override + protected Consent determineConsent(final PerformContext performContext, final ObjectAdapter toValidateAdapter) { + + final ObjectAdapter onAdapter = performContext.getOnAdapter(); + final OneToManyAssociation otma = (OneToManyAssociation) performContext.getObjectMember(); + + return otma.isValidToRemove(onAdapter, toValidateAdapter); + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Size.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Size.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Size.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Size.java Tue May 3 07:18:19 2011 @@ -16,56 +16,55 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections; - -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.viewer.bdd.common.CellBinding; -import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; -import org.apache.isis.viewer.bdd.common.ScenarioCell; -import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; - -public class Size extends ThatAbstract { - - public Size() { - super("size"); - } - - @Override - protected void doThat(final PerformContext performContext, - final Iterable collection) throws ScenarioBoundValueException { - - final CellBinding thatBinding = performContext.getPeer().getThatItBinding(); - final CellBinding arg0Binding = performContext.getPeer().getArg0Binding(); - - if (!arg0Binding.isFound()) { - throw ScenarioBoundValueException.current(thatBinding, - "(requires argument)"); - } - - final ScenarioCell arg0Cell = arg0Binding.getCurrentCell(); - - final String expectedSizeStr = arg0Cell.getText(); - final int expectedSize; - try { - expectedSize = Integer.parseInt(expectedSizeStr); - } catch (final NumberFormatException ex) { - throw ScenarioBoundValueException.current(arg0Binding, "(not an integer)"); - } - - if (expectedSize <= 0) { - throw ScenarioBoundValueException.current(arg0Binding, "(not a positive integer)"); - } - - int actualSize = 0; - for (@SuppressWarnings("unused") - final ObjectAdapter eachObject : collection) { - actualSize++; - } - - if (expectedSize != actualSize) { - throw ScenarioBoundValueException.current(arg0Binding, "" + actualSize); - } - - } - -} +package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections; + +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.viewer.bdd.common.CellBinding; +import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; +import org.apache.isis.viewer.bdd.common.ScenarioCell; +import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; + +public class Size extends ThatAbstract { + + public Size() { + super("size"); + } + + @Override + protected void doThat(final PerformContext performContext, final Iterable collection) + throws ScenarioBoundValueException { + + final CellBinding thatBinding = performContext.getPeer().getThatItBinding(); + final CellBinding arg0Binding = performContext.getPeer().getArg0Binding(); + + if (!arg0Binding.isFound()) { + throw ScenarioBoundValueException.current(thatBinding, "(requires argument)"); + } + + final ScenarioCell arg0Cell = arg0Binding.getCurrentCell(); + + final String expectedSizeStr = arg0Cell.getText(); + final int expectedSize; + try { + expectedSize = Integer.parseInt(expectedSizeStr); + } catch (final NumberFormatException ex) { + throw ScenarioBoundValueException.current(arg0Binding, "(not an integer)"); + } + + if (expectedSize <= 0) { + throw ScenarioBoundValueException.current(arg0Binding, "(not a positive integer)"); + } + + int actualSize = 0; + for (@SuppressWarnings("unused") + final ObjectAdapter eachObject : collection) { + actualSize++; + } + + if (expectedSize != actualSize) { + throw ScenarioBoundValueException.current(arg0Binding, "" + actualSize); + } + + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ThatAbstract.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ThatAbstract.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ThatAbstract.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ThatAbstract.java Tue May 3 07:18:19 2011 @@ -16,39 +16,37 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections; - -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet; -import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation; -import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; -import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; -import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatSubcommandAbstract; - -public abstract class ThatAbstract extends ThatSubcommandAbstract { - - public ThatAbstract(final String key) { - super(key); - } - - public ObjectAdapter that(final PerformContext performContext) throws ScenarioBoundValueException { - - final ObjectAdapter onAdapter = performContext.getOnAdapter(); - final OneToManyAssociation otma = (OneToManyAssociation) performContext - .getObjectMember(); - - final ObjectAdapter nakedObjectRepresentingCollection = otma - .get(onAdapter); - final CollectionFacet collectionFacet = nakedObjectRepresentingCollection - .getSpecification().getFacet(CollectionFacet.class); - - doThat(performContext, collectionFacet - .iterable(nakedObjectRepresentingCollection)); - - return nakedObjectRepresentingCollection; // can alias if wish - } - - protected abstract void doThat(PerformContext performContext, - Iterable collection) throws ScenarioBoundValueException; - -} +package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections; + +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet; +import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation; +import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; +import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; +import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatSubcommandAbstract; + +public abstract class ThatAbstract extends ThatSubcommandAbstract { + + public ThatAbstract(final String key) { + super(key); + } + + @Override + public ObjectAdapter that(final PerformContext performContext) throws ScenarioBoundValueException { + + final ObjectAdapter onAdapter = performContext.getOnAdapter(); + final OneToManyAssociation otma = (OneToManyAssociation) performContext.getObjectMember(); + + final ObjectAdapter nakedObjectRepresentingCollection = otma.get(onAdapter); + final CollectionFacet collectionFacet = + nakedObjectRepresentingCollection.getSpecification().getFacet(CollectionFacet.class); + + doThat(performContext, collectionFacet.iterable(nakedObjectRepresentingCollection)); + + return nakedObjectRepresentingCollection; // can alias if wish + } + + protected abstract void doThat(PerformContext performContext, Iterable collection) + throws ScenarioBoundValueException; + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/NotSaved.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/NotSaved.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/NotSaved.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/NotSaved.java Tue May 3 07:18:19 2011 @@ -16,31 +16,31 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.object; - -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.viewer.bdd.common.CellBinding; -import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; -import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; -import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatSubcommandAbstract; - -public class NotSaved extends ThatSubcommandAbstract { - - public NotSaved() { - super("is not saved", "is not persistent", "is not persisted", - "not saved", "not persistent", "not persisted"); - } - - public ObjectAdapter that(final PerformContext performContext) throws ScenarioBoundValueException { - - final ObjectAdapter onAdapter = performContext.getOnAdapter(); - CellBinding thatItBinding = performContext.getPeer().getThatItBinding(); - - if (onAdapter.isPersistent()) { - throw ScenarioBoundValueException.current(thatItBinding, "(saved)"); - } - - return null; - } - -} +package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.object; + +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.viewer.bdd.common.CellBinding; +import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; +import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; +import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatSubcommandAbstract; + +public class NotSaved extends ThatSubcommandAbstract { + + public NotSaved() { + super("is not saved", "is not persistent", "is not persisted", "not saved", "not persistent", "not persisted"); + } + + @Override + public ObjectAdapter that(final PerformContext performContext) throws ScenarioBoundValueException { + + final ObjectAdapter onAdapter = performContext.getOnAdapter(); + final CellBinding thatItBinding = performContext.getPeer().getThatItBinding(); + + if (onAdapter.isPersistent()) { + throw ScenarioBoundValueException.current(thatItBinding, "(saved)"); + } + + return null; + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/NotValid.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/NotValid.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/NotValid.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/NotValid.java Tue May 3 07:18:19 2011 @@ -16,29 +16,30 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.object; - -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.viewer.bdd.common.CellBinding; -import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; -import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; -import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatSubcommandAbstract; - -public class NotValid extends ThatSubcommandAbstract { - - public NotValid() { - super("is not valid", "is invalid", "not valid", "invalid"); - } - - public ObjectAdapter that(final PerformContext performContext) throws ScenarioBoundValueException { - - CellBinding thatItBinding = performContext.getPeer().getThatItBinding(); - - if (performContext.validObjectConsent().isAllowed()) { - throw ScenarioBoundValueException.current(thatItBinding, "(valid)"); - } - - return null; - } - -} +package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.object; + +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.viewer.bdd.common.CellBinding; +import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; +import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; +import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatSubcommandAbstract; + +public class NotValid extends ThatSubcommandAbstract { + + public NotValid() { + super("is not valid", "is invalid", "not valid", "invalid"); + } + + @Override + public ObjectAdapter that(final PerformContext performContext) throws ScenarioBoundValueException { + + final CellBinding thatItBinding = performContext.getPeer().getThatItBinding(); + + if (performContext.validObjectConsent().isAllowed()) { + throw ScenarioBoundValueException.current(thatItBinding, "(valid)"); + } + + return null; + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/Saved.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/Saved.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/Saved.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/Saved.java Tue May 3 07:18:19 2011 @@ -16,31 +16,31 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.object; - -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.viewer.bdd.common.CellBinding; -import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; -import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; -import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatSubcommandAbstract; - -public class Saved extends ThatSubcommandAbstract { - - public Saved() { - super("is saved", "is persistent", "is persisted", "saved", - "persistent", "persisted"); - } - - public ObjectAdapter that(final PerformContext performContext) throws ScenarioBoundValueException { - - final ObjectAdapter onAdapter = performContext.getOnAdapter(); - CellBinding thatItBinding = performContext.getPeer().getThatItBinding(); - - if (!onAdapter.isPersistent()) { - throw ScenarioBoundValueException.current(thatItBinding, "(not saved)"); - } - - return null; - } - -} +package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.object; + +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.viewer.bdd.common.CellBinding; +import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; +import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; +import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatSubcommandAbstract; + +public class Saved extends ThatSubcommandAbstract { + + public Saved() { + super("is saved", "is persistent", "is persisted", "saved", "persistent", "persisted"); + } + + @Override + public ObjectAdapter that(final PerformContext performContext) throws ScenarioBoundValueException { + + final ObjectAdapter onAdapter = performContext.getOnAdapter(); + final CellBinding thatItBinding = performContext.getPeer().getThatItBinding(); + + if (!onAdapter.isPersistent()) { + throw ScenarioBoundValueException.current(thatItBinding, "(not saved)"); + } + + return null; + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/Valid.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/Valid.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/Valid.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/Valid.java Tue May 3 07:18:19 2011 @@ -16,28 +16,29 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.object; - -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.viewer.bdd.common.CellBinding; -import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; -import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; -import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatSubcommandAbstract; - -public class Valid extends ThatSubcommandAbstract { - - public Valid() { - super("is valid", "valid"); - } - - public ObjectAdapter that(final PerformContext performContext) throws ScenarioBoundValueException { - - if (!performContext.validObjectConsent().isAllowed()) { - CellBinding thatItBinding = performContext.getPeer().getThatItBinding(); - throw ScenarioBoundValueException.current(thatItBinding, "(not valid)"); - } - - return null; - } - -} +package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.object; + +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.viewer.bdd.common.CellBinding; +import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; +import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; +import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatSubcommandAbstract; + +public class Valid extends ThatSubcommandAbstract { + + public Valid() { + super("is valid", "valid"); + } + + @Override + public ObjectAdapter that(final PerformContext performContext) throws ScenarioBoundValueException { + + if (!performContext.validObjectConsent().isAllowed()) { + final CellBinding thatItBinding = performContext.getPeer().getThatItBinding(); + throw ScenarioBoundValueException.current(thatItBinding, "(not valid)"); + } + + return null; + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Contains.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Contains.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Contains.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Contains.java Tue May 3 07:18:19 2011 @@ -16,94 +16,90 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property; - -import java.util.Date; - -import org.apache.isis.core.commons.lang.StringUtils; -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation; -import org.apache.isis.core.progmodel.facets.value.date.DateValueFacet; -import org.apache.isis.viewer.bdd.common.CellBinding; -import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; -import org.apache.isis.viewer.bdd.common.ScenarioCell; -import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; -import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatSubcommandAbstract; -import org.apache.isis.viewer.bdd.common.parsers.DateParser; - -public class Contains extends ThatSubcommandAbstract { - - public Contains() { - super("contains", "is", "does contain"); - } - - @Override - public ObjectAdapter that(final PerformContext performContext) throws ScenarioBoundValueException { - - final OneToOneAssociation otoa = (OneToOneAssociation) performContext - .getObjectMember(); - - // if we have an expected result - CellBinding arg0Binding = performContext.getPeer().getArg0Binding(); - final ScenarioCell arg0Cell = arg0Binding.getCurrentCell(); - final String expected = arg0Cell.getText(); - - // get - final ObjectAdapter resultAdapter = otoa.get(performContext - .getOnAdapter()); - - // see if matches null - if (resultAdapter == null) { - if (StringUtils.isNullOrEmpty(expected)) { - return resultAdapter; - } - throw ScenarioBoundValueException.current(arg0Binding, "(is null)"); - } - - final String resultTitle = resultAdapter.titleString(); - - if (!StringUtils.isNullOrEmpty(expected)) { - - // see if expected matches an alias - final ObjectAdapter expectedAdapter = performContext.getPeer().getAliasRegistry().getAliased(expected); - if (expectedAdapter != null) { - // known - if (resultAdapter == expectedAdapter) { - return resultAdapter; - } - throw ScenarioBoundValueException.current(arg0Binding, resultTitle); - } - - // otherwise, see if date and if so compare as such - DateValueFacet dateValueFacet = resultAdapter.getSpecification().getFacet(DateValueFacet.class); - if(dateValueFacet != null) { - Date resultDate = dateValueFacet.dateValue(resultAdapter); - - DateParser dateParser = performContext.getDateParser(); - Date expectedDate = dateParser.parse(expected); - if (expectedDate != null) { - if(expectedDate.compareTo(resultDate) == 0) { - return resultAdapter; // ok - } - } - String format = dateParser.format(resultDate); - throw ScenarioBoundValueException.current(arg0Binding, format); - } - - - // otherwise, compare title - if (!StringUtils.nullSafeEquals(resultTitle, expected)) { - throw ScenarioBoundValueException.current(arg0Binding, resultTitle); - } - } else { - // try to provide a default - final String resultAlias = performContext.getPeer().getAliasRegistry().getAlias(resultAdapter); - final String resultStr = resultAlias != null ? resultAlias - : resultTitle; - performContext.getPeer().provideDefault(arg0Cell, resultStr); - } - - return resultAdapter; - } - -} +package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property; + +import java.util.Date; + +import org.apache.isis.core.commons.lang.StringUtils; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation; +import org.apache.isis.core.progmodel.facets.value.date.DateValueFacet; +import org.apache.isis.viewer.bdd.common.CellBinding; +import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; +import org.apache.isis.viewer.bdd.common.ScenarioCell; +import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; +import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatSubcommandAbstract; +import org.apache.isis.viewer.bdd.common.parsers.DateParser; + +public class Contains extends ThatSubcommandAbstract { + + public Contains() { + super("contains", "is", "does contain"); + } + + @Override + public ObjectAdapter that(final PerformContext performContext) throws ScenarioBoundValueException { + + final OneToOneAssociation otoa = (OneToOneAssociation) performContext.getObjectMember(); + + // if we have an expected result + final CellBinding arg0Binding = performContext.getPeer().getArg0Binding(); + final ScenarioCell arg0Cell = arg0Binding.getCurrentCell(); + final String expected = arg0Cell.getText(); + + // get + final ObjectAdapter resultAdapter = otoa.get(performContext.getOnAdapter()); + + // see if matches null + if (resultAdapter == null) { + if (StringUtils.isNullOrEmpty(expected)) { + return resultAdapter; + } + throw ScenarioBoundValueException.current(arg0Binding, "(is null)"); + } + + final String resultTitle = resultAdapter.titleString(); + + if (!StringUtils.isNullOrEmpty(expected)) { + + // see if expected matches an alias + final ObjectAdapter expectedAdapter = performContext.getPeer().getAliasRegistry().getAliased(expected); + if (expectedAdapter != null) { + // known + if (resultAdapter == expectedAdapter) { + return resultAdapter; + } + throw ScenarioBoundValueException.current(arg0Binding, resultTitle); + } + + // otherwise, see if date and if so compare as such + final DateValueFacet dateValueFacet = resultAdapter.getSpecification().getFacet(DateValueFacet.class); + if (dateValueFacet != null) { + final Date resultDate = dateValueFacet.dateValue(resultAdapter); + + final DateParser dateParser = performContext.getDateParser(); + final Date expectedDate = dateParser.parse(expected); + if (expectedDate != null) { + if (expectedDate.compareTo(resultDate) == 0) { + return resultAdapter; // ok + } + } + final String format = dateParser.format(resultDate); + throw ScenarioBoundValueException.current(arg0Binding, format); + } + + // otherwise, compare title + if (!StringUtils.nullSafeEquals(resultTitle, expected)) { + throw ScenarioBoundValueException.current(arg0Binding, resultTitle); + } + } else { + // try to provide a default + final String resultAlias = performContext.getPeer().getAliasRegistry().getAlias(resultAdapter); + final String resultStr = resultAlias != null ? resultAlias : resultTitle; + performContext.getPeer().provideDefault(arg0Cell, resultStr); + } + + return resultAdapter; + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/DoesNotContain.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/DoesNotContain.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/DoesNotContain.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/DoesNotContain.java Tue May 3 07:18:19 2011 @@ -16,64 +16,63 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property; - -import org.apache.isis.core.commons.lang.StringUtils; -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation; -import org.apache.isis.viewer.bdd.common.CellBinding; -import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; -import org.apache.isis.viewer.bdd.common.ScenarioCell; -import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; -import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatSubcommandAbstract; - -public class DoesNotContain extends ThatSubcommandAbstract { - - public DoesNotContain() { - super("does not contain", "is not"); - } - - public ObjectAdapter that(final PerformContext performContext) throws ScenarioBoundValueException { - - final OneToOneAssociation otoa = (OneToOneAssociation) performContext - .getObjectMember(); - - // if we have an expected result - CellBinding arg0Binding = performContext.getPeer().getArg0Binding(); - final ScenarioCell arg0Cell = arg0Binding.getCurrentCell(); - final String expected = arg0Cell.getText(); - - // get - final ObjectAdapter resultAdapter = otoa.get(performContext - .getOnAdapter()); - - // see if matches null - if (resultAdapter == null) { - // ok - return null; - } - - final String resultTitle = resultAdapter.titleString(); - - if (!StringUtils.isNullOrEmpty(expected)) { - - // see if expected matches an alias - final ObjectAdapter expectedAdapter = performContext.getPeer().getAliasRegistry().getAliased(expected); - if (expectedAdapter != null) { - // known - if (resultAdapter != expectedAdapter) { - return resultAdapter; - } - throw ScenarioBoundValueException.current(arg0Binding, "(does contain)"); - } - - // otherwise, compare title - if (StringUtils.nullSafeEquals(resultTitle, expected)) { - throw ScenarioBoundValueException.current(arg0Binding, "(does contain)"); - } - } - - return resultAdapter; - } - -} +package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property; + +import org.apache.isis.core.commons.lang.StringUtils; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation; +import org.apache.isis.viewer.bdd.common.CellBinding; +import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; +import org.apache.isis.viewer.bdd.common.ScenarioCell; +import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; +import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatSubcommandAbstract; + +public class DoesNotContain extends ThatSubcommandAbstract { + + public DoesNotContain() { + super("does not contain", "is not"); + } + + @Override + public ObjectAdapter that(final PerformContext performContext) throws ScenarioBoundValueException { + + final OneToOneAssociation otoa = (OneToOneAssociation) performContext.getObjectMember(); + + // if we have an expected result + final CellBinding arg0Binding = performContext.getPeer().getArg0Binding(); + final ScenarioCell arg0Cell = arg0Binding.getCurrentCell(); + final String expected = arg0Cell.getText(); + + // get + final ObjectAdapter resultAdapter = otoa.get(performContext.getOnAdapter()); + + // see if matches null + if (resultAdapter == null) { + // ok + return null; + } + + final String resultTitle = resultAdapter.titleString(); + + if (!StringUtils.isNullOrEmpty(expected)) { + + // see if expected matches an alias + final ObjectAdapter expectedAdapter = performContext.getPeer().getAliasRegistry().getAliased(expected); + if (expectedAdapter != null) { + // known + if (resultAdapter != expectedAdapter) { + return resultAdapter; + } + throw ScenarioBoundValueException.current(arg0Binding, "(does contain)"); + } + + // otherwise, compare title + if (StringUtils.nullSafeEquals(resultTitle, expected)) { + throw ScenarioBoundValueException.current(arg0Binding, "(does contain)"); + } + } + + return resultAdapter; + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Empty.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Empty.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Empty.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Empty.java Tue May 3 07:18:19 2011 @@ -16,43 +16,39 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property; - -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation; -import org.apache.isis.viewer.bdd.common.CellBinding; -import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; -import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; -import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatSubcommandAbstract; - -public class Empty extends ThatSubcommandAbstract { - - public Empty() { - super("is empty"); - } - - public ObjectAdapter that(final PerformContext performContext) - throws ScenarioBoundValueException { - - final OneToOneAssociation otoa = (OneToOneAssociation) performContext - .getObjectMember(); - - // get - final ObjectAdapter resultAdapter = otoa.get(performContext - .getOnAdapter()); - - if (resultAdapter != null) { - String actualStr = performContext.getPeer().getAliasRegistry() - .getAlias(resultAdapter); - if (actualStr == null) { - actualStr = resultAdapter.titleString(); - } - CellBinding thatItBinding = performContext.getPeer() - .getThatItBinding(); - throw ScenarioBoundValueException.current(thatItBinding, actualStr); - } - - return null; - } - -} +package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property; + +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation; +import org.apache.isis.viewer.bdd.common.CellBinding; +import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; +import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; +import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatSubcommandAbstract; + +public class Empty extends ThatSubcommandAbstract { + + public Empty() { + super("is empty"); + } + + @Override + public ObjectAdapter that(final PerformContext performContext) throws ScenarioBoundValueException { + + final OneToOneAssociation otoa = (OneToOneAssociation) performContext.getObjectMember(); + + // get + final ObjectAdapter resultAdapter = otoa.get(performContext.getOnAdapter()); + + if (resultAdapter != null) { + String actualStr = performContext.getPeer().getAliasRegistry().getAlias(resultAdapter); + if (actualStr == null) { + actualStr = resultAdapter.titleString(); + } + final CellBinding thatItBinding = performContext.getPeer().getThatItBinding(); + throw ScenarioBoundValueException.current(thatItBinding, actualStr); + } + + return null; + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/NotEmpty.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/NotEmpty.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/NotEmpty.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/NotEmpty.java Tue May 3 07:18:19 2011 @@ -16,39 +16,35 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property; - -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation; -import org.apache.isis.viewer.bdd.common.CellBinding; -import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; -import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; -import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatSubcommandAbstract; - -public class NotEmpty extends ThatSubcommandAbstract { - - public NotEmpty() { - super("is not empty"); - } - - public ObjectAdapter that(final PerformContext performContext) - throws ScenarioBoundValueException { - - final OneToOneAssociation otoa = (OneToOneAssociation) performContext - .getObjectMember(); - - // get - final ObjectAdapter resultAdapter = otoa.get(performContext - .getOnAdapter()); - - if (resultAdapter == null) { - CellBinding thatItBinding = performContext.getPeer() - .getThatItBinding(); - throw ScenarioBoundValueException.current(thatItBinding, - "(empty)"); - } - - return null; - } - -} +package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property; + +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation; +import org.apache.isis.viewer.bdd.common.CellBinding; +import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; +import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; +import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatSubcommandAbstract; + +public class NotEmpty extends ThatSubcommandAbstract { + + public NotEmpty() { + super("is not empty"); + } + + @Override + public ObjectAdapter that(final PerformContext performContext) throws ScenarioBoundValueException { + + final OneToOneAssociation otoa = (OneToOneAssociation) performContext.getObjectMember(); + + // get + final ObjectAdapter resultAdapter = otoa.get(performContext.getOnAdapter()); + + if (resultAdapter == null) { + final CellBinding thatItBinding = performContext.getPeer().getThatItBinding(); + throw ScenarioBoundValueException.current(thatItBinding, "(empty)"); + } + + return null; + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedClear.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedClear.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedClear.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedClear.java Tue May 3 07:18:19 2011 @@ -16,40 +16,38 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property; - -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.consent.Consent; -import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation; -import org.apache.isis.viewer.bdd.common.CellBinding; -import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; -import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; -import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsValidity; -import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatValidityAbstract; - -public class ProposedClear extends ThatValidityAbstract { - - public ProposedClear(final AssertsValidity assertion) { - super(assertion); - } - - public ObjectAdapter that(final PerformContext performContext) throws ScenarioBoundValueException { - - final ObjectAdapter onAdapter = performContext.getOnAdapter(); - final OneToOneAssociation otoa = (OneToOneAssociation) performContext - .getObjectMember(); - - final Consent validityConsent = otoa - .isAssociationValid(onAdapter, null); - - if (!getAssertion().satisfiedBy(validityConsent)) { - final CellBinding thatBinding = performContext.getPeer().getThatItBinding(); - throw ScenarioBoundValueException.current(thatBinding, - getAssertion().getReason(validityConsent)); - } - - // can only return null. - return null; - } - -} +package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property; + +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.consent.Consent; +import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation; +import org.apache.isis.viewer.bdd.common.CellBinding; +import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException; +import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; +import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsValidity; +import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatValidityAbstract; + +public class ProposedClear extends ThatValidityAbstract { + + public ProposedClear(final AssertsValidity assertion) { + super(assertion); + } + + @Override + public ObjectAdapter that(final PerformContext performContext) throws ScenarioBoundValueException { + + final ObjectAdapter onAdapter = performContext.getOnAdapter(); + final OneToOneAssociation otoa = (OneToOneAssociation) performContext.getObjectMember(); + + final Consent validityConsent = otoa.isAssociationValid(onAdapter, null); + + if (!getAssertion().satisfiedBy(validityConsent)) { + final CellBinding thatBinding = performContext.getPeer().getThatItBinding(); + throw ScenarioBoundValueException.current(thatBinding, getAssertion().getReason(validityConsent)); + } + + // can only return null. + return null; + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedSet.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedSet.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedSet.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedSet.java Tue May 3 07:18:19 2011 @@ -16,30 +16,28 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property; - -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.consent.Consent; -import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation; -import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; -import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsValidity; -import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ProposedArgumentValidityAbstract; - -public class ProposedSet extends ProposedArgumentValidityAbstract { - - public ProposedSet(final AssertsValidity assertion) { - super(assertion); - } - - @Override - protected Consent determineConsent(final PerformContext performContext, - final ObjectAdapter toValidateAdapter) { - - final ObjectAdapter onAdapter = performContext.getOnAdapter(); - final OneToOneAssociation otoa = (OneToOneAssociation) performContext - .getObjectMember(); - - return otoa.isAssociationValid(onAdapter, toValidateAdapter); - } - -} +package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property; + +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.consent.Consent; +import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation; +import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext; +import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsValidity; +import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ProposedArgumentValidityAbstract; + +public class ProposedSet extends ProposedArgumentValidityAbstract { + + public ProposedSet(final AssertsValidity assertion) { + super(assertion); + } + + @Override + protected Consent determineConsent(final PerformContext performContext, final ObjectAdapter toValidateAdapter) { + + final ObjectAdapter onAdapter = performContext.getOnAdapter(); + final OneToOneAssociation otoa = (OneToOneAssociation) performContext.getObjectMember(); + + return otoa.isAssociationValid(onAdapter, toValidateAdapter); + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/parsers/DateParser.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/parsers/DateParser.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/parsers/DateParser.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/parsers/DateParser.java Tue May 3 07:18:19 2011 @@ -16,115 +16,115 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.parsers; - -import java.text.DateFormat; -import java.text.MessageFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.TimeZone; - -/** - * A mutable wrapper around a {@link DateFormat}, allowing the date and time - * parts of the format to be specified independently specified. - */ -public class DateParser { - - /** - * Taken from the {@link org.apache.isis.applib.value.Date} - */ - private static final TimeZone UTC_TIME_ZONE; - static { - TimeZone timeZone = TimeZone.getTimeZone("Etc/UTC"); - if (timeZone == null) { - timeZone = TimeZone.getTimeZone("UTC"); - } - UTC_TIME_ZONE = timeZone; - } - - private static final String DEFAULT_DATE_MASK = "yyyy-MM-dd"; - private static final String DEFAULT_TIME_MASK = "hh:mm"; - - private String dateMask = DEFAULT_DATE_MASK; - private String timeMask = DEFAULT_TIME_MASK; - private DateFormat dateAndTimeFormat = null; - private DateFormat dateOnlyFormat = null; - private DateFormat timeOnlyFormat = null; - - public DateParser() { - } - - public Date parse(String dateAndOrTimeStr) { - try { - return getDateAndTimeFormat().parse(dateAndOrTimeStr); - } catch (ParseException e) { - try { - return getDateFormat().parse(dateAndOrTimeStr); - } catch (ParseException e2) { - try { - return getTimeFormat().parse(dateAndOrTimeStr); - } catch (ParseException e3) { - return null; - } - } - } - } - - public void setDateFormat(String dateMask) { - this.dateMask = dateMask; - invalidateFormats(); - } - - public void setTimeFormat(String timeMask) { - this.timeMask = timeMask; - invalidateFormats(); - } - - private void invalidateFormats() { - this.dateAndTimeFormat = null; - this.dateOnlyFormat = null; - this.timeOnlyFormat = null; - } - - public String format(Date resultDate) { - return getDateAndTimeFormat().format(resultDate); - } - - private DateFormat getDateAndTimeFormat() { - if (dateAndTimeFormat == null) { - dateAndTimeFormat = getUTCDateFormat(getCombinedMask()); - } - return dateAndTimeFormat; - } - - private DateFormat getTimeFormat() { - if (timeOnlyFormat == null) { - timeOnlyFormat = getUTCDateFormat(timeMask); - } - return timeOnlyFormat; - } - - private DateFormat getDateFormat() { - if (dateOnlyFormat == null) { - dateOnlyFormat = getUTCDateFormat(dateMask); - } - return dateOnlyFormat; - } - - private DateFormat getUTCDateFormat(String dateTimeMask) { - DateFormat dateFormat = new SimpleDateFormat(dateTimeMask); - dateFormat.setTimeZone(UTC_TIME_ZONE); - return dateFormat; - } - - public String getCombinedMask() { - return MessageFormat.format("{0} {1}", dateMask, timeMask); - } - - @Override - public String toString() { - return getCombinedMask(); - } - -} +package org.apache.isis.viewer.bdd.common.parsers; + +import java.text.DateFormat; +import java.text.MessageFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.TimeZone; + +/** + * A mutable wrapper around a {@link DateFormat}, allowing the date and time parts of the format to be specified + * independently specified. + */ +public class DateParser { + + /** + * Taken from the {@link org.apache.isis.applib.value.Date} + */ + private static final TimeZone UTC_TIME_ZONE; + static { + TimeZone timeZone = TimeZone.getTimeZone("Etc/UTC"); + if (timeZone == null) { + timeZone = TimeZone.getTimeZone("UTC"); + } + UTC_TIME_ZONE = timeZone; + } + + private static final String DEFAULT_DATE_MASK = "yyyy-MM-dd"; + private static final String DEFAULT_TIME_MASK = "hh:mm"; + + private String dateMask = DEFAULT_DATE_MASK; + private String timeMask = DEFAULT_TIME_MASK; + private DateFormat dateAndTimeFormat = null; + private DateFormat dateOnlyFormat = null; + private DateFormat timeOnlyFormat = null; + + public DateParser() { + } + + public Date parse(final String dateAndOrTimeStr) { + try { + return getDateAndTimeFormat().parse(dateAndOrTimeStr); + } catch (final ParseException e) { + try { + return getDateFormat().parse(dateAndOrTimeStr); + } catch (final ParseException e2) { + try { + return getTimeFormat().parse(dateAndOrTimeStr); + } catch (final ParseException e3) { + return null; + } + } + } + } + + public void setDateFormat(final String dateMask) { + this.dateMask = dateMask; + invalidateFormats(); + } + + public void setTimeFormat(final String timeMask) { + this.timeMask = timeMask; + invalidateFormats(); + } + + private void invalidateFormats() { + this.dateAndTimeFormat = null; + this.dateOnlyFormat = null; + this.timeOnlyFormat = null; + } + + public String format(final Date resultDate) { + return getDateAndTimeFormat().format(resultDate); + } + + private DateFormat getDateAndTimeFormat() { + if (dateAndTimeFormat == null) { + dateAndTimeFormat = getUTCDateFormat(getCombinedMask()); + } + return dateAndTimeFormat; + } + + private DateFormat getTimeFormat() { + if (timeOnlyFormat == null) { + timeOnlyFormat = getUTCDateFormat(timeMask); + } + return timeOnlyFormat; + } + + private DateFormat getDateFormat() { + if (dateOnlyFormat == null) { + dateOnlyFormat = getUTCDateFormat(dateMask); + } + return dateOnlyFormat; + } + + private DateFormat getUTCDateFormat(final String dateTimeMask) { + final DateFormat dateFormat = new SimpleDateFormat(dateTimeMask); + dateFormat.setTimeZone(UTC_TIME_ZONE); + return dateFormat; + } + + public String getCombinedMask() { + return MessageFormat.format("{0} {1}", dateMask, timeMask); + } + + @Override + public String toString() { + return getCombinedMask(); + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/AbstractHelper.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/AbstractHelper.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/AbstractHelper.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/AbstractHelper.java Tue May 3 07:18:19 2011 @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.story.bootstrapping; - -import org.apache.isis.viewer.bdd.common.Scenario; - -public abstract class AbstractHelper { - - private final Scenario story; - - public AbstractHelper(final Scenario story) { - this.story = story; - } - - protected Scenario getStory() { - return story; - } - -} +package org.apache.isis.viewer.bdd.common.story.bootstrapping; + +import org.apache.isis.viewer.bdd.common.Scenario; + +public abstract class AbstractHelper { + + private final Scenario story; + + public AbstractHelper(final Scenario story) { + this.story = story; + } + + protected Scenario getStory() { + return story; + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/OpenSession.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/OpenSession.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/OpenSession.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/OpenSession.java Tue May 3 07:18:19 2011 @@ -16,37 +16,37 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.story.bootstrapping; - -import java.util.List; - -import org.apache.isis.applib.fixtures.LogonFixture; -import org.apache.isis.core.commons.authentication.AuthenticationSession; -import org.apache.isis.core.runtime.authentication.AuthenticationManager; -import org.apache.isis.runtimes.dflt.runtime.fixtures.authentication.AuthenticationRequestLogonFixture; -import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; -import org.apache.isis.viewer.bdd.common.Scenario; - -public class OpenSession { - - @SuppressWarnings("unused") - private final Scenario story; - - public OpenSession(final Scenario story) { - this.story = story; - } - - public void openSession(final String userName, final List roles) { - IsisContext.closeSession(); - final LogonFixture logonFixture = new LogonFixture(userName, roles); - final AuthenticationRequestLogonFixture authRequest = new AuthenticationRequestLogonFixture(logonFixture); - final AuthenticationSession authSession = getAuthenticationManager().authenticate(authRequest); - - IsisContext.openSession(authSession); - } - - protected AuthenticationManager getAuthenticationManager() { - return IsisContext.getAuthenticationManager(); - } - -} +package org.apache.isis.viewer.bdd.common.story.bootstrapping; + +import java.util.List; + +import org.apache.isis.applib.fixtures.LogonFixture; +import org.apache.isis.core.commons.authentication.AuthenticationSession; +import org.apache.isis.core.runtime.authentication.AuthenticationManager; +import org.apache.isis.runtimes.dflt.runtime.fixtures.authentication.AuthenticationRequestLogonFixture; +import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; +import org.apache.isis.viewer.bdd.common.Scenario; + +public class OpenSession { + + @SuppressWarnings("unused") + private final Scenario story; + + public OpenSession(final Scenario story) { + this.story = story; + } + + public void openSession(final String userName, final List roles) { + IsisContext.closeSession(); + final LogonFixture logonFixture = new LogonFixture(userName, roles); + final AuthenticationRequestLogonFixture authRequest = new AuthenticationRequestLogonFixture(logonFixture); + final AuthenticationSession authSession = getAuthenticationManager().authenticate(authRequest); + + IsisContext.openSession(authSession); + } + + protected AuthenticationManager getAuthenticationManager() { + return IsisContext.getAuthenticationManager(); + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/RunViewer.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/RunViewer.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/RunViewer.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/RunViewer.java Tue May 3 07:18:19 2011 @@ -16,28 +16,28 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.story.bootstrapping; - -import org.apache.isis.runtimes.dflt.runtime.installerregistry.InstallerLookup; -import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.IsisViewerInstaller; -import org.apache.isis.runtimes.dflt.runtime.viewer.IsisViewer; -import org.apache.isis.viewer.bdd.common.Scenario; - -public class RunViewer extends AbstractHelper { - - private static final String DND_VIEWER_NAME = "dnd"; - - public RunViewer(final Scenario story) { - super(story); - } - - public void run() { - final InstallerLookup installerLookup = getStory().getInstallerLookup(); - - final IsisViewerInstaller viewerInstaller = installerLookup.viewerInstaller(DND_VIEWER_NAME); - final IsisViewer viewer = viewerInstaller.createViewer(); - - viewer.init(); - } - -} +package org.apache.isis.viewer.bdd.common.story.bootstrapping; + +import org.apache.isis.runtimes.dflt.runtime.installerregistry.InstallerLookup; +import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.IsisViewerInstaller; +import org.apache.isis.runtimes.dflt.runtime.viewer.IsisViewer; +import org.apache.isis.viewer.bdd.common.Scenario; + +public class RunViewer extends AbstractHelper { + + private static final String DND_VIEWER_NAME = "dnd"; + + public RunViewer(final Scenario story) { + super(story); + } + + public void run() { + final InstallerLookup installerLookup = getStory().getInstallerLookup(); + + final IsisViewerInstaller viewerInstaller = installerLookup.viewerInstaller(DND_VIEWER_NAME); + final IsisViewer viewer = viewerInstaller.createViewer(); + + viewer.init(); + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/SetClock.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/SetClock.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/SetClock.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/SetClock.java Tue May 3 07:18:19 2011 @@ -16,29 +16,27 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.story.bootstrapping; - -import java.util.Calendar; -import java.util.Date; - -import org.apache.isis.applib.fixtures.FixtureClock; -import org.apache.isis.viewer.bdd.common.Scenario; - -public class SetClock extends AbstractHelper { - - public SetClock(final Scenario story) { - super(story); - } - - public void setClock(final Date date) { - final FixtureClock clock = FixtureClock.initialize(); - final Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - clock.setDate(calendar.get(Calendar.YEAR), - calendar.get(Calendar.MONTH) + 1, calendar - .get(Calendar.DAY_OF_MONTH)); - clock.setTime(calendar.get(Calendar.HOUR_OF_DAY), calendar - .get(Calendar.MINUTE)); - } - -} +package org.apache.isis.viewer.bdd.common.story.bootstrapping; + +import java.util.Calendar; +import java.util.Date; + +import org.apache.isis.applib.fixtures.FixtureClock; +import org.apache.isis.viewer.bdd.common.Scenario; + +public class SetClock extends AbstractHelper { + + public SetClock(final Scenario story) { + super(story); + } + + public void setClock(final Date date) { + final FixtureClock clock = FixtureClock.initialize(); + final Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + clock.setDate(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH) + 1, + calendar.get(Calendar.DAY_OF_MONTH)); + clock.setTime(calendar.get(Calendar.HOUR_OF_DAY), calendar.get(Calendar.MINUTE)); + } + +} Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/ShutdownIsis.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/ShutdownIsis.java?rev=1098945&r1=1098944&r2=1098945&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/ShutdownIsis.java (original) +++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/ShutdownIsis.java Tue May 3 07:18:19 2011 @@ -16,27 +16,27 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.bdd.common.story.bootstrapping; - -import org.apache.isis.runtimes.dflt.runtime.system.IsisSystem; -import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; -import org.apache.isis.viewer.bdd.common.Scenario; - -public class ShutdownIsis extends AbstractHelper { - - public ShutdownIsis(final Scenario story) { - super(story); - } - - public void shutdown() { - final IsisSystem system = getStory().getSystem(); - - IsisContext.closeAllSessions(); - - if (system != null) { - system.shutdown(); - } - - } - -} +package org.apache.isis.viewer.bdd.common.story.bootstrapping; + +import org.apache.isis.runtimes.dflt.runtime.system.IsisSystem; +import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; +import org.apache.isis.viewer.bdd.common.Scenario; + +public class ShutdownIsis extends AbstractHelper { + + public ShutdownIsis(final Scenario story) { + super(story); + } + + public void shutdown() { + final IsisSystem system = getStory().getSystem(); + + IsisContext.closeAllSessions(); + + if (system != null) { + system.shutdown(); + } + + } + +}