Title: [793] trunk/core/src/behaviour/org/jbehave/core: Added Behaviours instances for each package, so they can more easily maintained when verifying AllBehaviours.

Diff

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

--- trunk/core/src/behaviour/org/jbehave/core/AllBehaviours.java	2007-09-06 13:02:08 UTC (rev 792)
+++ trunk/core/src/behaviour/org/jbehave/core/AllBehaviours.java	2007-09-06 13:19:03 UTC (rev 793)
@@ -7,42 +7,32 @@
  */
 package org.jbehave.core;
 
-import org.jbehave.core.behaviour.BehaviourClassBehaviour;
-import org.jbehave.core.behaviour.BehaviourMethodBehaviour;
-import org.jbehave.core.behaviour.BehaviourVerifierBehaviour;
+import org.jbehave.core.behaviour.BehaviourBehaviours;
 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;
+import org.jbehave.core.exception.ExceptionBehaviours;
+import org.jbehave.core.listener.ListenerBehaviours;
+import org.jbehave.core.matchers.MatchersBehaviours;
+import org.jbehave.core.minimock.MiniMockBehaviours;
+import org.jbehave.core.mock.MockBehaviours;
+import org.jbehave.core.result.ResultBehaviours;
+import org.jbehave.core.story.StoryBehaviours;
+import org.jbehave.core.threaded.ThreadedBehaviours;
+import org.jbehave.core.util.UtilBehaviours;
 
 public class AllBehaviours implements Behaviours {
     public Class[] getBehaviours() {
-        return new Class[] {UsingCollectionMatchersBehaviour.class,
-                UsingEqualityMatchersBehaviour.class,
-                UsingLogicalMatchersBehaviour.class,
-                UsingExceptionsBehaviour.class,
-                UsingMatchersBehaviour.class,
-                UsingStringMatchersBehaviour.class,
-                BehaviourClassBehaviour.class,
-                BehaviourMethodBehaviour.class,
-                BehaviourVerifierBehaviour.class,
-                PlainTextMethodListenerBehaviour.class,
-                MiniMockObjectBehaviour.class,
-                UsingMiniMockBehaviour.class,
-                ExpectationBehaviour.class,
-                ResultBehaviour.class,
-                org.jbehave.core.story.AllBehaviours.class,
-                org.jbehave.core.matchers.AllBehaviours.class,
-                JBehaveFrameworkErrorBehaviour.class,
+        return new Class[] {
+                BehaviourRunnerBehaviour.class,
+                BehaviourBehaviours.class,
+                ExceptionBehaviours.class,
+                ListenerBehaviours.class,
+                MatchersBehaviours.class,
+                MiniMockBehaviours.class,
+                MockBehaviours.class,
+                ResultBehaviours.class,
+                StoryBehaviours.class,
+                ThreadedBehaviours.class,
+                UtilBehaviours.class
         };
     }
 }

Added: trunk/core/src/behaviour/org/jbehave/core/behaviour/BehaviourBehaviours.java (0 => 793)

--- trunk/core/src/behaviour/org/jbehave/core/behaviour/BehaviourBehaviours.java	                        (rev 0)
+++ trunk/core/src/behaviour/org/jbehave/core/behaviour/BehaviourBehaviours.java	2007-09-06 13:19:03 UTC (rev 793)
@@ -0,0 +1,16 @@
+package org.jbehave.core.behaviour;
+
+/**
+ * @author Mauro Talevi
+ */
+public class BehaviourBehaviours implements Behaviours {
+
+    public Class[] getBehaviours() {
+        return new Class[] {
+                BehaviourClassBehaviour.class,
+                BehaviourMethodBehaviour.class,
+                BehaviourVerifierBehaviour.class
+        };
+    }
+
+}

Added: trunk/core/src/behaviour/org/jbehave/core/exception/ExceptionBehaviours.java (0 => 793)

--- trunk/core/src/behaviour/org/jbehave/core/exception/ExceptionBehaviours.java	                        (rev 0)
+++ trunk/core/src/behaviour/org/jbehave/core/exception/ExceptionBehaviours.java	2007-09-06 13:19:03 UTC (rev 793)
@@ -0,0 +1,16 @@
+package org.jbehave.core.exception;
+
+import org.jbehave.core.behaviour.Behaviours;
+
+/**
+ * @author Mauro Talevi
+ */
+public class ExceptionBehaviours implements Behaviours {
+
+    public Class[] getBehaviours() {
+        return new Class[] {
+                JBehaveFrameworkErrorBehaviour.class
+        };
+    }
+
+}

Added: trunk/core/src/behaviour/org/jbehave/core/listener/ListenerBehaviours.java (0 => 793)

--- trunk/core/src/behaviour/org/jbehave/core/listener/ListenerBehaviours.java	                        (rev 0)
+++ trunk/core/src/behaviour/org/jbehave/core/listener/ListenerBehaviours.java	2007-09-06 13:19:03 UTC (rev 793)
@@ -0,0 +1,13 @@
+package org.jbehave.core.listener;
+
+import org.jbehave.core.behaviour.Behaviours;
+
+public class ListenerBehaviours implements Behaviours {
+
+    public Class[] getBehaviours() {
+        return new Class[] {
+                PlainTextMethodListenerBehaviour.class
+        };
+    }
+
+}

Deleted: trunk/core/src/behaviour/org/jbehave/core/matchers/AllBehaviours.java (792 => 793)

--- trunk/core/src/behaviour/org/jbehave/core/matchers/AllBehaviours.java	2007-09-06 13:02:08 UTC (rev 792)
+++ trunk/core/src/behaviour/org/jbehave/core/matchers/AllBehaviours.java	2007-09-06 13:19:03 UTC (rev 793)
@@ -1,17 +0,0 @@
-package org.jbehave.core.matchers;
-
-import org.jbehave.core.behaviour.Behaviours;
-
-public class AllBehaviours implements Behaviours {
-
-    public Class[] getBehaviours() {
-        return new Class[] {
-                UsingCollectionMatchersBehaviour.class,
-                UsingEqualityMatchersBehaviour.class,
-                UsingLogicalMatchersBehaviour.class,
-                UsingStringMatchersBehaviour.class,
-                UsingExceptionsBehaviour.class
-        };
-    }
-
-}

Copied: trunk/core/src/behaviour/org/jbehave/core/matchers/MatchersBehaviours.java (from rev 789, trunk/core/src/behaviour/org/jbehave/core/matchers/AllBehaviours.java) (0 => 793)

--- trunk/core/src/behaviour/org/jbehave/core/matchers/MatchersBehaviours.java	                        (rev 0)
+++ trunk/core/src/behaviour/org/jbehave/core/matchers/MatchersBehaviours.java	2007-09-06 13:19:03 UTC (rev 793)
@@ -0,0 +1,20 @@
+package org.jbehave.core.matchers;
+
+import org.jbehave.core.behaviour.Behaviours;
+
+/**
+ * @author Mauro Talevi
+ */
+public class MatchersBehaviours implements Behaviours {
+
+    public Class[] getBehaviours() {
+        return new Class[] {
+                UsingCollectionMatchersBehaviour.class,
+                UsingEqualityMatchersBehaviour.class,
+                UsingLogicalMatchersBehaviour.class,
+                UsingStringMatchersBehaviour.class,
+                UsingExceptionsBehaviour.class
+        };
+    }
+
+}

Added: trunk/core/src/behaviour/org/jbehave/core/minimock/MiniMockBehaviours.java (0 => 793)

--- trunk/core/src/behaviour/org/jbehave/core/minimock/MiniMockBehaviours.java	                        (rev 0)
+++ trunk/core/src/behaviour/org/jbehave/core/minimock/MiniMockBehaviours.java	2007-09-06 13:19:03 UTC (rev 793)
@@ -0,0 +1,17 @@
+package org.jbehave.core.minimock;
+
+import org.jbehave.core.behaviour.Behaviours;
+
+/**
+ * @author Mauro Talevi
+ */
+public class MiniMockBehaviours implements Behaviours {
+
+    public Class[] getBehaviours() {
+        return new Class[] {
+               MiniMockObjectBehaviour.class,
+               UsingMiniMockBehaviour.class
+        };
+    }
+
+}

Added: trunk/core/src/behaviour/org/jbehave/core/mock/MockBehaviours.java (0 => 793)

--- trunk/core/src/behaviour/org/jbehave/core/mock/MockBehaviours.java	                        (rev 0)
+++ trunk/core/src/behaviour/org/jbehave/core/mock/MockBehaviours.java	2007-09-06 13:19:03 UTC (rev 793)
@@ -0,0 +1,17 @@
+package org.jbehave.core.mock;
+
+import org.jbehave.core.behaviour.Behaviours;
+
+/**
+ * @author Mauro Talevi
+ */
+public class MockBehaviours implements Behaviours {
+
+    public Class[] getBehaviours() {
+        return new Class[] {
+               ExpectationBehaviour.class,
+               UsingMatchersBehaviour.class
+        };
+    }
+
+}

Added: trunk/core/src/behaviour/org/jbehave/core/result/ResultBehaviours.java (0 => 793)

--- trunk/core/src/behaviour/org/jbehave/core/result/ResultBehaviours.java	                        (rev 0)
+++ trunk/core/src/behaviour/org/jbehave/core/result/ResultBehaviours.java	2007-09-06 13:19:03 UTC (rev 793)
@@ -0,0 +1,16 @@
+package org.jbehave.core.result;
+
+import org.jbehave.core.behaviour.Behaviours;
+
+/**
+ * @author Mauro Talevi
+ */
+public class ResultBehaviours implements Behaviours {
+
+    public Class[] getBehaviours() {
+        return new Class[] {
+               ResultBehaviour.class
+        };
+    }
+
+}

Deleted: trunk/core/src/behaviour/org/jbehave/core/story/AllBehaviours.java (792 => 793)

--- trunk/core/src/behaviour/org/jbehave/core/story/AllBehaviours.java	2007-09-06 13:02:08 UTC (rev 792)
+++ trunk/core/src/behaviour/org/jbehave/core/story/AllBehaviours.java	2007-09-06 13:19:03 UTC (rev 793)
@@ -1,48 +0,0 @@
-/*
- * Created on 29-Aug-2004
- * 
- * (c) 2003-2004 ThoughtWorks Ltd
- *
- * See license.txt for license details
- */
-package org.jbehave.core.story;
-
-import org.jbehave.core.behaviour.Behaviours;
-import org.jbehave.core.story.codegen.parser.TextStoryParserBehaviour;
-import org.jbehave.core.story.codegen.velocity.VelocityCodeGeneratorBehaviour;
-import org.jbehave.core.story.domain.AbstractStepBehaviour;
-import org.jbehave.core.story.domain.GivenScenarioBehaviour;
-import org.jbehave.core.story.domain.GivenStepBehaviour;
-import org.jbehave.core.story.domain.MultiStepScenarioBehaviour;
-import org.jbehave.core.story.domain.NarrativeBehaviour;
-import org.jbehave.core.story.domain.OutcomeStepBehaviour;
-import org.jbehave.core.story.domain.ScenarioDrivenStoryBehaviour;
-import org.jbehave.core.story.listener.PlainTextScenarioListenerBehaviour;
-import org.jbehave.core.story.renderer.PlainTextRendererBehaviour;
-
-
-
-/**
- * @author <a href="" PROTECTED]">Dan North</a>
- */
-public class AllBehaviours implements Behaviours {
-    public Class[] getBehaviours() {
-        return new Class[] {
-                StoryBuilderBehaviour.class,
-                StoryRunnerBehaviour.class,
-                StoryPrinterBehaviour.class,
-                StoryToDirectoryPrinterBehaviour.class,
-                TextStoryParserBehaviour.class,
-                GivenStepBehaviour.class,
-                GivenScenarioBehaviour.class,
-                MultiStepScenarioBehaviour.class,
-                NarrativeBehaviour.class,
-                OutcomeStepBehaviour.class,
-                ScenarioDrivenStoryBehaviour.class,
-                AbstractStepBehaviour.class,
-                PlainTextScenarioListenerBehaviour.class,
-				PlainTextRendererBehaviour.class,
-				VelocityCodeGeneratorBehaviour.class
-        };
-    }
-}

Copied: trunk/core/src/behaviour/org/jbehave/core/story/StoryBehaviours.java (from rev 789, trunk/core/src/behaviour/org/jbehave/core/story/AllBehaviours.java) (0 => 793)

--- trunk/core/src/behaviour/org/jbehave/core/story/StoryBehaviours.java	                        (rev 0)
+++ trunk/core/src/behaviour/org/jbehave/core/story/StoryBehaviours.java	2007-09-06 13:19:03 UTC (rev 793)
@@ -0,0 +1,48 @@
+/*
+ * Created on 29-Aug-2004
+ * 
+ * (c) 2003-2004 ThoughtWorks Ltd
+ *
+ * See license.txt for license details
+ */
+package org.jbehave.core.story;
+
+import org.jbehave.core.behaviour.Behaviours;
+import org.jbehave.core.story.codegen.parser.TextStoryParserBehaviour;
+import org.jbehave.core.story.codegen.velocity.VelocityCodeGeneratorBehaviour;
+import org.jbehave.core.story.domain.AbstractStepBehaviour;
+import org.jbehave.core.story.domain.GivenScenarioBehaviour;
+import org.jbehave.core.story.domain.GivenStepBehaviour;
+import org.jbehave.core.story.domain.MultiStepScenarioBehaviour;
+import org.jbehave.core.story.domain.NarrativeBehaviour;
+import org.jbehave.core.story.domain.OutcomeStepBehaviour;
+import org.jbehave.core.story.domain.ScenarioDrivenStoryBehaviour;
+import org.jbehave.core.story.listener.PlainTextScenarioListenerBehaviour;
+import org.jbehave.core.story.renderer.PlainTextRendererBehaviour;
+
+
+
+/**
+ * @author <a href="" PROTECTED]">Dan North</a>
+ */
+public class StoryBehaviours implements Behaviours {
+    public Class[] getBehaviours() {
+        return new Class[] {
+                StoryBuilderBehaviour.class,
+                StoryRunnerBehaviour.class,
+                StoryPrinterBehaviour.class,
+                StoryToDirectoryPrinterBehaviour.class,
+                TextStoryParserBehaviour.class,
+                GivenStepBehaviour.class,
+                GivenScenarioBehaviour.class,
+                MultiStepScenarioBehaviour.class,
+                NarrativeBehaviour.class,
+                OutcomeStepBehaviour.class,
+                ScenarioDrivenStoryBehaviour.class,
+                AbstractStepBehaviour.class,
+                PlainTextScenarioListenerBehaviour.class,
+				PlainTextRendererBehaviour.class,
+				VelocityCodeGeneratorBehaviour.class
+        };
+    }
+}

Added: trunk/core/src/behaviour/org/jbehave/core/threaded/ThreadedBehaviours.java (0 => 793)

--- trunk/core/src/behaviour/org/jbehave/core/threaded/ThreadedBehaviours.java	                        (rev 0)
+++ trunk/core/src/behaviour/org/jbehave/core/threaded/ThreadedBehaviours.java	2007-09-06 13:19:03 UTC (rev 793)
@@ -0,0 +1,24 @@
+/*
+ * Created on 29-Aug-2004
+ * 
+ * (c) 2003-2004 ThoughtWorks Ltd
+ *
+ * See license.txt for license details
+ */
+package org.jbehave.core.threaded;
+
+import org.jbehave.core.behaviour.Behaviours;
+
+
+/**
+ * @author Mauro Talevi
+ */
+public class ThreadedBehaviours implements Behaviours {
+    public Class[] getBehaviours() {
+        return new Class[] {
+                ClockedTimeouterBehaviour.class,
+                QueuedMiniHashMapBehaviour.class,
+                QueuedObjectHolderBehaviour.class
+        };
+    }
+}

Added: trunk/core/src/behaviour/org/jbehave/core/util/UtilBehaviours.java (0 => 793)

--- trunk/core/src/behaviour/org/jbehave/core/util/UtilBehaviours.java	                        (rev 0)
+++ trunk/core/src/behaviour/org/jbehave/core/util/UtilBehaviours.java	2007-09-06 13:19:03 UTC (rev 793)
@@ -0,0 +1,23 @@
+/*
+ * Created on 29-Aug-2004
+ * 
+ * (c) 2003-2004 ThoughtWorks Ltd
+ *
+ * See license.txt for license details
+ */
+package org.jbehave.core.util;
+
+import org.jbehave.core.behaviour.Behaviours;
+
+
+/**
+ * @author Mauro Talevi
+ */
+public class UtilBehaviours implements Behaviours {
+    public Class[] getBehaviours() {
+        return new Class[] {
+                CamelCaseConverterBehaviour.class,
+                TimerBehaviour.class
+        };
+    }
+}


To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to