[jbehave-scm] [724] trunk/core/src/java/org/jbehave/core: [EK] Tidying up the latest Matchers stuff, removing the added CustomMatcher because it breaks the API

Mon, 14 May 2007 11:10:11 -0700

Title: [724] trunk/core/src/java/org/jbehave/core: [EK] Tidying up the latest Matchers stuff, removing the added CustomMatcher because it breaks the API
Revision
724
Author
sirenian
Date
2007-05-14 13:10:05 -0500 (Mon, 14 May 2007)

Log Message

[EK] Tidying up the latest Matchers stuff, removing the added CustomMatcher because it breaks the API


Modified Paths




Removed Paths

Diff

Modified: trunk/core/src/behaviour/org/jbehave/core/AllBehaviours.java (723 => 724)

--- trunk/core/src/behaviour/org/jbehave/core/AllBehaviours.java	2007-05-05 12:22:57 UTC (rev 723)
+++ trunk/core/src/behaviour/org/jbehave/core/AllBehaviours.java	2007-05-14 18:10:05 UTC (rev 724)
@@ -13,18 +13,25 @@
 import org.jbehave.core.behaviour.Behaviours;
 import org.jbehave.core.exception.JBehaveFrameworkErrorBehaviour;
 import org.jbehave.core.listener.PlainTextMethodListenerBehaviour;
+import org.jbehave.core.matchers.UsingCollectionMatchersBehaviour;
+import org.jbehave.core.matchers.UsingEqualityMatchersBehaviour;
+import org.jbehave.core.matchers.UsingExceptionsBehaviour;
+import org.jbehave.core.matchers.UsingLogicalMatchersBehaviour;
+import org.jbehave.core.matchers.UsingStringMatchersBehaviour;
 import org.jbehave.core.minimock.MiniMockObjectBehaviour;
 import org.jbehave.core.minimock.UsingMiniMockBehaviour;
 import org.jbehave.core.mock.ExpectationBehaviour;
 import org.jbehave.core.mock.UsingMatchersBehaviour;
 import org.jbehave.core.result.ResultBehaviour;
 
-
-
 public class AllBehaviours implements Behaviours {
     public Class[] getBehaviours() {
-        return new Class[] {
+        return new Class[] {UsingCollectionMatchersBehaviour.class,
+                UsingEqualityMatchersBehaviour.class,
+                UsingLogicalMatchersBehaviour.class,
+                UsingExceptionsBehaviour.class,
                 UsingMatchersBehaviour.class,
+                UsingStringMatchersBehaviour.class,
                 BehaviourClassBehaviour.class,
                 BehaviourMethodBehaviour.class,
                 BehaviourVerifierBehaviour.class,
@@ -35,7 +42,7 @@
                 ResultBehaviour.class,
                 org.jbehave.core.story.AllBehaviours.class,
                 org.jbehave.core.matchers.AllBehaviours.class,
-                JBehaveFrameworkErrorBehaviour.class
+                JBehaveFrameworkErrorBehaviour.class,
         };
     }
 }

Modified: trunk/core/src/java/org/jbehave/core/Ensure.java (723 => 724)

--- trunk/core/src/java/org/jbehave/core/Ensure.java	2007-05-05 12:22:57 UTC (rev 723)
+++ trunk/core/src/java/org/jbehave/core/Ensure.java	2007-05-14 18:10:05 UTC (rev 724)
@@ -7,15 +7,11 @@
  */
 package org.jbehave.core;
 
-import org.jbehave.core.exception.PendingException;
-import org.jbehave.core.exception.VerificationException;
 import org.jbehave.core.matchers.UsingEqualityMatchers;
 import org.jbehave.core.matchers.UsingExceptions;
 import org.jbehave.core.mock.Matcher;
-import org.jbehave.core.mock.UsingMatchers;
 import org.jbehave.core.mock.UsingMatchers.CustomMatcher;
 
-
 /**
  * @author <a href="" PROTECTED]">Dan North</a>
  * @author <a href="" PROTECTED]">Damian Guy</a>

Deleted: trunk/core/src/java/org/jbehave/core/matchers/CustomMatcher.java (723 => 724)

--- trunk/core/src/java/org/jbehave/core/matchers/CustomMatcher.java	2007-05-05 12:22:57 UTC (rev 723)
+++ trunk/core/src/java/org/jbehave/core/matchers/CustomMatcher.java	2007-05-14 18:10:05 UTC (rev 724)
@@ -1,12 +0,0 @@
-package org.jbehave.core.matchers;
-
-import org.jbehave.core.mock.Matcher;
-import org.jbehave.core.mock.UsingMatchers;
-
-public abstract class CustomMatcher extends UsingMatchers.CustomMatcher implements Matcher {
-
-    public CustomMatcher(String description) {
-        super(description);
-    }
-
-}

Modified: trunk/core/src/java/org/jbehave/core/matchers/UsingEqualityMatchers.java (723 => 724)

--- trunk/core/src/java/org/jbehave/core/matchers/UsingEqualityMatchers.java	2007-05-05 12:22:57 UTC (rev 723)
+++ trunk/core/src/java/org/jbehave/core/matchers/UsingEqualityMatchers.java	2007-05-14 18:10:05 UTC (rev 724)
@@ -1,6 +1,6 @@
 package org.jbehave.core.matchers;
 
-import org.jbehave.core.matchers.CustomMatcher;
+import org.jbehave.core.mock.UsingMatchers.CustomMatcher;
 
 public class UsingEqualityMatchers {

Modified: trunk/core/src/java/org/jbehave/core/mock/UsingMatchers.java (723 => 724)

--- trunk/core/src/java/org/jbehave/core/mock/UsingMatchers.java	2007-05-05 12:22:57 UTC (rev 723)
+++ trunk/core/src/java/org/jbehave/core/mock/UsingMatchers.java	2007-05-14 18:10:05 UTC (rev 724)
@@ -34,9 +34,6 @@
  */
 public abstract class UsingMatchers {
     
-    private static final String NL = System.getProperty("line.separator");
-
-    /** @deprecated Use org.jbehave.core.matchers.CustomMatcher instead */
     public static abstract class CustomMatcher extends UsingMatchers implements Matcher {
         private final String description;
 
@@ -62,7 +59,7 @@
     }
     
 	/** ensures object is not null */
-    public org.jbehave.core.matchers.CustomMatcher isNotNull() {
+    public CustomMatcher isNotNull() {
         return UsingEqualityMatchers.isNotNull();
     }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to