[jbehave-scm] [jbehave] [604] trunk:

Fri, 01 Dec 2006 10:26:51 -0800

Title: [jbehave] [604] trunk:

Diff

Modified: trunk/.classpath (603 => 604)

--- trunk/.classpath	2006-12-01 16:23:07 UTC (rev 603)
+++ trunk/.classpath	2006-12-01 18:26:15 UTC (rev 604)
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="core/src/java"/>
-	<classpathentry kind="src" path="extensions/classmocks/src/behaviour"/>
-	<classpathentry kind="src" path="extensions/classmocks/src/java"/>
-	<classpathentry kind="src" path="core/src/behaviour"/>
-	<classpathentry kind="src" path="extensions/ant/src/java"/>
-	<classpathentry kind="src" path="extensions/ant/src/behaviour"/>
-	<classpathentry kind="src" path="extensions/fit/src/java"/>
-	<classpathentry kind="src" path="extensions/fit/src/test"/>
-	<classpathentry kind="src" path="extensions/jmock/src/java"/>
-	<classpathentry kind="src" path="extensions/jmock/src/behaviour"/>
-	<classpathentry kind="src" path="extensions/junit/src/java"/>
-	<classpathentry kind="src" path="extensions/junit/src/behaviour"/>
-	<classpathentry kind="src" path="extensions/swing/src/java"/>
-	<classpathentry kind="src" path="extensions/swing/src/behaviour"/>
-	<classpathentry kind="src" path="everything/src/behaviour"/>
-	<classpathentry kind="src" path="examples/atm/src/java"/>
-	<classpathentry kind="src" path="examples/atm/src/stories"/>
-	<classpathentry kind="src" path="examples/currency/src/java"/>
-	<classpathentry kind="src" path="examples/currency/src/behaviour"/>
-	<classpathentry kind="src" path="examples/hellbound/src/java"/>
-	<classpathentry kind="src" path="examples/hellbound/src/behaviour"/>
-	<classpathentry kind="src" path="examples/hellbound/src/stories"/>
-	<classpathentry kind="src" path="sandbox/src/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/extensions/antlr-2.7.6.jar"/>
-	<classpathentry kind="lib" path="lib/extensions/fit-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/extensions/cglib-full-2.0.jar"/>
-	<classpathentry kind="lib" path="lib/extensions/jmock-1.1.0.jar"/>
-	<classpathentry kind="lib" path="lib/extensions/jmock-cglib-1.1.0.jar"/>
-	<classpathentry kind="lib" path="lib/extensions/junit-3.8.2.jar"/>
-	<classpathentry kind="lib" path="lib/extensions/sablecc-3.2.jar"/>
-	<classpathentry kind="lib" path="lib/extensions/velocity-dep-1.4.jar"/>
-	<classpathentry kind="lib" path="lib/extensions/proxytoys-0.2.1.jar"/>
-	<classpathentry kind="lib" path="lib/cotta/cotta-1.0.jar"/>
-	<classpathentry kind="lib" path="lib/extensions/ant-1.6.5.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="core/src/java"/>
+	<classpathentry kind="src" path="extensions/classmocks/src/behaviour"/>
+	<classpathentry kind="src" path="extensions/classmocks/src/java"/>
+	<classpathentry kind="src" path="core/src/behaviour"/>
+	<classpathentry kind="src" path="extensions/ant/src/java"/>
+	<classpathentry kind="src" path="extensions/ant/src/behaviour"/>
+	<classpathentry kind="src" path="extensions/fit/src/java"/>
+	<classpathentry kind="src" path="extensions/fit/src/test"/>
+	<classpathentry kind="src" path="extensions/jmock/src/java"/>
+	<classpathentry kind="src" path="extensions/jmock/src/behaviour"/>
+	<classpathentry kind="src" path="extensions/junit/src/java"/>
+	<classpathentry kind="src" path="extensions/junit/src/behaviour"/>
+	<classpathentry kind="src" path="extensions/swing/src/java"/>
+	<classpathentry kind="src" path="extensions/swing/src/behaviour"/>
+	<classpathentry kind="src" path="everything/src/behaviour"/>
+	<classpathentry kind="src" path="examples/atm/src/java"/>
+	<classpathentry kind="src" path="examples/atm/src/stories"/>
+	<classpathentry kind="src" path="examples/currency/src/java"/>
+	<classpathentry kind="src" path="examples/currency/src/behaviour"/>
+	<classpathentry kind="src" path="examples/hellbound/src/java"/>
+	<classpathentry kind="src" path="examples/hellbound/src/behaviour"/>
+	<classpathentry kind="src" path="examples/hellbound/src/stories"/>
+	<classpathentry kind="src" path="sandbox/src/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/sun-1.5.0_08"/>
+	<classpathentry kind="lib" path="lib/extensions/antlr-2.7.6.jar"/>
+	<classpathentry kind="lib" path="lib/extensions/fit-1.1.jar"/>
+	<classpathentry kind="lib" path="lib/extensions/cglib-full-2.0.jar"/>
+	<classpathentry kind="lib" path="lib/extensions/jmock-1.1.0.jar"/>
+	<classpathentry kind="lib" path="lib/extensions/jmock-cglib-1.1.0.jar"/>
+	<classpathentry kind="lib" path="lib/extensions/junit-3.8.2.jar"/>
+	<classpathentry kind="lib" path="lib/extensions/sablecc-3.2.jar"/>
+	<classpathentry kind="lib" path="lib/extensions/velocity-dep-1.4.jar"/>
+	<classpathentry kind="lib" path="lib/extensions/proxytoys-0.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/cotta/cotta-1.0.jar"/>
+	<classpathentry kind="lib" path="lib/extensions/ant-1.6.5.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Modified: trunk/build.xml (603 => 604)

