You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2010/11/05 12:15:42 UTC
svn commit: r1031517 - in /incubator/isis/trunk/support/prototype:
dom/src/main/java/org/apache/isis/support/prototype/dom/claim/
dom/src/main/java/org/apache/isis/support/prototype/dom/employee/
objstore-default/src/main/java/org/apache/isis/support/p...
Author: danhaywood
Date: Fri Nov 5 11:15:40 2010
New Revision: 1031517
URL: http://svn.apache.org/viewvc?rev=1031517&view=rev
Log:
adding in viewer-bdd to suport/prototype
Added:
incubator/isis/trunk/support/prototype/viewer-bdd/
incubator/isis/trunk/support/prototype/viewer-bdd/pom.xml
incubator/isis/trunk/support/prototype/viewer-bdd/src/
incubator/isis/trunk/support/prototype/viewer-bdd/src/main/
incubator/isis/trunk/support/prototype/viewer-bdd/src/main/java/
incubator/isis/trunk/support/prototype/viewer-bdd/src/main/resources/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/CustomCssPackage.java
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/common/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/common/BootstrapInExplorationMode.java
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/common/Employees.java
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/stories/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/stories/NewClaimDefaultsOkStory.java
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/starobjects/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/starobjects/tested/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/starobjects/tested/concordion/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/starobjects/tested/concordion/testapp/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/common/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/common/BootstrapInExplorationMode.html
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/common/Employees.html
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/concordion.css
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/stories/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/stories/NewClaimDefaultsOkStory.html
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/starobjects/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/starobjects/tested/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/starobjects/tested/concordion/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/starobjects/tested/concordion/testapp/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/starobjects/tested/concordion/testapp/common/
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/starobjects/tested/concordion/testapp/stories/
Modified:
incubator/isis/trunk/support/prototype/dom/src/main/java/org/apache/isis/support/prototype/dom/claim/Claim.java
incubator/isis/trunk/support/prototype/dom/src/main/java/org/apache/isis/support/prototype/dom/claim/ClaimRepository.java
incubator/isis/trunk/support/prototype/dom/src/main/java/org/apache/isis/support/prototype/dom/employee/Employee.java
incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/claim/ClaimRepositoryInMemory.java
Modified: incubator/isis/trunk/support/prototype/dom/src/main/java/org/apache/isis/support/prototype/dom/claim/Claim.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/dom/src/main/java/org/apache/isis/support/prototype/dom/claim/Claim.java?rev=1031517&r1=1031516&r2=1031517&view=diff
==============================================================================
--- incubator/isis/trunk/support/prototype/dom/src/main/java/org/apache/isis/support/prototype/dom/claim/Claim.java (original)
+++ incubator/isis/trunk/support/prototype/dom/src/main/java/org/apache/isis/support/prototype/dom/claim/Claim.java Fri Nov 5 11:15:40 2010
@@ -17,10 +17,10 @@
* under the License.
*/
-
package org.apache.isis.support.prototype.dom.claim;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -34,7 +34,7 @@ import org.apache.isis.applib.util.Reaso
import org.apache.isis.applib.value.Date;
import org.apache.isis.applib.value.Money;
-public class Claim extends AbstractDomainObject /* implements Calendarable */ {
+public class Claim extends AbstractDomainObject /* implements Calendarable */{
// {{ Title
public String title() {
@@ -77,6 +77,10 @@ public class Claim extends AbstractDomai
this.description = description;
}
+ public String defaultDescription() {
+ return "enter a description here";
+ }
+
public String validateDescription(final String description) {
if (description == null)
return null;
@@ -99,6 +103,7 @@ public class Claim extends AbstractDomai
public void setDate(Date date) {
this.date = date;
}
+
// }}
// {{ Status
@@ -115,6 +120,18 @@ public class Claim extends AbstractDomai
this.status = status;
}
+ // }}
+
+ // {{ changeStatus
+ @MemberOrder(sequence = "1")
+ public void changeStatus(final String status) {
+ setStatus(status);
+ }
+
+ public List<String> choices0ChangeStatus() {
+ return Arrays.asList("New", "Incomplete", "Done");
+ }
+
private String ifAlreadySubmitted() {
return "Submitted".equals(getStatus()) ? "Already submitted" : null;
}
@@ -163,7 +180,7 @@ public class Claim extends AbstractDomai
// }}
// {{ Items
- private List<ClaimItem> items = new ArrayList<ClaimItem>();
+ private final List<ClaimItem> items = new ArrayList<ClaimItem>();
@MemberOrder(sequence = "6")
public List<ClaimItem> getItems() {
@@ -173,12 +190,12 @@ public class Claim extends AbstractDomai
public void addToItems(ClaimItem item) {
items.add(item);
}
+
public void removeFromItems(ClaimItem item) {
items.remove(item);
}
- // }}
-
+ // }}
// }}
@@ -189,8 +206,7 @@ public class Claim extends AbstractDomai
}
public String disableSubmit() {
- return getStatus().equals("New") ? null
- : "Claim has already been submitted";
+ return getStatus().equals("New") ? null : "Claim has already been submitted";
}
public Approver default0Submit() {
@@ -201,9 +217,8 @@ public class Claim extends AbstractDomai
// {{ action: addItem
@MemberOrder(sequence = "1")
- public void addItem(@Named("Days since") int days,
- @Named("Amount") double amount,
- @Named("Description") String description) {
+ public void addItem(@Named("Days since") int days, @Named("Amount") double amount,
+ @Named("Description") String description) {
ClaimItem claimItem = newTransientInstance(ClaimItem.class);
Date date = new Date();
date = date.add(0, 0, days);
@@ -220,39 +235,44 @@ public class Claim extends AbstractDomai
// }}
-
// {{ removeItem
@MemberOrder(sequence = "2")
public void removeItem(final ClaimItem claimItem) {
removeFromItems(claimItem);
}
+
public String disableRemoveItem() {
return Reasons.coalesce(ifAlreadySubmitted());
}
+
public ClaimItem default0RemoveItem() {
- if(getItems().size()>0) {
- return getItems().get(getItems().size()-1);
+ if (getItems().size() > 0) {
+ return getItems().get(getItems().size() - 1);
} else {
return null;
}
}
+
public List<ClaimItem> choices0RemoveItem() {
return Collections.unmodifiableList(getItems());
}
- // }}
+ // }}
public String validate() {
+ if (getStatus().equals("Incomplete")) {
+ return "incomplete";
+ }
if (getDescription().contains("foobaz")) {
return "no foobaz allowed in description!";
}
return null;
}
-// @Ignore
-// @Override
-// public CalendarEvent getCalendarEvent() {
-// return CalendarEvent.newAllDayEvent(getDate().dateValue());
-// }
-
+ // @Ignore
+ // @Override
+ // public CalendarEvent getCalendarEvent() {
+ // return CalendarEvent.newAllDayEvent(getDate().dateValue());
+ // }
+
}
Modified: incubator/isis/trunk/support/prototype/dom/src/main/java/org/apache/isis/support/prototype/dom/claim/ClaimRepository.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/dom/src/main/java/org/apache/isis/support/prototype/dom/claim/ClaimRepository.java?rev=1031517&r1=1031516&r2=1031517&view=diff
==============================================================================
--- incubator/isis/trunk/support/prototype/dom/src/main/java/org/apache/isis/support/prototype/dom/claim/ClaimRepository.java (original)
+++ incubator/isis/trunk/support/prototype/dom/src/main/java/org/apache/isis/support/prototype/dom/claim/ClaimRepository.java Fri Nov 5 11:15:40 2010
@@ -38,7 +38,12 @@ public interface ClaimRepository {
@NotInRepositoryMenu
public List<Claim> claimsSince(Claimant claimant, Date since);
- public ClaimWizard newClaim(Claimant claimant);
+ public Claim newClaim(Claimant claimant);
+
+ @Named("New Claim")
+ public Claim newClaimWithDescription(Claimant claimant, String description);
+
+ public ClaimWizard newClaimUsingWizard(Claimant claimant);
@NotContributed
public List<ClaimantExpenseSummary> analyseClaimantExpenses();
Modified: incubator/isis/trunk/support/prototype/dom/src/main/java/org/apache/isis/support/prototype/dom/employee/Employee.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/dom/src/main/java/org/apache/isis/support/prototype/dom/employee/Employee.java?rev=1031517&r1=1031516&r2=1031517&view=diff
==============================================================================
--- incubator/isis/trunk/support/prototype/dom/src/main/java/org/apache/isis/support/prototype/dom/employee/Employee.java (original)
+++ incubator/isis/trunk/support/prototype/dom/src/main/java/org/apache/isis/support/prototype/dom/employee/Employee.java Fri Nov 5 11:15:40 2010
@@ -17,20 +17,22 @@
* under the License.
*/
-
package org.apache.isis.support.prototype.dom.employee;
+import java.util.Arrays;
+import java.util.List;
+
import org.apache.isis.applib.AbstractDomainObject;
-import org.apache.isis.applib.annotation.Disabled;
+import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.support.prototype.dom.claim.Approver;
import org.apache.isis.support.prototype.dom.claim.Claimant;
-public class Employee extends AbstractDomainObject implements Claimant,
- Approver /* , Locatable */{
+public class Employee extends AbstractDomainObject implements Claimant, Approver /* , Locatable */{
// {{ Title
+ @Override
public String title() {
return getName();
}
@@ -61,6 +63,7 @@ public class Employee extends AbstractDo
// {{ Approver
private Approver approver;
+ @Override
@MemberOrder(sequence = "2")
public Approver getApprover() {
return approver;
@@ -70,24 +73,88 @@ public class Employee extends AbstractDo
this.approver = approver;
}
+ public String validateApprover(final Approver approver) {
+ if (approver == null)
+ return null;
+ if (approver == this) {
+ return "Cannot act as own approver";
+ }
+ return null;
+ }
+
+ // }}
+
+ // // {{ Location
+ // private Location location;
+ //
+ // @Disabled
+ // @MemberOrder(sequence = "1")
+ // public Location getLocation() {
+ // return location;
+ // }
+ //
+ // public void setLocation(final Location location) {
+ // this.location = location;
+ // }
+ // // }}
+
+ // {{ SomeHiddenProperty
+ private String someHiddenProperty;
+
+ @Hidden
+ @MemberOrder(sequence = "1")
+ public String getSomeHiddenProperty() {
+ return someHiddenProperty;
+ }
+
+ public void setSomeHiddenProperty(final String someHiddenProperty) {
+ this.someHiddenProperty = someHiddenProperty;
+ }
+
+ // }}
+
+ // {{ SomePropertyWithDefault
+ private String somePropertyWithDefault;
+
+ @MemberOrder(sequence = "1")
+ public String getSomePropertyWithDefault() {
+ return somePropertyWithDefault;
+ }
+
+ public void setSomePropertyWithDefault(final String somePropertyWithDefault) {
+ this.somePropertyWithDefault = somePropertyWithDefault;
+ }
+
+ public String defaultSomePropertyWithDefault() {
+ return "Foo";
+ }
+
// }}
-// // {{ Location
-// private Location location;
-//
-// @Disabled
-// @MemberOrder(sequence = "1")
-// public Location getLocation() {
-// return location;
-// }
-//
-// public void setLocation(final Location location) {
-// this.location = location;
-// }
-// // }}
-
+ // {{ SomeActionWithParameterDefaults
+ @MemberOrder(sequence = "1")
+ public int someActionWithParameterDefaults(final int param0, final int param1) {
+ return param0 + param1;
+ }
+
+ public int default0SomeActionWithParameterDefaults() {
+ return 5;
+ }
+
+ // }}
+
+ // {{ someActionWithParameterChoices
+ @MemberOrder(sequence = "1")
+ public int someActionWithParameterChoices(final int param0, final int param1) {
+ return param0 - param1;
+ }
+
+ public List<Integer> choices0SomeActionWithParameterChoices() {
+ return Arrays.asList(1, 2, 3);
+ }
+
+ // }}
-
// {{ Limit
private int limit;
@@ -102,7 +169,4 @@ public class Employee extends AbstractDo
}
// }}
-
-
}
-
Modified: incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/claim/ClaimRepositoryInMemory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/claim/ClaimRepositoryInMemory.java?rev=1031517&r1=1031516&r2=1031517&view=diff
==============================================================================
--- incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/claim/ClaimRepositoryInMemory.java (original)
+++ incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/claim/ClaimRepositoryInMemory.java Fri Nov 5 11:15:40 2010
@@ -82,7 +82,7 @@ public class ClaimRepositoryInMemory ext
// {{ action: newClaim
@Override
- public ClaimWizard newClaim(Claimant claimant) {
+ public ClaimWizard newClaimUsingWizard(Claimant claimant) {
final ClaimWizard claimWizard = newTransientInstance(ClaimWizard.class);
claimWizard.modifyClaimant(claimant);
return claimWizard;
@@ -90,6 +90,29 @@ public class ClaimRepositoryInMemory ext
// }}
+ // {{ action: newClaim
+ @Override
+ public Claim newClaim(Claimant claimant) {
+ Claim claim = newTransientInstance(Claim.class);
+ if (claimant != null) {
+ claim.setClaimant(claimant);
+ claim.setApprover(claimant.getApprover());
+ }
+ return claim;
+ }
+
+ // }}
+
+ // {{ action: newClaimWithDescription
+ @Override
+ public Claim newClaimWithDescription(Claimant claimant, String description) {
+ Claim claim = newClaim(claimant);
+ claim.setDescription(description);
+ return claim;
+ }
+
+ // }}
+
// {{ action: claimsSince
@Override
public List<Claim> claimsSince(final Claimant claimant, final Date since) {
Added: incubator/isis/trunk/support/prototype/viewer-bdd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/viewer-bdd/pom.xml?rev=1031517&view=auto
==============================================================================
--- incubator/isis/trunk/support/prototype/viewer-bdd/pom.xml (added)
+++ incubator/isis/trunk/support/prototype/viewer-bdd/pom.xml Fri Nov 5 11:15:40 2010
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.isis.support</groupId>
+ <artifactId>prototype-viewer-bdd</artifactId>
+ <version>0.1-SNAPSHOT</version>
+
+ <name>Prototype: BDD (Concordion) Tests</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>concordion.output.dir</name>
+ <value>target/concordion</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis</groupId>
+ <artifactId>release</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+
+ <!-- this project's dependencies -->
+ <dependency>
+ <groupId>org.apache.isis.support</groupId>
+ <artifactId>prototype-quickrun</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ </dependency>
+
+ <!-- BDD Viewers concordion dependencies -->
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>bdd-concordion</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+</project>
Added: incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/CustomCssPackage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/CustomCssPackage.java?rev=1031517&view=auto
==============================================================================
--- incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/CustomCssPackage.java (added)
+++ incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/CustomCssPackage.java Fri Nov 5 11:15:40 2010
@@ -0,0 +1,5 @@
+package org.apache.isis.extensions.bdd.testapp.claims;
+
+public class CustomCssPackage {
+
+}
Added: incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/common/BootstrapInExplorationMode.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/common/BootstrapInExplorationMode.java?rev=1031517&view=auto
==============================================================================
--- incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/common/BootstrapInExplorationMode.java (added)
+++ incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/common/BootstrapInExplorationMode.java Fri Nov 5 11:15:40 2010
@@ -0,0 +1,9 @@
+package org.apache.isis.extensions.bdd.testapp.claims.common;
+
+import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionTest;
+
+
+public class BootstrapInExplorationMode extends AbstractIsisConcordionTest {
+
+
+}
Added: incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/common/Employees.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/common/Employees.java?rev=1031517&view=auto
==============================================================================
--- incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/common/Employees.java (added)
+++ incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/common/Employees.java Fri Nov 5 11:15:40 2010
@@ -0,0 +1,9 @@
+package org.apache.isis.extensions.bdd.testapp.claims.common;
+
+import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionTest;
+
+
+public class Employees extends AbstractIsisConcordionTest {
+
+
+}
Added: incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/stories/NewClaimDefaultsOkStory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/stories/NewClaimDefaultsOkStory.java?rev=1031517&view=auto
==============================================================================
--- incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/stories/NewClaimDefaultsOkStory.java (added)
+++ incubator/isis/trunk/support/prototype/viewer-bdd/src/test/java/org/apache/isis/extensions/bdd/testapp/claims/stories/NewClaimDefaultsOkStory.java Fri Nov 5 11:15:40 2010
@@ -0,0 +1,15 @@
+package org.apache.isis.extensions.bdd.testapp.claims.stories;
+
+import org.apache.isis.extensions.bdd.testapp.claims.CustomCssPackage;
+import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionTest;
+
+
+public class NewClaimDefaultsOkStory extends AbstractIsisConcordionTest {
+
+
+ @Override
+ protected Class<?> customCssPackage() {
+ return CustomCssPackage.class;
+ }
+
+}
Added: incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/common/BootstrapInExplorationMode.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/common/BootstrapInExplorationMode.html?rev=1031517&view=auto
==============================================================================
--- incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/common/BootstrapInExplorationMode.html (added)
+++ incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/common/BootstrapInExplorationMode.html Fri Nov 5 11:15:40 2010
@@ -0,0 +1,42 @@
+<html xmlns:concordion="http://www.concordion.org/2007/concordion"
+ xmlns:isis="http://isis.apache.org/2010/concordion">
+<link href="../concordion.css" rel="stylesheet" type="text/css" />
+<body>
+
+<p>
+The system:
+</p>
+<ul>
+<li>
+<p concordion:execute="#result=bootstrapIsis(#configDir,#deploymentType)">
+<span concordion:assertTrue="#result">bootstrapped</span> from
+config directory <span concordion:set="#configDir">../quickrun/config</span>
+and running in <span concordion:set="#deploymentType">exploration</span>
+mode,
+</p>
+</li>
+<li>
+<p>with services: </p>
+<table isis:execute="#result=aliasServices(#className, #aliasAs)">
+ <tr>
+ <th concordion:set="#className">Class Name</th>
+ <th concordion:set="#aliasAs">aliasAs</th>
+ <th concordion:assertTrue="#result"/>
+ </tr>
+ <tr>
+ <td>org.apache.isis.support.prototype.objstore.dflt.claim.ClaimRepositoryInMemory</td>
+ <td>claims</td>
+ <td>ok</td>
+ </tr>
+ <tr>
+ <td>org.apache.isis.support.prototype.objstore.dflt.employee.EmployeeRepositoryInMemory</td>
+ <td>employees</td>
+ <td>ok</td>
+ </tr>
+</table>
+</li>
+</ul>
+
+</body>
+
+</html>
\ No newline at end of file
Added: incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/common/Employees.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/common/Employees.html?rev=1031517&view=auto
==============================================================================
--- incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/common/Employees.html (added)
+++ incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/common/Employees.html Fri Nov 5 11:15:40 2010
@@ -0,0 +1,37 @@
+<html xmlns:concordion="http://www.concordion.org/2007/concordion"
+ xmlns:isis="http://isis.apache.org/2010/concordion">
+<link href="../concordion.css" rel="stylesheet" type="text/css" />
+<body>
+
+<h3>Operational Data</h3>
+<p>With Employees (<span concordion:set="#className">org.apache.isis.support.prototype.dom.employee.Employee</span>):
+</p>
+<table isis:execute="#result=setUpObject(#className, #aliasAs, #name, #approver)">
+ <tr>
+ <th concordion:set="#name">Name</th>
+ <th concordion:set="#approver">Approver</th>
+ <th concordion:set="#aliasAs">aliasAs</th>
+ <th concordion:assertEquals="#result"/>
+ </tr>
+ <tr>
+ <td>Fred Smith</td>
+ <td></td>
+ <td>Employee:Fred Smith</td>
+ <td>ok</td>
+ </tr>
+ <tr>
+ <td>Tom Brown</td>
+ <td>Employee:Fred Smith</td>
+ <td>Employee:Tom Brown</td>
+ <td>ok</td>
+ </tr>
+ <tr>
+ <td>Sam Jones</td>
+ <td>Employee:Fred Smith</td>
+ <td>Employee:Sam Jones</td>
+ <td>ok</td>
+ </tr>
+</table>
+
+</body>
+</html>
\ No newline at end of file
Added: incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/concordion.css
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/concordion.css?rev=1031517&view=auto
==============================================================================
--- incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/concordion.css (added)
+++ incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/concordion.css Fri Nov 5 11:15:40 2010
@@ -0,0 +1,84 @@
+* {
+ font-family: Arial;
+}
+body {
+ padding: 32px;
+}
+pre {
+ padding: 6px 28px 6px 28px;
+ background-color: #E8EEF7;
+}
+pre, pre *, code, code *, kbd {
+ font-family: Courier New, Courier;
+ font-size: 10pt;
+}
+h1, h1 * {
+ font-size: 24pt;
+}
+p, td, th, li, .breadcrumbs {
+ font-size: 10pt;
+}
+p, li {
+ line-height: 140%;
+}
+table {
+ border-collapse: collapse;
+ empty-cells: show;
+ margin: 8px 0px 8px 0px;
+}
+th, td {
+ border: 1px solid black;
+ padding: 3px;
+}
+td {
+ background-color: white;
+ vertical-align: top;
+}
+th {
+ background-color: #C3D9FF;
+}
+li {
+ margin-top: 6px;
+ margin-bottom: 6px;
+}
+
+
+.example {
+ padding: 2px 12px 6px 12px;
+ border: 1px solid #C3D9FF;
+ margin: 6px 0px 28px 0px;
+ background-color: #F5F9FD;
+}
+.example h3 {
+ margin-top: 8px;
+ margin-bottom: 8px;
+ font-size: 12pt;
+}
+
+.special {
+ font-style: italic;
+}
+
+.idea {
+ font-size: 9pt;
+ color: #888;
+ font-style: italic;
+}
+.tight li {
+ margin-top: 1px;
+ margin-bottom: 1px;
+}
+.commentary {
+ float: right;
+ width: 200px;
+ background-color: #ffffd0;
+ padding:8px;
+ border: 3px solid #eeeeb0;
+ margin: 10px 0px 10px 10px;
+}
+.commentary, .commentary * {
+ font-size: 8pt;
+}
+span {
+ font-style: italic;
+}
Added: incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/stories/NewClaimDefaultsOkStory.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/stories/NewClaimDefaultsOkStory.html?rev=1031517&view=auto
==============================================================================
--- incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/stories/NewClaimDefaultsOkStory.html (added)
+++ incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/extensions/bdd/testapp/claims/stories/NewClaimDefaultsOkStory.html Fri Nov 5 11:15:40 2010
@@ -0,0 +1,184 @@
+<html xmlns:concordion="http://www.concordion.org/2007/concordion"
+ xmlns:isis="http://isis.apache.org/2010/concordion">
+<link href="../concordion.css" rel="stylesheet" type="text/css" />
+<body>
+
+<h1>Apache Isis with Concordion</h1>
+
+<div class="example">
+
+<h2>Given</h2>
+<ul>
+ <li>
+ <p>bootstrapped in <a concordion:run="concordion"
+ href="../common/BootstrapInExplorationMode.html">exploration</a> mode.</p>
+ </li>
+ <li>
+ <p concordion:execute="#result=timeIsNow(#dateTime)"><span
+ concordion:assertTrue="#result">date/time</span> being <span
+ concordion:set="#dateTime">2 mar 2007 09:20</span>, and</p>
+ </li>
+ <li>
+ <p concordion:execute="#result=logonAs(#userName)"><span
+ concordion:assertTrue="#result">logged on</span> as <span
+ concordion:set="#userName">fsmith</span></p>
+ </li>
+ <li>
+ <p>with <a concordion:run="concordion"
+ href="../common/Employees.html">Employees</a>.</p>
+ </li>
+</ul>
+
+
+<p>Locate and alias Tom and his approver:</p>
+<ul>
+ <li>
+ <p
+ isis:execute="#result=usingIsisViewer(#onObject,#aliasResultAs, #perform, #usingMember)">
+ With the <span concordion:set="#onObject">employees</span> service, <span
+ concordion:set="#perform">invoke action</span> <span
+ concordion:set="#usingMember">All Employees</span> and alias the resulting list as <span
+ concordion:set="#aliasResultAs">list1</span>; <span
+ concordion:assertEquals="#result">ok</span></p>
+ </li>
+ <li>
+ <p
+ concordion:execute="#result=aliasItemsInList(#listAlias, #title, #aliasAs)">
+ Alias <span concordion:set="#title">Tom Brown</span> in <span
+ concordion:set="#listAlias">list1</span> as <span
+ concordion:set="#aliasAs">tomEmployee</span>; <span
+ concordion:assertEquals="#result">ok</span>.</p>
+ </li>
+</ul>
+
+
+<p>Note the approver for Tom.</p>
+<table
+ isis:execute="#result=usingIsisViewerThatArgs(#onObject, #aliasResultAs, #perform, #onMember, #thatIt, #value)">
+ <tr>
+ <th concordion:set="#onObject">on object</th>
+ <th concordion:set="#aliasResultAs">alias result as</th>
+ <th concordion:set="#perform">perform</th>
+ <th concordion:set="#onMember">on member</th>
+ <th concordion:set="#thatIt">that it</th>
+ <th concordion:set="#value">value</th>
+ <th concordion:assertEquals="#result" />
+ </tr>
+ <tr>
+ <td>tomEmployee</td>
+ <td>tomsApprover</td>
+ <td>check property</td>
+ <td>Approver</td>
+ <td>is</td>
+ <td>Employee:Fred Smith</td>
+ <td>ok</td>
+ </tr>
+</table>
+
+<h2>When</h2>
+
+<p>Create new claim, but don't save:</p>
+<table
+ isis:execute="#result=usingIsisViewer(#onObject, #aliasResultAs, #perform, #onMember)">
+ <tr>
+ <th concordion:set="#onObject">on object</th>
+ <th concordion:set="#aliasResultAs">alias result as</th>
+ <th concordion:set="#perform">perform</th>
+ <th concordion:set="#onMember">on member</th>
+ <th concordion:assertEquals="#result" />
+ </tr>
+ <tr>
+ <td>tomEmployee</td>
+ <td>tomsClaim1</td>
+ <td>invoke action</td>
+ <td>New Claim</td>
+ <td>ok</td>
+ </tr>
+</table>
+
+
+<h2>Then</h2>
+
+<table
+ isis:execute="#result=usingIsisViewerThatArgs(#onObject, #aliasResultAs, #perform, #onMember, #that, #args)">
+ <tr>
+ <th concordion:set="#onObject">on object</th>
+ <th concordion:set="#aliasResultAs">alias result as</th>
+ <th concordion:set="#perform">perform</th>
+ <th concordion:set="#onMember">on member</th>
+ <th concordion:set="#that">that it</th>
+ <th concordion:set="#args">value</th>
+ <th concordion:assertEquals="#result" />
+ </tr>
+ <tr>
+ <td>tomsClaim1</td>
+ <td />
+ <td>check object</td>
+ <td />
+ <td>is not saved</td>
+ <td />
+ <td>ok</td>
+ </tr>
+ <tr>
+ <td />
+ <td />
+ <td>check property</td>
+ <td>Date</td>
+ <td>is</td>
+ <td>02-Mar-2007</td>
+ <td>ok</td>
+ </tr>
+ <tr>
+ <td />
+ <td />
+ <td />
+ <td>Description</td>
+ <td>is</td>
+ <td>enter a description here</td>
+ <td>ok</td>
+ </tr>
+ <tr>
+ <td />
+ <td />
+ <td />
+ <td>Status</td>
+ <td>is</td>
+ <td>New</td>
+ <td>ok</td>
+ </tr>
+ <tr>
+ <td />
+ <td />
+ <td />
+ <td>Claimant</td>
+ <td>is</td>
+ <td>tomEmployee</td>
+ <td>ok</td>
+ </tr>
+ <tr>
+ <td />
+ <td />
+ <td />
+ <td>Approver</td>
+ <td>is</td>
+ <td>tomsApprover</td>
+ <td>ok</td>
+ </tr>
+ <tr>
+ <td />
+ <td />
+ <td>check collection</td>
+ <td>Items</td>
+ <td>is empty</td>
+ <td />
+ <td>ok</td>
+ </tr>
+</table>
+
+
+<!--
+<p concordion:execute="runViewer()">run viewer</p>
+--></div>
+
+</body>
+</html>
\ No newline at end of file