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 86553B790 for ; Sun, 22 Jan 2012 14:44:24 +0000 (UTC) Received: (qmail 1118 invoked by uid 500); 22 Jan 2012 14:44:24 -0000 Delivered-To: apmail-incubator-isis-commits-archive@incubator.apache.org Received: (qmail 1100 invoked by uid 500); 22 Jan 2012 14:44:24 -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 1089 invoked by uid 99); 22 Jan 2012 14:44:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jan 2012 14:44:24 +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; Sun, 22 Jan 2012 14:44:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E00EB23889C5; Sun, 22 Jan 2012 14:43:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1234519 [3/3] - in /incubator/isis/trunk/examples: claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/ claims/dom/src/main/java/org/apache/isis/example/claims/dom/employee/ claims/fixture/src/main/java/org/apache/isis/exampl... Date: Sun, 22 Jan 2012 14:43:55 -0000 To: isis-commits@incubator.apache.org From: danhaywood@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120122144358.E00EB23889C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/AbstractApplicationStory.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/AbstractApplicationStory.java?rev=1234519&r1=1234518&r2=1234519&view=diff ============================================================================== --- incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/AbstractApplicationStory.java (original) +++ incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/AbstractApplicationStory.java Sun Jan 22 14:43:52 2012 @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package viewer.bdd; - -import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionScenario; - -public abstract class AbstractApplicationStory extends AbstractIsisConcordionScenario { - - /** - * This superclass also acts as the marker for the location of the - * custom CSS. - */ - @Override - protected Class customCssPackage() { - return AbstractApplicationStory.class; - } - -} +package viewer.bdd; + +import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionScenario; + +public abstract class AbstractApplicationStory extends AbstractIsisConcordionScenario { + + /** + * This superclass also acts as the marker for the location of the custom + * CSS. + */ + @Override + protected Class customCssPackage() { + return AbstractApplicationStory.class; + } + +} Modified: incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/BootstrapInExplorationMode.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/BootstrapInExplorationMode.java?rev=1234519&r1=1234518&r2=1234519&view=diff ============================================================================== --- incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/BootstrapInExplorationMode.java (original) +++ incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/BootstrapInExplorationMode.java Sun Jan 22 14:43:52 2012 @@ -16,12 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package viewer.bdd.common; - -import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionScenario; - - -public class BootstrapInExplorationMode extends AbstractIsisConcordionScenario { - - -} +package viewer.bdd.common; + +import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionScenario; + +public class BootstrapInExplorationMode extends AbstractIsisConcordionScenario { + +} Modified: incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/ToDoItems.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/ToDoItems.java?rev=1234519&r1=1234518&r2=1234519&view=diff ============================================================================== --- incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/ToDoItems.java (original) +++ incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/ToDoItems.java Sun Jan 22 14:43:52 2012 @@ -16,12 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package viewer.bdd.common; - -import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionScenario; - - -public class ToDoItems extends AbstractIsisConcordionScenario { - - -} +package viewer.bdd.common; + +import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionScenario; + +public class ToDoItems extends AbstractIsisConcordionScenario { + +} Modified: incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/AllStories.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/AllStories.java?rev=1234519&r1=1234518&r2=1234519&view=diff ============================================================================== --- incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/AllStories.java (original) +++ incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/AllStories.java Sun Jan 22 14:43:52 2012 @@ -16,12 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package viewer.bdd.stories; - -import viewer.bdd.AbstractApplicationStory; - - -public class AllStories extends AbstractApplicationStory { - - -} +package viewer.bdd.stories; + +import viewer.bdd.AbstractApplicationStory; + +public class AllStories extends AbstractApplicationStory { + +} Modified: incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/Fixture.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/Fixture.java?rev=1234519&r1=1234518&r2=1234519&view=diff ============================================================================== --- incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/Fixture.java (original) +++ incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/Fixture.java Sun Jan 22 14:43:52 2012 @@ -16,12 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package viewer.bdd.stories.todo; - -import viewer.bdd.AbstractApplicationStory; - - -public class Fixture extends AbstractApplicationStory { - - -} +package viewer.bdd.stories.todo; + +import viewer.bdd.AbstractApplicationStory; + +public class Fixture extends AbstractApplicationStory { + +} Modified: incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/Index.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/Index.java?rev=1234519&r1=1234518&r2=1234519&view=diff ============================================================================== --- incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/Index.java (original) +++ incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/Index.java Sun Jan 22 14:43:52 2012 @@ -16,12 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package viewer.bdd.stories.todo; - -import viewer.bdd.AbstractApplicationStory; - - -public class Index extends AbstractApplicationStory { - - -} +package viewer.bdd.stories.todo; + +import viewer.bdd.AbstractApplicationStory; + +public class Index extends AbstractApplicationStory { + +} Modified: incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/ScenarioMarkItemAsComplete.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/ScenarioMarkItemAsComplete.java?rev=1234519&r1=1234518&r2=1234519&view=diff ============================================================================== --- incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/ScenarioMarkItemAsComplete.java (original) +++ incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/ScenarioMarkItemAsComplete.java Sun Jan 22 14:43:52 2012 @@ -16,12 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package viewer.bdd.stories.todo; - -import viewer.bdd.AbstractApplicationStory; - - -public class ScenarioMarkItemAsComplete extends AbstractApplicationStory { - - -} +package viewer.bdd.stories.todo; + +import viewer.bdd.AbstractApplicationStory; + +public class ScenarioMarkItemAsComplete extends AbstractApplicationStory { + +} Modified: incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java?rev=1234519&r1=1234518&r2=1234519&view=diff ============================================================================== --- incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java (original) +++ incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java Sun Jan 22 14:43:52 2012 @@ -21,12 +21,6 @@ package junit; import objstore.dflt.todo.ToDoItemsDefault; -import org.junit.After; -import org.junit.Before; -import org.junit.runner.RunWith; - -import dom.todo.ToDoItems; - import org.apache.isis.applib.DomainObjectContainer; import org.apache.isis.progmodel.wrapper.applib.WrapperFactory; import org.apache.isis.progmodel.wrapper.applib.WrapperObject; @@ -34,6 +28,11 @@ import org.apache.isis.viewer.junit.Conf import org.apache.isis.viewer.junit.IsisTestRunner; import org.apache.isis.viewer.junit.Service; import org.apache.isis.viewer.junit.Services; +import org.junit.After; +import org.junit.Before; +import org.junit.runner.RunWith; + +import dom.todo.ToDoItems; @RunWith(IsisTestRunner.class) @ConfigDir("../webapp/src/main/webapp/WEB-INF") @@ -44,8 +43,8 @@ public abstract class AbstractTest { private WrapperFactory wrapperFactory; /** - * The {@link WrapperFactory#wrap(Object) wrapped} equivalent of the {@link #setToDoItems(ToDoItems) - * injected} {@link ToDoItems}. + * The {@link WrapperFactory#wrap(Object) wrapped} equivalent of the + * {@link #setToDoItems(ToDoItems) injected} {@link ToDoItems}. */ protected ToDoItems toDoItems; @@ -58,14 +57,14 @@ public abstract class AbstractTest { public void setUp() throws Exception { } - protected T wrapped(T obj) { + protected T wrapped(final T obj) { return wrapperFactory.wrap(obj); } @SuppressWarnings("unchecked") - protected T unwrapped(T obj) { + protected T unwrapped(final T obj) { if (obj instanceof WrapperObject) { - WrapperObject wrapperObject = (WrapperObject) obj; + final WrapperObject wrapperObject = (WrapperObject) obj; return (T) wrapperObject.wrapped(); } return obj; @@ -83,7 +82,7 @@ public abstract class AbstractTest { return wrapperFactory; } - public void setWrapperFactory(WrapperFactory wrapperFactory) { + public void setWrapperFactory(final WrapperFactory wrapperFactory) { this.wrapperFactory = wrapperFactory; } Modified: incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java?rev=1234519&r1=1234518&r2=1234519&view=diff ============================================================================== --- incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java (original) +++ incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java Sun Jan 22 14:43:52 2012 @@ -28,14 +28,13 @@ import java.util.List; import junit.AbstractTest; +import org.apache.isis.viewer.junit.Fixture; +import org.apache.isis.viewer.junit.Fixtures; import org.junit.Test; import dom.todo.ToDoItem; import fixture.todo.ToDoItemsFixture; -import org.apache.isis.viewer.junit.Fixture; -import org.apache.isis.viewer.junit.Fixtures; - @Fixtures({ @Fixture(ToDoItemsFixture.class) }) public class ToDoItemRepositoryTest extends AbstractTest { @@ -47,7 +46,7 @@ public class ToDoItemRepositoryTest exte @Test public void canCreateToDoItem() throws Exception { - ToDoItem newItem = toDoItems.newToDo("item description"); + final ToDoItem newItem = toDoItems.newToDo("item description"); assertThat(newItem, is(not(nullValue()))); assertThat(newItem.getDescription(), is("item description")); assertThat(getDomainObjectContainer().isPersistent(newItem), is(true)); Modified: incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemTest.java?rev=1234519&r1=1234518&r2=1234519&view=diff ============================================================================== --- incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemTest.java (original) +++ incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemTest.java Sun Jan 22 14:43:52 2012 @@ -24,16 +24,15 @@ import static org.junit.Assert.assertTha import static org.junit.Assert.fail; import junit.AbstractTest; +import org.apache.isis.progmodel.wrapper.applib.DisabledException; +import org.apache.isis.viewer.junit.Fixture; +import org.apache.isis.viewer.junit.Fixtures; import org.junit.Before; import org.junit.Test; import dom.todo.ToDoItem; import fixture.todo.ToDoItemsFixture; -import org.apache.isis.progmodel.wrapper.applib.DisabledException; -import org.apache.isis.viewer.junit.Fixture; -import org.apache.isis.viewer.junit.Fixtures; - @Fixtures({ @Fixture(ToDoItemsFixture.class) }) public class ToDoItemTest extends AbstractTest { @@ -45,7 +44,7 @@ public class ToDoItemTest extends Abstra toDoItem = toDoItems.notYetDone().get(0); toDoItem = wrapped(toDoItem); } - + @Test public void canMarkAsDone() throws Exception { toDoItem.markAsDone(); @@ -58,10 +57,9 @@ public class ToDoItemTest extends Abstra try { toDoItem.markAsDone(); fail("Should have been disabled"); - } catch (DisabledException e) { + } catch (final DisabledException e) { assertThat(e.getMessage(), is("Already done")); } } - }