--- trunk/build.xml	2006-12-01 16:23:07 UTC (rev 603)
+++ trunk/build.xml	2006-12-01 18:26:15 UTC (rev 604)
@@ -109,14 +109,6 @@
 				<path refid="libs"/>
 			</classpath>
 		</javac>
-		<java taskname="run behaviours" classname="jbehave.core.Run" fork="true" failonerror="true">
-			<arg value="jbehave.AllBehaviours" />
-			<classpath>
-				<pathelement path="${behaviour_classes_dir}" />
-				<pathelement path="${jbehave_jar}" />
-				<path refid="libs" />
-			</classpath>
-		</java>
 	</target>
 	
 	<target name="verify-behaviour" depends="compile-behaviour" description="Verify behaviour">

Modified: trunk/core/src/behaviour/jbehave/core/AllBehaviours.java (603 => 604)

--- trunk/core/src/behaviour/jbehave/core/AllBehaviours.java	2006-12-01 16:23:07 UTC (rev 603)
+++ trunk/core/src/behaviour/jbehave/core/AllBehaviours.java	2006-12-01 18:26:15 UTC (rev 604)
@@ -7,12 +7,33 @@
  */
 package jbehave.core;
 
+import jbehave.core.behaviour.BehaviourClassBehaviour;
+import jbehave.core.behaviour.BehaviourMethodBehaviour;
+import jbehave.core.behaviour.BehaviourVerifierBehaviour;
 import jbehave.core.behaviour.Behaviours;
-import jbehave.core.util.BehavioursLoader;
+import jbehave.core.listener.PlainTextMethodListenerBehaviour;
+import jbehave.core.minimock.MiniMockObjectBehaviour;
+import jbehave.core.minimock.UsingMiniMockBehaviour;
+import jbehave.core.mock.ExpectationBehaviour;
+import jbehave.core.result.ResultBehaviour;
+import jbehave.core.story.listener.PlainTextListenerBehaviour;
 
 
 public class AllBehaviours implements Behaviours {
     public Class[] getBehaviours() {
-        return new BehavioursLoader(BehavioursLoader.class).loadBehaviours();
+        return new Class[] {
+                UsingConstraintsBehaviour.class,
+                BehaviourClassBehaviour.class,
+                BehaviourMethodBehaviour.class,
+                BehaviourVerifierBehaviour.class,
+                PlainTextMethodListenerBehaviour.class,
+                MiniMockObjectBehaviour.class,
+                UsingMiniMockBehaviour.class,
+                ExpectationBehaviour.class,
+                ExpectationBehaviour.class,
+                ResultBehaviour.class,
+                ResultBehaviour.class,
+                jbehave.core.story.AllBehaviours.class
+        };
     }
 }

Modified: trunk/core/src/behaviour/jbehave/core/story/AllBehaviours.java (603 => 604)

