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/15 13:10:24 UTC
svn commit: r1035242 [1/2] - in /incubator/isis/trunk/viewer/bdd: ./
common/src/main/java/org/apache/isis/viewer/bdd/common/components/
common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/
common/src/main/java/org/apache/isis/viewer/bdd/com...
Author: danhaywood
Date: Mon Nov 15 12:10:23 2010
New Revision: 1035242
URL: http://svn.apache.org/viewvc?rev=1035242&view=rev
Log:
getting the Fitnesse viewer compiling prior to moving over to isis-contrib
Added:
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java
- copied, changed from r1034020, incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/NakedObjectsSystemUsingInstallersWithinStory.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java
- copied, changed from r1034020, incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingNakedObjectsViewerPeer.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/StoryFitNesseException.java
- copied, changed from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/StoryFitNesseException.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/StoryFixture.java
- copied, changed from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/StoryFixture.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/AbstractFixture.java
- copied, changed from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/AbstractFixture.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/AbstractSetUpFixture.java
- copied, changed from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/AbstractSetUpFixture.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/AbstractSubsetFixture.java
- copied, changed from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/AbstractSubsetFixture.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/CellBindingForFitNesse.java
- copied, changed from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/CellBindingForFitNesse.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/FitnesseConfigurationBuilder.java
- copied, changed from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/FitnesseConfigurationBuilder.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/AliasItemsInListForFitNesse.java
- copied, changed from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/AliasItemsInListForFitNesse.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/AliasServicesForFitNesse.java
- copied, changed from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/AliasServicesForFitNesse.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckListForFitNesse.java
- copied, changed from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/CheckListForFitNesse.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java
- copied, changed from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/DebugClockForFitNesse.java
- copied, changed from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/DebugClockForFitNesse.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/DebugObjectStoreForFitNesse.java
- copied, changed from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/DebugObjectStoreForFitNesse.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/DebugServicesForFitNesse.java
- copied, changed from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/DebugServicesForFitNesse.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/SetUpObjectsForFitNesse.java
- copied, changed from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/SetUpObjectsForFitNesse.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/UsingIsisViewerForFitNesse.java
- copied, changed from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/UsingNakedObjectsViewerForFitNesse.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/perform/
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/perform/StoryCellForFitNesse.java
- copied, changed from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/perform/StoryCellForFitNesse.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/perform/checkthat/
- copied from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/perform/checkthat/
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/util/
- copied from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/util/
Removed:
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/NakedObjectsSystemUsingInstallersWithinStory.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingNakedObjectsViewerPeer.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/
Modified:
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformContext.java
incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionTest.java
incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/UsingIsisViewerForConcordion.java
incubator/isis/trunk/viewer/bdd/fitnesse/pom.xml
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/util/Aliases.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/util/FitnesseUtil.java
incubator/isis/trunk/viewer/bdd/fitnesse/src/site/site.xml
incubator/isis/trunk/viewer/bdd/pom.xml
incubator/isis/trunk/viewer/bdd/src/docbkx/guide/isis-bdd-viewer.xml
Copied: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java (from r1034020, incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/NakedObjectsSystemUsingInstallersWithinStory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java?p2=incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java&p1=incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/NakedObjectsSystemUsingInstallersWithinStory.java&r1=1034020&r2=1035242&rev=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/NakedObjectsSystemUsingInstallersWithinStory.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java Mon Nov 15 12:10:23 2010
@@ -8,10 +8,10 @@ import org.apache.isis.runtime.system.in
import org.apache.isis.runtime.userprofile.UserProfileStoreInstaller;
import org.apache.isis.runtime.userprofile.inmemory.InMemoryUserProfileStoreInstaller;
-public class NakedObjectsSystemUsingInstallersWithinStory extends
+public class IsisSystemUsingInstallersWithinStory extends
IsisSystemUsingInstallers {
- public NakedObjectsSystemUsingInstallersWithinStory(
+ public IsisSystemUsingInstallersWithinStory(
final DeploymentType deploymentType,
final InstallerLookup installerLookup) {
super(deploymentType, installerLookup);
Copied: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java (from r1034020, incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingNakedObjectsViewerPeer.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java?p2=incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java&p1=incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingNakedObjectsViewerPeer.java&r1=1034020&r2=1035242&rev=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingNakedObjectsViewerPeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java Mon Nov 15 12:10:23 2010
@@ -42,7 +42,7 @@ import org.apache.isis.viewer.bdd.common
import org.apache.isis.viewer.bdd.common.fixtures.perform.SetProperty;
import org.apache.isis.viewer.bdd.common.util.Strings;
-public class UsingNakedObjectsViewerPeer extends AbstractFixturePeer {
+public class UsingIsisViewerPeer extends AbstractFixturePeer {
private static List<Perform> performCommands(final Perform.Mode mode) {
ArrayList<Perform> commands = new ArrayList<Perform>();
@@ -83,7 +83,7 @@ public class UsingNakedObjectsViewerPeer
private final Map<String, Perform> commandByKey = new HashMap<String, Perform>();
- public UsingNakedObjectsViewerPeer(final AliasRegistry aliasesRegistry,
+ public UsingIsisViewerPeer(final AliasRegistry aliasesRegistry,
final Perform.Mode mode, final CellBinding onObjectBinding,
final CellBinding aliasResultAsBinding,
final CellBinding performBinding,
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformContext.java?rev=1035242&r1=1035241&r2=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformContext.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformContext.java Mon Nov 15 12:10:23 2010
@@ -9,7 +9,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.bdd.common.CellBinding;
import org.apache.isis.viewer.bdd.common.StoryBoundValueException;
import org.apache.isis.viewer.bdd.common.StoryCell;
-import org.apache.isis.viewer.bdd.common.fixtures.UsingNakedObjectsViewerPeer;
+import org.apache.isis.viewer.bdd.common.fixtures.UsingIsisViewerPeer;
/**
* Represents the context for a single {@link Perform} command; in effect, a row
@@ -17,13 +17,13 @@ import org.apache.isis.viewer.bdd.common
*/
public class PerformContext {
- private final UsingNakedObjectsViewerPeer peer;
+ private final UsingIsisViewerPeer peer;
private final ObjectAdapter onAdapter;
private final ObjectMember nakedObjectMember;
private final List<StoryCell> argumentCells;
- public PerformContext(final UsingNakedObjectsViewerPeer peer,
+ public PerformContext(final UsingIsisViewerPeer peer,
final ObjectAdapter onAdapter,
final ObjectMember nakedObjectMember,
final List<StoryCell> argumentCells) {
@@ -33,7 +33,7 @@ public class PerformContext {
this.argumentCells = argumentCells;
}
- public UsingNakedObjectsViewerPeer getPeer() {
+ public UsingIsisViewerPeer getPeer() {
return peer;
}
Modified: incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionTest.java?rev=1035242&r1=1035241&r2=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionTest.java (original)
+++ incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionTest.java Mon Nov 15 12:10:23 2010
@@ -166,7 +166,7 @@ public class AbstractIsisConcordionTest
ConfigurationBuilderFileSystem configurationBuilder = new ConfigurationBuilderFileSystem(getConfigDirectory());
IsisInitializer initializer = new IsisInitializer(getStory(), configurationBuilder, getDeploymentType());
initializer.initialize();
- return true; // any runtime exception will propogate
+ return true; // any runtime exception will propagate
}
public void aliasAs(String alias, ObjectAdapter adapter) {
@@ -323,91 +323,86 @@ public class AbstractIsisConcordionTest
private UsingIsisViewerForConcordion usingIsisViewer;
public String usingIsisViewer(String onObject, String aliasResultAs, String perform, String usingMember) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, null, null,
- null);
+ return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, null, null, null);
}
- public String usingIsisViewerThat(String onObject, String aliasResultAs, String perform,
- String usingMember, String thatIt) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, null,
- null, null);
+ public String usingIsisViewerThat(String onObject, String aliasResultAs, String perform, String usingMember,
+ String thatIt) {
+ return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, null, null, null);
}
- public String usingIsisViewerArgs(String onObject, String aliasResultAs, String perform,
- String usingMember, String arg0) {
+ public String usingIsisViewerArgs(String onObject, String aliasResultAs, String perform, String usingMember,
+ String arg0) {
return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0);
}
- public String usingIsisViewerArgs(String onObject, String aliasResultAs, String perform,
- String usingMember, String arg0, String arg1) {
+ public String usingIsisViewerArgs(String onObject, String aliasResultAs, String perform, String usingMember,
+ String arg0, String arg1) {
return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1);
}
- public String usingIsisViewerArgs(String onObject, String aliasResultAs, String perform,
- String usingMember, String arg0, String arg1, String arg2) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1,
- arg2);
+ public String usingIsisViewerArgs(String onObject, String aliasResultAs, String perform, String usingMember,
+ String arg0, String arg1, String arg2) {
+ return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1, arg2);
}
- public String usingIsisViewerArgs(String onObject, String aliasResultAs, String perform,
- String usingMember, String arg0, String arg1, String arg2, String arg3) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1,
- arg2, arg3);
+ public String usingIsisViewerArgs(String onObject, String aliasResultAs, String perform, String usingMember,
+ String arg0, String arg1, String arg2, String arg3) {
+ return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1, arg2,
+ arg3);
}
- public String usingIsisViewerArgs(String onObject, String aliasResultAs, String perform,
- String usingMember, String arg0, String arg1, String arg2, String arg3, String arg4) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1,
- arg2, arg3, arg4);
+ public String usingIsisViewerArgs(String onObject, String aliasResultAs, String perform, String usingMember,
+ String arg0, String arg1, String arg2, String arg3, String arg4) {
+ return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1, arg2,
+ arg3, arg4);
}
- public String usingIsisViewerArgs(String onObject, String aliasResultAs, String perform,
- String usingMember, String arg0, String arg1, String arg2, String arg3, String arg4, String arg5) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1,
- arg2, arg3, arg4, arg5);
+ public String usingIsisViewerArgs(String onObject, String aliasResultAs, String perform, String usingMember,
+ String arg0, String arg1, String arg2, String arg3, String arg4, String arg5) {
+ return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1, arg2,
+ arg3, arg4, arg5);
}
- public String usingIsisViewerThatArgs(String onObject, String aliasResultAs, String perform,
- String usingMember, String thatIt, String arg0) {
+ public String usingIsisViewerThatArgs(String onObject, String aliasResultAs, String perform, String usingMember,
+ String thatIt, String arg0) {
return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0);
}
- public String usingIsisViewerThatArgs(String onObject, String aliasResultAs, String perform,
- String usingMember, String thatIt, String arg0, String arg1) {
+ public String usingIsisViewerThatArgs(String onObject, String aliasResultAs, String perform, String usingMember,
+ String thatIt, String arg0, String arg1) {
return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, arg1);
}
- public String usingIsisViewerThatArgs(String onObject, String aliasResultAs, String perform,
- String usingMember, String thatIt, String arg0, String arg1, String arg2) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0,
- arg1, arg2);
- }
-
- public String usingIsisViewerThatArgs(String onObject, String aliasResultAs, String perform,
- String usingMember, String thatIt, String arg0, String arg1, String arg2, String arg3) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0,
- arg1, arg2, arg3);
- }
-
- public String usingIsisViewerThatArgs(String onObject, String aliasResultAs, String perform,
- String usingMember, String thatIt, String arg0, String arg1, String arg2, String arg3, String arg4) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0,
- arg1, arg2, arg3, arg4);
+ public String usingIsisViewerThatArgs(String onObject, String aliasResultAs, String perform, String usingMember,
+ String thatIt, String arg0, String arg1, String arg2) {
+ return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, arg1, arg2);
+ }
+
+ public String usingIsisViewerThatArgs(String onObject, String aliasResultAs, String perform, String usingMember,
+ String thatIt, String arg0, String arg1, String arg2, String arg3) {
+ return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, arg1, arg2,
+ arg3);
+ }
+
+ public String usingIsisViewerThatArgs(String onObject, String aliasResultAs, String perform, String usingMember,
+ String thatIt, String arg0, String arg1, String arg2, String arg3, String arg4) {
+ return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, arg1, arg2,
+ arg3, arg4);
}
private String usingIsisViewerThatArgsVarargs(String onObject, String aliasResultAs, String perform,
String usingMember, String thatIt, String arg0, String... remainingArgs) {
if (executingInline()) {
usingIsisViewer = new UsingIsisViewerForConcordion(getStory(), Perform.Mode.TEST);
- usingIsisViewer.executeHeader(onObject, aliasResultAs, perform, usingMember, thatIt, arg0,
- remainingArgs);
+ usingIsisViewer.executeHeader(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, remainingArgs);
return usingIsisViewer.executeRow(onObject, aliasResultAs, perform, usingMember, thatIt, arg0,
remainingArgs);
} else {
if (executingTableHeader()) {
usingIsisViewer = new UsingIsisViewerForConcordion(getStory(), Perform.Mode.TEST);
- return usingIsisViewer.executeHeader(onObject, aliasResultAs, perform, usingMember, thatIt,
- arg0, remainingArgs);
+ return usingIsisViewer.executeHeader(onObject, aliasResultAs, perform, usingMember, thatIt, arg0,
+ remainingArgs);
} else {
return usingIsisViewer.executeRow(onObject, aliasResultAs, perform, usingMember, thatIt, arg0,
remainingArgs);
Modified: incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/UsingIsisViewerForConcordion.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/UsingIsisViewerForConcordion.java?rev=1035242&r1=1035241&r2=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/UsingIsisViewerForConcordion.java (original)
+++ incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/UsingIsisViewerForConcordion.java Mon Nov 15 12:10:23 2010
@@ -10,7 +10,7 @@ import org.apache.isis.viewer.bdd.common
import org.apache.isis.viewer.bdd.common.Constants;
import org.apache.isis.viewer.bdd.common.StoryBoundValueException;
import org.apache.isis.viewer.bdd.common.StoryCell;
-import org.apache.isis.viewer.bdd.common.fixtures.UsingNakedObjectsViewerPeer;
+import org.apache.isis.viewer.bdd.common.fixtures.UsingIsisViewerPeer;
import org.apache.isis.viewer.bdd.common.fixtures.perform.Perform;
import org.apache.isis.viewer.bdd.concordion.internal.fixtures.bindings.CellBindingForConcordion;
import org.apache.isis.viewer.bdd.concordion.internal.fixtures.perform.StoryCellForConcordion;
@@ -18,7 +18,7 @@ import org.apache.isis.viewer.bdd.concor
import com.google.common.collect.Lists;
public class UsingIsisViewerForConcordion extends
- AbstractFixture<UsingNakedObjectsViewerPeer> {
+ AbstractFixture<UsingIsisViewerPeer> {
private final List<String> argumentCells = new ArrayList<String>();
@@ -54,7 +54,7 @@ public class UsingIsisViewerForConcordio
final CellBinding performBinding,
final CellBinding onMemberBinding, final CellBinding thatItBinding,
final CellBinding arg0Binding) {
- super(new UsingNakedObjectsViewerPeer(aliasesRegistry, mode,
+ super(new UsingIsisViewerPeer(aliasesRegistry, mode,
onObjectBinding, aliasResultAsBinding, performBinding,
onMemberBinding, thatItBinding, arg0Binding));
}
Modified: incubator/isis/trunk/viewer/bdd/fitnesse/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/pom.xml?rev=1035242&r1=1035241&r2=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/pom.xml (original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/pom.xml Mon Nov 15 12:10:23 2010
@@ -3,17 +3,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>bdd</artifactId>
+ <groupId>org.apache.isis</groupId>
+ <artifactId>isis-parent</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
+ <groupId>net.sf.isis-contrib</groupId>
<artifactId>bdd-fitnesse</artifactId>
- <name>BDD Viewers: FitNesse</name>
-
- <properties>
- <siteBaseDir>../../..</siteBaseDir>
- </properties>
+ <version>0.1-SNAPSHOT</version>
+
+ <name>FitNesse Integration for Isis</name>
<build>
<plugins>
@@ -26,8 +25,9 @@
</build>
<properties>
- <fitnesse.version>20100103</fitnesse.version>
+ <fitnesse.version>20101101</fitnesse.version>
<fitlibrary.version>20091020</fitlibrary.version>
+ <isis.version>0.1-SNAPSHOT</isis.version>
</properties>
<dependencyManagement>
@@ -35,22 +35,28 @@
<!-- 3rd party dependencies -->
- <!-- download from http://fitnesse.org/fitnesse.jar?responder=releaseDownload&release=20100103
- and install using mvn install:install-file -->
- <dependency>
+ <!-- download from http://fitnesse.org/fitnesse.jar?responder=releaseDownload&release=20101101
+ and install using mvn install:install-file -D groupId=org.fitnesse -D artifactId=fitnesse -D version=20101101 -D packaging=jar -D file=fitnesse.jar -->
+ <dependency>
<groupId>org.fitnesse</groupId>
<artifactId>fitnesse</artifactId>
<version>${fitnesse.version}</version>
</dependency>
<!-- download from http://sourceforge.net/projects/fitlibrary/files/ and
- install using mvn install:install-file -->
+ install using mvn install:install-file -D groupId=org.fitnesse -D artifactId=fitlibrary -D version=20091020 -D packaging=jar -D file=fitlibrary.jar -->
<dependency>
<groupId>org.fitnesse</groupId>
<artifactId>fitlibrary</artifactId>
<version>${fitlibrary.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>bdd-common</artifactId>
+ <version>${isis.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -58,19 +64,16 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>bdd-common</artifactId>
- <type>jar</type>
</dependency>
<dependency>
<groupId>org.fitnesse</groupId>
<artifactId>fitnesse</artifactId>
- <type>jar</type>
</dependency>
<dependency>
<groupId>org.fitnesse</groupId>
<artifactId>fitlibrary</artifactId>
- <type>jar</type>
</dependency>
</dependencies>
Copied: incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/StoryFitNesseException.java (from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/StoryFitNesseException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/StoryFitNesseException.java?p2=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/StoryFitNesseException.java&p1=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/StoryFitNesseException.java&r1=1034020&r2=1035242&rev=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/StoryFitNesseException.java (original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/StoryFitNesseException.java Mon Nov 15 12:10:23 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.bdd.fitnesse;
+package net.sf.isiscontrib.bdd.fitnesse;
public class StoryFitNesseException extends RuntimeException {
Copied: incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/StoryFixture.java (from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/StoryFixture.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/StoryFixture.java?p2=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/StoryFixture.java&p1=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/StoryFixture.java&r1=1034020&r2=1035242&rev=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/StoryFixture.java (original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/StoryFixture.java Mon Nov 15 12:10:23 2010
@@ -1,52 +1,53 @@
-package org.apache.isis.extensions.bdd.fitnesse;
+package net.sf.isiscontrib.bdd.fitnesse;
import java.util.Date;
-import org.apache.isis.extensions.bdd.common.Story;
-import org.apache.isis.extensions.bdd.common.StoryValueException;
-import org.apache.isis.extensions.bdd.common.fixtures.SetUpObjectsPeer;
-import org.apache.isis.extensions.bdd.common.fixtures.CheckListPeer.CheckMode;
-import org.apache.isis.extensions.bdd.common.fixtures.perform.Perform;
-import org.apache.isis.extensions.bdd.common.parsers.JavaUtilDateParser;
-import org.apache.isis.extensions.bdd.common.story.bootstrapping.InitNakedObjects;
-import org.apache.isis.extensions.bdd.fitnesse.internal.FitnesseConfigurationBuilder;
-import org.apache.isis.extensions.bdd.fitnesse.internal.fixtures.AliasItemsInListForFitNesse;
-import org.apache.isis.extensions.bdd.fitnesse.internal.fixtures.AliasServicesForFitNesse;
-import org.apache.isis.extensions.bdd.fitnesse.internal.fixtures.CheckListForFitNesse;
-import org.apache.isis.extensions.bdd.fitnesse.internal.fixtures.CheckSpecificationsLoadedForFitNesse;
-import org.apache.isis.extensions.bdd.fitnesse.internal.fixtures.DebugClockForFitNesse;
-import org.apache.isis.extensions.bdd.fitnesse.internal.fixtures.DebugObjectStoreForFitNesse;
-import org.apache.isis.extensions.bdd.fitnesse.internal.fixtures.DebugServicesForFitNesse;
-import org.apache.isis.extensions.bdd.fitnesse.internal.fixtures.SetUpObjectsForFitNesse;
-import org.apache.isis.extensions.bdd.fitnesse.internal.fixtures.UsingNakedObjectsViewerForFitNesse;
-import org.apache.isis.metamodel.config.ConfigurationBuilder;
+import net.sf.isiscontrib.bdd.fitnesse.internal.FitnesseConfigurationBuilder;
+import net.sf.isiscontrib.bdd.fitnesse.internal.fixtures.AliasItemsInListForFitNesse;
+import net.sf.isiscontrib.bdd.fitnesse.internal.fixtures.AliasServicesForFitNesse;
+import net.sf.isiscontrib.bdd.fitnesse.internal.fixtures.CheckListForFitNesse;
+import net.sf.isiscontrib.bdd.fitnesse.internal.fixtures.CheckSpecificationsLoadedForFitNesse;
+import net.sf.isiscontrib.bdd.fitnesse.internal.fixtures.DebugClockForFitNesse;
+import net.sf.isiscontrib.bdd.fitnesse.internal.fixtures.DebugObjectStoreForFitNesse;
+import net.sf.isiscontrib.bdd.fitnesse.internal.fixtures.DebugServicesForFitNesse;
+import net.sf.isiscontrib.bdd.fitnesse.internal.fixtures.SetUpObjectsForFitNesse;
+import net.sf.isiscontrib.bdd.fitnesse.internal.fixtures.UsingIsisViewerForFitNesse;
+
+import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
import org.apache.isis.runtime.installers.InstallerLookup;
import org.apache.isis.runtime.system.DeploymentType;
import org.apache.isis.runtime.system.IsisSystem;
+import org.apache.isis.viewer.bdd.common.Story;
+import org.apache.isis.viewer.bdd.common.StoryValueException;
+import org.apache.isis.viewer.bdd.common.fixtures.CheckListPeer.CheckMode;
+import org.apache.isis.viewer.bdd.common.fixtures.SetUpObjectsPeer;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.Perform;
+import org.apache.isis.viewer.bdd.common.parsers.JavaUtilDateParser;
+import org.apache.isis.viewer.bdd.common.story.bootstrapping.IsisInitializer;
import fit.Fixture;
import fitlibrary.DoFixture;
public class StoryFixture extends DoFixture {
- private static ThreadLocal<Story> storyThreadLocal = new ThreadLocal<Story>() {
- @Override
- protected Story initialValue() {
- return new Story();
- }
- };
-
- public static Story getStory() {
- return storyThreadLocal.get();
- }
+ private static ThreadLocal<Story> storyThreadLocal = new ThreadLocal<Story>() {
+ @Override
+ protected Story initialValue() {
+ return new Story();
+ }
+ };
+
+ public static Story getStory() {
+ return storyThreadLocal.get();
+ }
public StoryFixture() {
registerParseDelegate(java.util.Date.class, new JavaUtilDateParser());
}
- public void initNakedObjects() {
- InitNakedObjects initializer = new InitNakedObjects(getStory(), newConfigurationBuilder(), getDeploymentType());
- initializer.initialize();
+ public void initIsis() {
+ IsisInitializer initializer = new IsisInitializer(getStory(), newConfigurationBuilder(), getDeploymentType());
+ initializer.initialize();
}
public void logonAs(final String userName) {
@@ -54,42 +55,41 @@ public class StoryFixture extends DoFixt
}
public void logonAsWithRoles(final String userName, final String roleList) {
- getStory().logonAsWithRoles(userName, roleList);
+ getStory().logonAsWithRoles(userName, roleList);
}
/**
* Switch user, specifying no roles.
*/
public void switchUser(final String userName) {
- getStory().switchUser(userName);
+ getStory().switchUser(userName);
}
/**
* Switch user, specifying roles.
*/
public void switchUserWithRoles(final String userName, final String roleList) {
- getStory().switchUserWithRoles(userName, roleList);
+ getStory().switchUserWithRoles(userName, roleList);
}
public Fixture aliasServices() {
return new AliasServicesForFitNesse(getStory());
}
-
public void dateIsNow(final Date dateAndTime) {
getStory().dateIs(dateAndTime);
}
public void dateIs(final Date dateAndTime) {
- getStory().timeIs(dateAndTime);
+ getStory().timeIs(dateAndTime);
}
public void timeIsNow(final Date dateAndTime) {
- getStory().timeIs(dateAndTime);
+ getStory().timeIs(dateAndTime);
}
public void timeIs(final Date dateAndTime) {
- getStory().timeIs(dateAndTime);
+ getStory().timeIs(dateAndTime);
}
public void shutdownNakedObjects() {
@@ -119,8 +119,7 @@ public class StoryFixture extends DoFixt
}
public Fixture setUpTransientObjects(final String className) {
- return new SetUpObjectsForFitNesse(getStory(), className,
- SetUpObjectsPeer.Mode.DO_NOT_PERSIST);
+ return new SetUpObjectsForFitNesse(getStory(), className, SetUpObjectsPeer.Mode.DO_NOT_PERSIST);
}
public Fixture usingNakedObjectsViewer() {
@@ -139,7 +138,7 @@ public class StoryFixture extends DoFixt
}
public Fixture usingNakedObjectsViewer(final Perform.Mode mode) {
- return new UsingNakedObjectsViewerForFitNesse(getStory(), mode);
+ return new UsingIsisViewerForFitNesse(getStory(), mode);
}
public Fixture checkListContains(final String listAlias) {
@@ -169,15 +168,14 @@ public class StoryFixture extends DoFixt
getStory().runViewer();
}
-
public String getConfigDirectory() {
return getStory().getConfigDirectory();
}
+
public void setConfigDirectory(final String configDirectory) {
getStory().setConfigDirectory(configDirectory);
}
-
public void enableExploration() {
getStory().enableExploration();
}
@@ -207,14 +205,13 @@ public class StoryFixture extends DoFixt
}
public void aliasServiceAs(final String alias, final String serviceClassName) {
- try {
- getStory().registerService(alias, serviceClassName);
- } catch (StoryValueException ex) {
- throw new StoryFitNesseException(ex);
- }
+ try {
+ getStory().registerService(alias, serviceClassName);
+ } catch (StoryValueException ex) {
+ throw new StoryFitNesseException(ex);
+ }
}
-
// /////////////////////////////////////////////////////////
// System
// /////////////////////////////////////////////////////////
@@ -223,9 +220,8 @@ public class StoryFixture extends DoFixt
return getStory().getSystem();
}
- public void setNakedObjectsSystem(
- final IsisSystem nakedObjectsSystem) {
- getStory().setNakedObjectsSystem(nakedObjectsSystem);
+ public void setIsisSystem(final IsisSystem isisSystem) {
+ getStory().setIsisSystem(isisSystem);
}
public InstallerLookup getInstallerLookup() {
@@ -237,9 +233,7 @@ public class StoryFixture extends DoFixt
}
public ConfigurationBuilder newConfigurationBuilder() {
- return new FitnesseConfigurationBuilder(
- getConfigDirectory());
+ return new FitnesseConfigurationBuilder(getConfigDirectory());
}
-
-
+
}
Copied: incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/AbstractFixture.java (from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/AbstractFixture.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/AbstractFixture.java?p2=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/AbstractFixture.java&p1=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/AbstractFixture.java&r1=1034020&r2=1035242&rev=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/AbstractFixture.java (original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/AbstractFixture.java Mon Nov 15 12:10:23 2010
@@ -1,39 +1,41 @@
-package org.apache.isis.extensions.bdd.fitnesse.internal;
+package net.sf.isiscontrib.bdd.fitnesse.internal;
import java.io.PrintWriter;
import java.io.StringWriter;
-import org.apache.isis.extensions.bdd.common.CellBinding;
-import org.apache.isis.extensions.bdd.common.StoryCell;
-import org.apache.isis.extensions.bdd.common.fixtures.AbstractFixturePeer;
-import org.apache.isis.extensions.bdd.fitnesse.internal.fixtures.perform.StoryCellForFitNesse;
-import org.apache.isis.extensions.bdd.fitnesse.internal.util.FitnesseUtil;
+import net.sf.isiscontrib.bdd.fitnesse.internal.fixtures.perform.StoryCellForFitNesse;
+import net.sf.isiscontrib.bdd.fitnesse.internal.util.FitnesseUtil;
+
+import org.apache.isis.viewer.bdd.common.CellBinding;
+import org.apache.isis.viewer.bdd.common.StoryCell;
+import org.apache.isis.viewer.bdd.common.fixtures.AbstractFixturePeer;
import fit.Fixture;
import fit.Parse;
public abstract class AbstractFixture<T extends AbstractFixturePeer> extends Fixture {
- private final T peer;
+ private final T peer;
private Parse currentRow;
private Parse table;
protected AbstractFixture(final T fixturePeer) {
- this.peer = fixturePeer;
+ this.peer = fixturePeer;
}
-
+
protected T getPeer() {
- return peer;
+ return peer;
}
-
+
protected Parse getCurrentRow() {
return currentRow;
}
+
protected void setCurrentRow(final Parse currentRow) {
this.currentRow = currentRow;
}
-
+
@Override
public void doTable(final Parse table) {
this.table = table;
@@ -43,12 +45,11 @@ public abstract class AbstractFixture<T
@Override
public void doRows(final Parse headRow) {
for (final CellBinding binding : getPeer().getCellBindings()) {
- ((CellBindingForFitNesse)binding).find(headRow.parts);
+ ((CellBindingForFitNesse) binding).find(headRow.parts);
}
for (final CellBinding binding : getPeer().getCellBindings()) {
if (!binding.isOptional() && !binding.isFound()) {
- FitnesseUtil.exception(this, table.parts.parts, "require '"
- + binding.getName() + "' column");
+ FitnesseUtil.exception(this, table.parts.parts, "require '" + binding.getName() + "' column");
}
}
doRowsWithBindings(headRow);
@@ -56,10 +57,10 @@ public abstract class AbstractFixture<T
}
/**
- * Hook method for logic to be done after finding bindings, and before
- * continuing processing.
+ * Hook method for logic to be done after finding bindings, and before continuing processing.
*/
- protected void doRowsWithBindings(final Parse headRow) {}
+ protected void doRowsWithBindings(final Parse headRow) {
+ }
@Override
public void doRow(final Parse row) {
@@ -105,7 +106,7 @@ public abstract class AbstractFixture<T
}
protected void right(StoryCell storyValue) {
- right(FitnesseUtil.asParse(storyValue));
- }
+ right(FitnesseUtil.asParse(storyValue));
+ }
}
Copied: incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/AbstractSetUpFixture.java (from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/AbstractSetUpFixture.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/AbstractSetUpFixture.java?p2=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/AbstractSetUpFixture.java&p1=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/AbstractSetUpFixture.java&r1=1034020&r2=1035242&rev=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/AbstractSetUpFixture.java (original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/AbstractSetUpFixture.java Mon Nov 15 12:10:23 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.bdd.fitnesse.internal;
+package net.sf.isiscontrib.bdd.fitnesse.internal;
import fitlibrary.SetUpFixture;
Copied: incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/AbstractSubsetFixture.java (from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/AbstractSubsetFixture.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/AbstractSubsetFixture.java?p2=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/AbstractSubsetFixture.java&p1=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/AbstractSubsetFixture.java&r1=1034020&r2=1035242&rev=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/AbstractSubsetFixture.java (original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/AbstractSubsetFixture.java Mon Nov 15 12:10:23 2010
@@ -1,6 +1,6 @@
-package org.apache.isis.extensions.bdd.fitnesse.internal;
+package net.sf.isiscontrib.bdd.fitnesse.internal;
-import org.apache.isis.extensions.bdd.common.AliasRegistry;
+import org.apache.isis.viewer.bdd.common.AliasRegistry;
import fitlibrary.SubsetFixture;
@@ -8,13 +8,13 @@ public abstract class AbstractSubsetFixt
private final AliasRegistry aliasesRegistry;
- public AbstractSubsetFixture(AliasRegistry aliasesRegistry, Object actuals) {
- super(actuals);
- this.aliasesRegistry = aliasesRegistry;
- }
-
- public AliasRegistry getAliasesRegistry() {
- return aliasesRegistry;
- }
-
+ public AbstractSubsetFixture(AliasRegistry aliasesRegistry, Object actuals) {
+ super(actuals);
+ this.aliasesRegistry = aliasesRegistry;
+ }
+
+ public AliasRegistry getAliasesRegistry() {
+ return aliasesRegistry;
+ }
+
}
Copied: incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/CellBindingForFitNesse.java (from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/CellBindingForFitNesse.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/CellBindingForFitNesse.java?p2=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/CellBindingForFitNesse.java&p1=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/CellBindingForFitNesse.java&r1=1034020&r2=1035242&rev=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/CellBindingForFitNesse.java (original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/CellBindingForFitNesse.java Mon Nov 15 12:10:23 2010
@@ -1,10 +1,11 @@
-package org.apache.isis.extensions.bdd.fitnesse.internal;
+package net.sf.isiscontrib.bdd.fitnesse.internal;
import java.util.Map;
-import org.apache.isis.extensions.bdd.common.CellBinding;
-import org.apache.isis.extensions.bdd.common.StoryCell;
-import org.apache.isis.extensions.bdd.fitnesse.internal.fixtures.perform.StoryCellForFitNesse;
+import net.sf.isiscontrib.bdd.fitnesse.internal.fixtures.perform.StoryCellForFitNesse;
+
+import org.apache.isis.viewer.bdd.common.CellBinding;
+import org.apache.isis.viewer.bdd.common.StoryCell;
import com.google.common.base.Function;
import com.google.common.collect.Maps;
@@ -50,67 +51,65 @@ public class CellBindingForFitNesse exte
return new Builder(name, headText);
}
- private CellBindingForFitNesse(final String name, final boolean autoCreate,
- final boolean ditto, final boolean optional,
- final String[] headTexts) {
- super(name, autoCreate, ditto, optional, headTexts);
+ private CellBindingForFitNesse(final String name, final boolean autoCreate, final boolean ditto,
+ final boolean optional, final String[] headTexts) {
+ super(name, autoCreate, ditto, optional, headTexts);
}
-
/**
- * Finds the heading text, optionally creating it if not found and
- * {@link Builder#autoCreate() created as an auto} binding.
+ * Finds the heading text, optionally creating it if not found and {@link Builder#autoCreate() created as an auto}
+ * binding.
*
* @param heads
*/
public void find(final Parse heads) {
- Map<Integer, StoryCell> storyValuesMap = toMap(heads);
+ Map<Integer, StoryCell> storyValuesMap = toMap(heads);
if (!locate(heads) && isAutoCreate()) {
// Append an alias cell to header
final int size = storyValuesMap.size();
- final Parse aliasCell = new Parse("td", Fixture.gray(getHeadTexts()
- .get(0)), null, null);
+ final Parse aliasCell = new Parse("td", Fixture.gray(getHeadTexts().get(0)), null, null);
heads.last().more = aliasCell;
create(size, new StoryCellForFitNesse(aliasCell));
}
}
- protected void copy(final StoryCell from, StoryCell to) {
- to.setText(Fixture.gray(from.getText()));
- }
+ @Override
+ protected void copy(final StoryCell from, StoryCell to) {
+ to.setText(Fixture.gray(from.getText()));
+ }
private boolean locate(final Parse heads) {
- Map<Integer, StoryCell> headStoryValuesMap = toMap(heads);
+ Map<Integer, StoryCell> headStoryValuesMap = toMap(heads);
return locate(headStoryValuesMap);
}
- private boolean locate(Map<Integer, StoryCell> headStoryValuesMap) {
- for (Integer colNum : headStoryValuesMap.keySet()) {
- StoryCell storyValue = headStoryValuesMap.get(colNum);
- final String headText = storyValue.getText();
-
+ private boolean locate(Map<Integer, StoryCell> headStoryValuesMap) {
+ for (Integer colNum : headStoryValuesMap.keySet()) {
+ StoryCell storyValue = headStoryValuesMap.get(colNum);
+ final String headText = storyValue.getText();
+
if (matches(headText)) {
foundHeadColumn(colNum, storyValue);
break;
}
- }
+ }
return isFound();
- }
-
+ }
public static Map<Integer, StoryCell> toMap(final Parse firstParse) {
- Parse eachParse = firstParse;
+ Parse eachParse = firstParse;
Map<Integer, Parse> parseMap = Maps.newLinkedHashMap();
for (int i = 0; eachParse != null; i++, eachParse = eachParse.more) {
- parseMap.put(i, eachParse);
+ parseMap.put(i, eachParse);
}
- Map<Integer, StoryCell> storyValuesMap = Maps.transformValues(parseMap, new Function<Parse, StoryCell>(){
- public StoryCell apply(Parse from) {
- return new StoryCellForFitNesse(from);
- }
- });
+ Map<Integer, StoryCell> storyValuesMap = Maps.transformValues(parseMap, new Function<Parse, StoryCell>() {
+ @Override
+ public StoryCell apply(Parse from) {
+ return new StoryCellForFitNesse(from);
+ }
+ });
return storyValuesMap;
- }
+ }
}
Copied: incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/FitnesseConfigurationBuilder.java (from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/FitnesseConfigurationBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/FitnesseConfigurationBuilder.java?p2=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/FitnesseConfigurationBuilder.java&p1=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/FitnesseConfigurationBuilder.java&r1=1034020&r2=1035242&rev=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/FitnesseConfigurationBuilder.java (original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/FitnesseConfigurationBuilder.java Mon Nov 15 12:10:23 2010
@@ -1,22 +1,20 @@
-package org.apache.isis.extensions.bdd.fitnesse.internal;
+package net.sf.isiscontrib.bdd.fitnesse.internal;
-import org.apache.isis.metamodel.config.ConfigurationBuilderFileSystem;
-import org.apache.isis.metamodel.config.NotFoundPolicy;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilderFileSystem;
+import org.apache.isis.core.metamodel.config.NotFoundPolicy;
-public class FitnesseConfigurationBuilder extends
- ConfigurationBuilderFileSystem {
+public class FitnesseConfigurationBuilder extends ConfigurationBuilderFileSystem {
- public static final String TESTEDOBJECTS_FITNESSE_CONFIG_FILE = "testedobjects.fitnesse.properties";
-
- public FitnesseConfigurationBuilder(final String configurationDirectory) {
- super(configurationDirectory);
- }
-
- @Override
- protected void addDefaultConfigurationResources() {
- super.addDefaultConfigurationResources();
- addConfigurationResource(TESTEDOBJECTS_FITNESSE_CONFIG_FILE,
- NotFoundPolicy.CONTINUE);
- }
+ public static final String TESTEDOBJECTS_FITNESSE_CONFIG_FILE = "testedobjects.fitnesse.properties";
+
+ public FitnesseConfigurationBuilder(final String configurationDirectory) {
+ super(configurationDirectory);
+ }
+
+ @Override
+ protected void addDefaultConfigurationResources() {
+ super.addDefaultConfigurationResources();
+ addConfigurationResource(TESTEDOBJECTS_FITNESSE_CONFIG_FILE, NotFoundPolicy.CONTINUE);
+ }
}
Copied: incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/AliasItemsInListForFitNesse.java (from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/AliasItemsInListForFitNesse.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/AliasItemsInListForFitNesse.java?p2=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/AliasItemsInListForFitNesse.java&p1=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/AliasItemsInListForFitNesse.java&r1=1034020&r2=1035242&rev=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/AliasItemsInListForFitNesse.java (original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/AliasItemsInListForFitNesse.java Mon Nov 15 12:10:23 2010
@@ -1,60 +1,51 @@
-package org.apache.isis.extensions.bdd.fitnesse.internal.fixtures;
-import org.apache.isis.extensions.bdd.common.AliasRegistry;
-import org.apache.isis.extensions.bdd.common.CellBinding;
-import org.apache.isis.extensions.bdd.common.Constants;
-import org.apache.isis.extensions.bdd.common.StoryBoundValueException;
-import org.apache.isis.extensions.bdd.common.StoryCell;
-import org.apache.isis.extensions.bdd.common.StoryValueException;
-import org.apache.isis.extensions.bdd.common.fixtures.AliasItemsInListPeer;
-import org.apache.isis.extensions.bdd.fitnesse.internal.AbstractFixture;
-import org.apache.isis.extensions.bdd.fitnesse.internal.CellBindingForFitNesse;
-import org.apache.isis.extensions.bdd.fitnesse.internal.util.FitnesseUtil;
+package net.sf.isiscontrib.bdd.fitnesse.internal.fixtures;
+
+import net.sf.isiscontrib.bdd.fitnesse.internal.AbstractFixture;
+import net.sf.isiscontrib.bdd.fitnesse.internal.CellBindingForFitNesse;
+import net.sf.isiscontrib.bdd.fitnesse.internal.util.FitnesseUtil;
+
+import org.apache.isis.viewer.bdd.common.AliasRegistry;
+import org.apache.isis.viewer.bdd.common.CellBinding;
+import org.apache.isis.viewer.bdd.common.Constants;
+import org.apache.isis.viewer.bdd.common.StoryBoundValueException;
+import org.apache.isis.viewer.bdd.common.StoryCell;
+import org.apache.isis.viewer.bdd.common.StoryValueException;
+import org.apache.isis.viewer.bdd.common.fixtures.AliasItemsInListPeer;
import fit.Parse;
public class AliasItemsInListForFitNesse extends AbstractFixture<AliasItemsInListPeer> {
- public AliasItemsInListForFitNesse(final AliasRegistry aliasesRegistry,
- final String listAlias) {
- this(aliasesRegistry, listAlias,
- CellBindingForFitNesse.builder(
- Constants.TITLE_NAME, Constants.TITLE_HEAD)
- .build(),
- CellBindingForFitNesse.builder(
- Constants.TYPE_NAME, Constants.TYPE_HEAD)
- .optional().build(),
- CellBindingForFitNesse.builder(
- Constants.ALIAS_RESULT_NAME,
- Constants.ALIAS_RESULT_HEAD_SET)
- .autoCreate().build());
+ public AliasItemsInListForFitNesse(final AliasRegistry aliasesRegistry, final String listAlias) {
+ this(aliasesRegistry, listAlias, CellBindingForFitNesse.builder(Constants.TITLE_NAME, Constants.TITLE_HEAD)
+ .build(), CellBindingForFitNesse.builder(Constants.TYPE_NAME, Constants.TYPE_HEAD).optional().build(),
+ CellBindingForFitNesse.builder(Constants.ALIAS_RESULT_NAME, Constants.ALIAS_RESULT_HEAD_SET).autoCreate()
+ .build());
}
- private AliasItemsInListForFitNesse(final AliasRegistry aliasRegistry,
- final String listAlias, final CellBinding titleBinding,
- final CellBinding typeBinding, final CellBinding aliasBinding) {
+ private AliasItemsInListForFitNesse(final AliasRegistry aliasRegistry, final String listAlias,
+ final CellBinding titleBinding, final CellBinding typeBinding, final CellBinding aliasBinding) {
super(new AliasItemsInListPeer(aliasRegistry, listAlias, titleBinding, typeBinding, aliasBinding));
}
-
@Override
public void doTable(final Parse table) {
final Parse listAliasCell = table.parts.parts.more;
try {
- getPeer().assertIsList();
- } catch (StoryValueException e) {
- FitnesseUtil.exception(this, listAliasCell, e.getMessage());
- }
+ getPeer().assertIsList();
+ } catch (StoryValueException e) {
+ FitnesseUtil.exception(this, listAliasCell, e.getMessage());
+ }
super.doTable(table);
}
-
@Override
public void doRow(final Parse row) {
if (!getPeer().isList()) {
- return; //skip
+ return; // skip
}
doCells(row.parts);
@@ -67,13 +58,13 @@ public class AliasItemsInListForFitNesse
}
private void executeRow() {
- StoryCell currentCell;
- try {
- currentCell = getPeer().findAndAlias();
- right(FitnesseUtil.asParse(currentCell));
- } catch (StoryBoundValueException ex) {
- FitnesseUtil.exception(this, ex);
- }
+ StoryCell currentCell;
+ try {
+ currentCell = getPeer().findAndAlias();
+ right(FitnesseUtil.asParse(currentCell));
+ } catch (StoryBoundValueException ex) {
+ FitnesseUtil.exception(this, ex);
+ }
}
}
Copied: incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/AliasServicesForFitNesse.java (from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/AliasServicesForFitNesse.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/AliasServicesForFitNesse.java?p2=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/AliasServicesForFitNesse.java&p1=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/AliasServicesForFitNesse.java&r1=1034020&r2=1035242&rev=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/AliasServicesForFitNesse.java (original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/AliasServicesForFitNesse.java Mon Nov 15 12:10:23 2010
@@ -1,29 +1,28 @@
-package org.apache.isis.extensions.bdd.fitnesse.internal.fixtures;
+package net.sf.isiscontrib.bdd.fitnesse.internal.fixtures;
-import org.apache.isis.extensions.bdd.common.AliasRegistry;
-import org.apache.isis.extensions.bdd.common.StoryValueException;
-import org.apache.isis.extensions.bdd.common.fixtures.AliasServicesPeer;
-import org.apache.isis.extensions.bdd.fitnesse.StoryFitNesseException;
-import org.apache.isis.extensions.bdd.fitnesse.internal.AbstractSetUpFixture;
+import net.sf.isiscontrib.bdd.fitnesse.StoryFitNesseException;
+import net.sf.isiscontrib.bdd.fitnesse.internal.AbstractSetUpFixture;
-public class AliasServicesForFitNesse extends AbstractSetUpFixture<AliasServicesPeer> {
+import org.apache.isis.viewer.bdd.common.AliasRegistry;
+import org.apache.isis.viewer.bdd.common.StoryValueException;
+import org.apache.isis.viewer.bdd.common.fixtures.AliasServicesPeer;
+public class AliasServicesForFitNesse extends AbstractSetUpFixture<AliasServicesPeer> {
public AliasServicesForFitNesse(final AliasRegistry aliasesRegistry) {
- super(new AliasServicesPeer(aliasesRegistry));
+ super(new AliasServicesPeer(aliasesRegistry));
}
public void classNameAliasAs(final String className, final String aliasAs) {
- try {
- getPeer().aliasService(className, aliasAs);
- } catch (StoryValueException ex) {
- throw new StoryFitNesseException(ex);
- }
+ try {
+ getPeer().aliasService(className, aliasAs);
+ } catch (StoryValueException ex) {
+ throw new StoryFitNesseException(ex);
+ }
}
- public void classNameAliasEquals(final String className,
- final String aliasAs) {
- classNameAliasAs(className, aliasAs);
+ public void classNameAliasEquals(final String className, final String aliasAs) {
+ classNameAliasAs(className, aliasAs);
}
}
Copied: incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckListForFitNesse.java (from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/CheckListForFitNesse.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckListForFitNesse.java?p2=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckListForFitNesse.java&p1=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/CheckListForFitNesse.java&r1=1034020&r2=1035242&rev=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/CheckListForFitNesse.java (original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckListForFitNesse.java Mon Nov 15 12:10:23 2010
@@ -1,48 +1,45 @@
-package org.apache.isis.extensions.bdd.fitnesse.internal.fixtures;
+package net.sf.isiscontrib.bdd.fitnesse.internal.fixtures;
import java.util.List;
-import org.apache.isis.extensions.bdd.common.AliasRegistry;
-import org.apache.isis.extensions.bdd.common.CellBinding;
-import org.apache.isis.extensions.bdd.common.Constants;
-import org.apache.isis.extensions.bdd.common.StoryValueException;
-import org.apache.isis.extensions.bdd.common.fixtures.CheckListPeer;
-import org.apache.isis.extensions.bdd.common.fixtures.CheckListPeer.CheckMode;
-import org.apache.isis.extensions.bdd.fitnesse.internal.AbstractFixture;
-import org.apache.isis.extensions.bdd.fitnesse.internal.CellBindingForFitNesse;
-import org.apache.isis.extensions.bdd.fitnesse.internal.util.FitnesseUtil;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import net.sf.isiscontrib.bdd.fitnesse.internal.AbstractFixture;
+import net.sf.isiscontrib.bdd.fitnesse.internal.CellBindingForFitNesse;
+import net.sf.isiscontrib.bdd.fitnesse.internal.util.FitnesseUtil;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.viewer.bdd.common.AliasRegistry;
+import org.apache.isis.viewer.bdd.common.CellBinding;
+import org.apache.isis.viewer.bdd.common.Constants;
+import org.apache.isis.viewer.bdd.common.StoryValueException;
+import org.apache.isis.viewer.bdd.common.fixtures.CheckListPeer;
+import org.apache.isis.viewer.bdd.common.fixtures.CheckListPeer.CheckMode;
import fit.Fixture;
import fit.Parse;
public class CheckListForFitNesse extends AbstractFixture<CheckListPeer> {
- public CheckListForFitNesse(final AliasRegistry aliasesRegistry, final String listAlias,
- final CheckMode checkMode) {
- this(aliasesRegistry, listAlias, checkMode, CellBindingForFitNesse.builder(
- Constants.TITLE_NAME, Constants.TITLE_HEAD).build(),
- CellBindingForFitNesse.builder(Constants.TYPE_NAME, Constants.TYPE_HEAD)
- .optional().build());
+ public CheckListForFitNesse(final AliasRegistry aliasesRegistry, final String listAlias, final CheckMode checkMode) {
+ this(aliasesRegistry, listAlias, checkMode, CellBindingForFitNesse.builder(Constants.TITLE_NAME,
+ Constants.TITLE_HEAD).build(), CellBindingForFitNesse.builder(Constants.TYPE_NAME, Constants.TYPE_HEAD)
+ .optional().build());
}
- protected CheckListForFitNesse(final AliasRegistry aliasesRegistry,
- final String listAlias, final CheckMode checkMode,
- final CellBinding titleBinding, final CellBinding typeBinding) {
+ protected CheckListForFitNesse(final AliasRegistry aliasesRegistry, final String listAlias,
+ final CheckMode checkMode, final CellBinding titleBinding, final CellBinding typeBinding) {
super(new CheckListPeer(aliasesRegistry, listAlias, checkMode, titleBinding, typeBinding));
}
-
@Override
public void doTable(final Parse table) {
final Parse listAliasCell = table.parts.parts.more;
try {
- getPeer().assertIsList();
- } catch (StoryValueException e) {
- FitnesseUtil.exception(this, listAliasCell, e.getMessage());
- return;
- }
+ getPeer().assertIsList();
+ } catch (StoryValueException e) {
+ FitnesseUtil.exception(this, listAliasCell, e.getMessage());
+ return;
+ }
super.doTable(table);
@@ -51,7 +48,6 @@ public class CheckListForFitNesse extend
}
}
-
private void reportSurplus(final Parse table) {
final List<ObjectAdapter> notFoundAdapters = getPeer().getNotFoundAdapters();
@@ -86,13 +82,11 @@ public class CheckListForFitNesse extend
try {
if (!getPeer().findAndAddObject()) {
- FitnesseUtil.exception(this, getPeer().getTitleBinding().getCurrentCell(),
- "(not found)");
- }
+ FitnesseUtil.exception(this, getPeer().getTitleBinding().getCurrentCell(), "(not found)");
+ }
} catch (final Exception e) {
reportError(row, e);
}
}
-
}
Copied: incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java (from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java?p2=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java&p1=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java&r1=1034020&r2=1035242&rev=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java (original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java Mon Nov 15 12:10:23 2010
@@ -1,31 +1,29 @@
-package org.apache.isis.extensions.bdd.fitnesse.internal.fixtures;
+package net.sf.isiscontrib.bdd.fitnesse.internal.fixtures;
import java.util.Comparator;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.isis.extensions.bdd.common.AliasRegistry;
-import org.apache.isis.extensions.bdd.fitnesse.internal.AbstractSubsetFixture;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import net.sf.isiscontrib.bdd.fitnesse.internal.AbstractSubsetFixture;
+
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.viewer.bdd.common.AliasRegistry;
public class CheckSpecificationsLoadedForFitNesse extends AbstractSubsetFixture {
private static Set<ObjectSpecification> allSpecNames() {
- final Set<ObjectSpecification> specs =
- new TreeSet<ObjectSpecification>(
- new Comparator<ObjectSpecification>() {
- public int compare(final ObjectSpecification o1,
- final ObjectSpecification o2) {
+ final Set<ObjectSpecification> specs = new TreeSet<ObjectSpecification>(new Comparator<ObjectSpecification>() {
+ @Override
+ public int compare(final ObjectSpecification o1, final ObjectSpecification o2) {
return o1.getFullName().compareTo(o2.getFullName());
- }
- });
+ }
+ });
final SpecificationLoader specificationLoader = getSessionFactory().getSpecificationLoader();
- for (final ObjectSpecification ObjectSpecification : specificationLoader
- .allSpecifications()) {
+ for (final ObjectSpecification ObjectSpecification : specificationLoader.allSpecifications()) {
specs.add(ObjectSpecification);
}
return specs;
Copied: incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/DebugClockForFitNesse.java (from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/DebugClockForFitNesse.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/DebugClockForFitNesse.java?p2=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/DebugClockForFitNesse.java&p1=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/DebugClockForFitNesse.java&r1=1034020&r2=1035242&rev=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/DebugClockForFitNesse.java (original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/DebugClockForFitNesse.java Mon Nov 15 12:10:23 2010
@@ -1,12 +1,13 @@
-package org.apache.isis.extensions.bdd.fitnesse.internal.fixtures;
+package net.sf.isiscontrib.bdd.fitnesse.internal.fixtures;
-import org.apache.isis.extensions.bdd.common.AliasRegistry;
-import org.apache.isis.extensions.bdd.common.CellBinding;
-import org.apache.isis.extensions.bdd.common.Constants;
-import org.apache.isis.extensions.bdd.common.StoryCell;
-import org.apache.isis.extensions.bdd.common.fixtures.DebugClockPeer;
-import org.apache.isis.extensions.bdd.fitnesse.internal.AbstractFixture;
-import org.apache.isis.extensions.bdd.fitnesse.internal.CellBindingForFitNesse;
+import net.sf.isiscontrib.bdd.fitnesse.internal.AbstractFixture;
+import net.sf.isiscontrib.bdd.fitnesse.internal.CellBindingForFitNesse;
+
+import org.apache.isis.viewer.bdd.common.AliasRegistry;
+import org.apache.isis.viewer.bdd.common.CellBinding;
+import org.apache.isis.viewer.bdd.common.Constants;
+import org.apache.isis.viewer.bdd.common.StoryCell;
+import org.apache.isis.viewer.bdd.common.fixtures.DebugClockPeer;
import fit.Fixture;
import fit.Parse;
@@ -14,12 +15,10 @@ import fit.Parse;
public class DebugClockForFitNesse extends AbstractFixture<DebugClockPeer> {
public DebugClockForFitNesse(final AliasRegistry aliasesRegistry) {
- this(aliasesRegistry, CellBindingForFitNesse.builder(Constants.VALUE_NAME,
- Constants.VALUE_HEAD).build());
+ this(aliasesRegistry, CellBindingForFitNesse.builder(Constants.VALUE_NAME, Constants.VALUE_HEAD).build());
}
- private DebugClockForFitNesse(final AliasRegistry aliasesRegistry,
- final CellBinding valueBinding) {
+ private DebugClockForFitNesse(final AliasRegistry aliasesRegistry, final CellBinding valueBinding) {
super(new DebugClockPeer(aliasesRegistry, valueBinding));
}
@@ -34,12 +33,12 @@ public class DebugClockForFitNesse exten
getCurrentCell().setText(Fixture.gray(formattedClockTime));
}
- public String getFormattedClockTime() {
- return getPeer().getFormattedClockTime();
- }
-
- private StoryCell getCurrentCell() {
- return getPeer().getCurrentCell();
- }
+ public String getFormattedClockTime() {
+ return getPeer().getFormattedClockTime();
+ }
+
+ private StoryCell getCurrentCell() {
+ return getPeer().getCurrentCell();
+ }
}
Copied: incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/DebugObjectStoreForFitNesse.java (from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/DebugObjectStoreForFitNesse.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/DebugObjectStoreForFitNesse.java?p2=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/DebugObjectStoreForFitNesse.java&p1=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/DebugObjectStoreForFitNesse.java&r1=1034020&r2=1035242&rev=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/DebugObjectStoreForFitNesse.java (original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/DebugObjectStoreForFitNesse.java Mon Nov 15 12:10:23 2010
@@ -1,15 +1,16 @@
-package org.apache.isis.extensions.bdd.fitnesse.internal.fixtures;
+package net.sf.isiscontrib.bdd.fitnesse.internal.fixtures;
-import org.apache.isis.extensions.bdd.common.AliasRegistry;
-import org.apache.isis.extensions.bdd.common.fixtures.DebugObjectStorePeer;
-import org.apache.isis.extensions.bdd.fitnesse.internal.AbstractFixture;
+import net.sf.isiscontrib.bdd.fitnesse.internal.AbstractFixture;
+
+import org.apache.isis.viewer.bdd.common.AliasRegistry;
+import org.apache.isis.viewer.bdd.common.fixtures.DebugObjectStorePeer;
import fit.Parse;
public class DebugObjectStoreForFitNesse extends AbstractFixture<DebugObjectStorePeer> {
public DebugObjectStoreForFitNesse(final AliasRegistry aliasesRegistry) {
- super(new DebugObjectStorePeer(aliasesRegistry));
+ super(new DebugObjectStorePeer(aliasesRegistry));
}
@Override
@@ -23,8 +24,7 @@ public class DebugObjectStoreForFitNesse
}
private String debugObjectStore() {
- return getPeer().debugObjectStore();
+ return getPeer().debugObjectStore();
}
-
}
Copied: incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/DebugServicesForFitNesse.java (from r1034020, incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/DebugServicesForFitNesse.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/DebugServicesForFitNesse.java?p2=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/DebugServicesForFitNesse.java&p1=incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/DebugServicesForFitNesse.java&r1=1034020&r2=1035242&rev=1035242&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/org/apache/isis/extensions/bdd/fitnesse/internal/fixtures/DebugServicesForFitNesse.java (original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/DebugServicesForFitNesse.java Mon Nov 15 12:10:23 2010
@@ -1,8 +1,9 @@
-package org.apache.isis.extensions.bdd.fitnesse.internal.fixtures;
+package net.sf.isiscontrib.bdd.fitnesse.internal.fixtures;
-import org.apache.isis.extensions.bdd.common.AliasRegistry;
-import org.apache.isis.extensions.bdd.common.fixtures.DebugServicesPeer;
-import org.apache.isis.extensions.bdd.fitnesse.internal.AbstractFixture;
+import net.sf.isiscontrib.bdd.fitnesse.internal.AbstractFixture;
+
+import org.apache.isis.viewer.bdd.common.AliasRegistry;
+import org.apache.isis.viewer.bdd.common.fixtures.DebugServicesPeer;
import fit.Parse;
@@ -23,7 +24,7 @@ public class DebugServicesForFitNesse ex
}
private String debugServices() {
- return getPeer().debugServices();
+ return getPeer().debugServices();
}
}