Browse files

Get rid of @Pending. Closes #271

  • Loading branch information...
1 parent 6863298 commit 2a400fe0e8da438fd41a8a90ff295638565d4d86 @aslakhellesoy aslakhellesoy committed Mar 20, 2012
View
6 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)
View
2 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">
View
6 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>
View
1 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 {
}
View
12 java/src/main/java/cucumber/annotation/Pending.java
@@ -1,12 +0,0 @@
-package cucumber.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface Pending {
- String value() default "TODO";
-}
View
5 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 {

0 comments on commit 2a400fe

Please sign in to comment.