--- trunk/core/src/behaviour/jbehave/core/story/AllBehaviours.java	2006-12-01 16:23:07 UTC (rev 603)
+++ trunk/core/src/behaviour/jbehave/core/story/AllBehaviours.java	2006-12-01 18:26:15 UTC (rev 604)
@@ -29,20 +29,21 @@
 public class AllBehaviours implements Behaviours {
     public Class[] getBehaviours() {
         return new Class[] {
-        		StoryRunnerBehaviour.class,
-        		ScenariosBehaviour.class,
+                StoryBuilderBehaviour.class,
+                StoryRunnerBehaviour.class,
                 TextStoryParserBehaviour.class,
-				GivenScenarioBehaviour.class,
+                EventOutcomeStepBehaviour.class,
+                EventsBehaviour.class,
+                GivenScenarioBehaviour.class,
+                GivensBehaviour.class,
                 NarrativeBehaviour.class,
                 OutcomesBehaviour.class,
-                GivensBehaviour.class,
-                EventsBehaviour.class,
+                ScenarioDrivenStoryBehaviour.class,
                 ScenarioUsingMiniMockBehaviour.class,
-                ScenarioDrivenStoryBehaviour.class,
+                ScenariosBehaviour.class,
+                StepsBehaviour.class,
                 PlainTextScenarioListenerBehaviour.class,
 				PlainTextRendererBehaviour.class,
-                EventOutcomeStepBehaviour.class,
-                StepsBehaviour.class
         };
     }
 }

Modified: trunk/everything/src/behaviour/jbehave/AllBehaviours.java (603 => 604)

--- trunk/everything/src/behaviour/jbehave/AllBehaviours.java	2006-12-01 16:23:07 UTC (rev 603)
+++ trunk/everything/src/behaviour/jbehave/AllBehaviours.java	2006-12-01 18:26:15 UTC (rev 604)
@@ -7,9 +7,8 @@
 		return new Class[] {
 				jbehave.core.AllBehaviours.class,
 				jbehave.ant.AllBehaviours.class,
-//				jbehave.jmock.AllBehaviours.class,
-				jbehave.junit.AllBehaviours.class,
-				jbehave.core.story.AllBehaviours.class
+				jbehave.jmock.AllBehaviours.class,
+				jbehave.junit.AllBehaviours.class
 		};
 	}
 }

Modified: trunk/extensions/ant/src/behaviour/jbehave/ant/AllBehaviours.java (603 => 604)

--- trunk/extensions/ant/src/behaviour/jbehave/ant/AllBehaviours.java	2006-12-01 16:23:07 UTC (rev 603)
+++ trunk/extensions/ant/src/behaviour/jbehave/ant/AllBehaviours.java	2006-12-01 18:26:15 UTC (rev 604)
@@ -16,6 +16,8 @@
 public class AllBehaviours implements Behaviours {
 
     public Class[] getBehaviours() {
-        return new BehavioursLoader(getClass()).loadBehaviours();
+        return new Class[] {
+            JBehaveTaskBehaviour.class
+        };
     }
 }

Modified: trunk/extensions/jmock/src/behaviour/jbehave/jmock/AllBehaviours.java (603 => 604)

--- trunk/extensions/jmock/src/behaviour/jbehave/jmock/AllBehaviours.java	2006-12-01 16:23:07 UTC (rev 603)
+++ trunk/extensions/jmock/src/behaviour/jbehave/jmock/AllBehaviours.java	2006-12-01 18:26:15 UTC (rev 604)
@@ -5,6 +5,8 @@
 
 public class AllBehaviours implements Behaviours {
     public Class[] getBehaviours() {
-        return new BehavioursLoader(getClass()).loadBehaviours();
+        return new Class[] {
+            UsingJMockBehaviour.class
+        };
     }
 }

Modified: trunk/extensions/junit/src/behaviour/jbehave/junit/AllBehaviours.java (603 => 604)

--- trunk/extensions/junit/src/behaviour/jbehave/junit/AllBehaviours.java	2006-12-01 16:23:07 UTC (rev 603)
+++ trunk/extensions/junit/src/behaviour/jbehave/junit/AllBehaviours.java	2006-12-01 18:26:15 UTC (rev 604)
@@ -7,7 +7,9 @@
 public class AllBehaviours implements Behaviours {
 
     public Class[] getBehaviours() {
-        return new BehavioursLoader(getClass()).loadBehaviours();
+        return new Class[] {
+                JUnitAdapterBehaviour.class,
+                JUnitMethodAdapterBehaviour.class
+        };
     }
-
 }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to