- Revision
- 708
- Author
- sirenian
- Date
- 2007-03-22 09:06:33 -0500 (Thu, 22 Mar 2007)
Log Message
[EK] Added some missing UserMatchersBehaviours. And gained a better understanding of how anything() ( and therefore nothing() ) should work as a result.
Modified Paths
Diff
Modified: trunk/core/src/behaviour/org/jbehave/core/UsingMatchersBehaviour.java (707 => 708)
--- trunk/core/src/behaviour/org/jbehave/core/UsingMatchersBehaviour.java 2007-03-22 13:34:12 UTC (rev 707) +++ trunk/core/src/behaviour/org/jbehave/core/UsingMatchersBehaviour.java 2007-03-22 14:06:33 UTC (rev 708) @@ -43,12 +43,45 @@ Ensure.that(true, m.eq(true), "message"); } - public void shouldProvideMatcherToCheckForNull() { + public void shouldProvideMatchersToCheckForNull() { UsingMatchers m = new UsingMatchers() {}; Ensure.that(null, m.isNull()); + Ensure.that(new Object(), m.not(m.isNull())); Ensure.that(new Object(), m.isNotNull()); + Ensure.that(null, m.not(m.isNotNull())); } + + public void shouldProvideMatchersToCheckForAnything() { + UsingMatchers m = new UsingMatchers() {}; + Ensure.that(null, m.not(m.nothing())); + Ensure.that(new Object(), m.not(m.nothing())); + Ensure.that(new Object(), m.anything()); + Ensure.that(null, m.anything()); + } + + public void shouldProvideCommonStringMatchers() { + UsingMatchers m = new UsingMatchers() {}; + + Ensure.that("octopus", m.contains("top")); + Ensure.that("octopus", m.not(m.contains("eight"))); + Ensure.that("octopus", m.startsWith("octo")); + Ensure.that("octopus", m.not(m.startsWith("eight"))); + Ensure.that("octopus", m.endsWith("pus")); + Ensure.that("octopus", m.not(m.endsWith("eight"))); + } + public void shouldProvideInstanceMatchers() { + UsingMatchers m = new UsingMatchers() {}; + + String a = "a"; + String b = "b"; + + Ensure.that(a, m.is(a)); + Ensure.that(a, m.not(m.is(b))); + Ensure.that(a, m.sameInstanceAs(a)); + Ensure.that(a, m.not(m.sameInstanceAs(b))); + } + public void shouldCatchAndReturnAThrownException() throws Exception { UsingMatchers m = new UsingMatchers() {};
Modified: trunk/core/src/java/org/jbehave/core/mock/UsingMatchers.java (707 => 708)
--- trunk/core/src/java/org/jbehave/core/mock/UsingMatchers.java 2007-03-22 13:34:12 UTC (rev 707) +++ trunk/core/src/java/org/jbehave/core/mock/UsingMatchers.java 2007-03-22 14:06:33 UTC (rev 708) @@ -142,7 +142,11 @@ } public CustomMatcher nothing() { - return isNull(); + return new CustomMatcher("nothing") { + public boolean matches(Object arg) { + return false; + } + }; } public CustomMatcher a(final Class type) {
To unsubscribe from this list please visit:
