Get rid of @pending. Closes #271

cucumber · Mar 21, 2012 · 2a400fe · 2a400fe
1 parent 6863298
commit 2a400fe
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 22 deletions.
diff --git a/History.md b/History.md
@@ -1,4 +1,8 @@
-## [Git master](https://github.com/cucumber/cucumber-jvm/compare/v1.0.0.RC22...master)
+## [Git master](https://github.com/cucumber/cucumber-jvm/compare/v1.0.0.RC23...master)
+
+* The @Pending annotation no longer exists. Throw a PendingException instead ([#271](https://github.com/cucumber/cucumber-jvm/issues/271) Aslak Hellesøy)
+
+## [1.0.0.RC23](https://github.com/cucumber/cucumber-jvm/compare/v1.0.0.RC22...v1.0.0.RC23)
 
 * [JUnit] CucumberException when running Cucumber with Jacoco code coverage ([#258](https://github.com/cucumber/cucumber-jvm/issues/258) Jan Stamer, Aslak Hellesøy)
 * [Scala] Scala Javadoc problems with build ([#231](https://github.com/cucumber/cucumber-jvm/issues/231) Aslak Hellesøy)

diff --git a/examples/java-helloworld/build.xml b/examples/java-helloworld/build.xml
@@ -1,6 +1,6 @@
 <project name="java-helloworld" basedir="." default="runcukes">
     <property name="repo" value="https://oss.sonatype.org/content/repositories/releases"/>
-    <property name="cucumber.version" value="1.0.0.RC21"/>
+    <property name="cucumber.version" value="1.0.0.RC23"/>
     <property name="gherkin.version" value="2.9.1"/>
 
     <target name="download">

diff --git a/examples/java-helloworld/pom.xml b/examples/java-helloworld/pom.xml
@@ -3,21 +3,21 @@
 
     <groupId>info.cukes</groupId>
     <artifactId>java-helloworld</artifactId>
-    <version>1.0.0.RC21</version>
+    <version>1.0.0.RC23</version>
     <packaging>jar</packaging>
     <name>Examples: Java Hello World</name>
 
     <dependencies>
         <dependency>
             <groupId>info.cukes</groupId>
             <artifactId>cucumber-java</artifactId>
-            <version>1.0.0.RC21</version>
+            <version>1.0.0.RC23</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>info.cukes</groupId>
             <artifactId>cucumber-junit</artifactId>
-            <version>1.0.0.RC21</version>
+            <version>1.0.0.RC23</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/examples/java-helloworld/src/test/java/cucumber/examples/java/helloworld/RunCukesTest.java b/examples/java-helloworld/src/test/java/cucumber/examples/java/helloworld/RunCukesTest.java
@@ -4,5 +4,6 @@
 import org.junit.runner.RunWith;
 
 @RunWith(Cucumber.class)
+@Cucumber.Options(format = {"pretty", "html:target/cucumber"})
 public class RunCukesTest {
 }
diff --git a/java/src/main/java/cucumber/annotation/Pending.java b/java/src/main/java/cucumber/annotation/Pending.java
diff --git a/java/src/main/java/cucumber/runtime/java/JavaStepDefinition.java b/java/src/main/java/cucumber/runtime/java/JavaStepDefinition.java
@@ -1,10 +1,8 @@
 package cucumber.runtime.java;
 
-import cucumber.annotation.Pending;
 import cucumber.runtime.CucumberException;
 import cucumber.runtime.JdkPatternArgumentMatcher;
 import cucumber.runtime.ParameterType;
-import cucumber.runtime.PendingException;
 import cucumber.runtime.StepDefinition;
 import gherkin.I18n;
 import gherkin.formatter.Argument;
@@ -33,9 +31,6 @@ public JavaStepDefinition(Method method, Pattern pattern, ObjectFactory objectFa
     }
 
     public void execute(I18n i18n, Object[] args) throws Throwable {
-        if (method.isAnnotationPresent(Pending.class)) {
-            throw new PendingException(method.getAnnotation(Pending.class).value());
-        }
         Class<?> clazz = method.getDeclaringClass();
         Object target = objectFactory.getInstance(clazz);
         try {