:) <-- happy Dan
[EMAIL PROTECTED] wrote:
Revision
710 <http://fisheye.codehaus.org/changelog/jbehave/?cs=710>
Author
sirenian
Date
2007-03-22 09:58:24 -0500 (Thu, 22 Mar 2007)
Log Message
[EK] Last matcher behaviours, added World key caveat to javadocs (happy Dan?)
Modified Paths
* trunk/core/src/behaviour/org/jbehave/core/UsingMatchersBehaviour.java
<#trunkcoresrcbehaviourorgjbehavecoreUsingMatchersBehaviourjava>
* trunk/core/src/java/org/jbehave/core/story/domain/World.java
<#trunkcoresrcjavaorgjbehavecorestorydomainWorldjava>
Diff
Modified:
trunk/core/src/behaviour/org/jbehave/core/UsingMatchersBehaviour.java
(709 => 710)
--- trunk/core/src/behaviour/org/jbehave/core/UsingMatchersBehaviour.java
2007-03-22 14:09:30 UTC (rev 709)
+++ trunk/core/src/behaviour/org/jbehave/core/UsingMatchersBehaviour.java
2007-03-22 14:58:24 UTC (rev 710)
@@ -9,8 +9,7 @@
throw new NumberFormatException();
}
};
-
-
+
Block EMPTY_BLOCK = new Block() {
public void run() throws Exception {}
};
@@ -89,14 +88,14 @@
Ensure.that(exception, m.isNotNull());
}
- public void shouldReturnNullIfNoExceptionThrown() throws Exception {
+ public void shouldCatchAndReturnNullIfNoExceptionThrown() throws Exception
{
UsingMatchers m = new UsingMatchers() {};
Exception exception = m.runAndCatch(IllegalArgumentException.class, EMPTY_BLOCK);
Ensure.that(exception, m.isNull());
}
- public void shouldPropagateExceptionOfAnUnexpectedType() throws Exception {
+ public void shouldCatchAndRethrowExceptionOfAnUnexpectedType() throws
Exception {
UsingMatchers m = new UsingMatchers() {};
try {
Modified:
trunk/core/src/java/org/jbehave/core/story/domain/World.java
(709 => 710)
--- trunk/core/src/java/org/jbehave/core/story/domain/World.java
2007-03-22 14:09:30 UTC (rev 709)
+++ trunk/core/src/java/org/jbehave/core/story/domain/World.java
2007-03-22 14:58:24 UTC (rev 710)
@@ -18,6 +18,10 @@
* The methods on this interface are a legacy of JBehave 1.0.
* We might remove them from the interface at some point.
*
+ * World keys should work as HashMap keys, ie: they should
+ * be immutable and their hashCode() should play nice with their
+ * equals().
+ *
* @see HashMapWorld, CustomWorld, Given, CleansUpWorld
*/
public interface World {
------------------------------------------------------------------------
To unsubscribe from this list please visit:
http://xircles.codehaus.org/manage_email
