Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Get rid of @Pending. Closes #271

  • Loading branch information...
commit 2a400fe0e8da438fd41a8a90ff295638565d4d86 1 parent 6863298
Aslak Hellesøy aslakhellesoy authored
6 History.md
Source Rendered
... ... @@ -1,4 +1,8 @@
1   -## [Git master](https://github.com/cucumber/cucumber-jvm/compare/v1.0.0.RC22...master)
  1 +## [Git master](https://github.com/cucumber/cucumber-jvm/compare/v1.0.0.RC23...master)
  2 +
  3 +* The @Pending annotation no longer exists. Throw a PendingException instead ([#271](https://github.com/cucumber/cucumber-jvm/issues/271) Aslak Hellesøy)
  4 +
  5 +## [1.0.0.RC23](https://github.com/cucumber/cucumber-jvm/compare/v1.0.0.RC22...v1.0.0.RC23)
2 6
3 7 * [JUnit] CucumberException when running Cucumber with Jacoco code coverage ([#258](https://github.com/cucumber/cucumber-jvm/issues/258) Jan Stamer, Aslak Hellesøy)
4 8 * [Scala] Scala Javadoc problems with build ([#231](https://github.com/cucumber/cucumber-jvm/issues/231) Aslak Hellesøy)
2  examples/java-helloworld/build.xml
... ... @@ -1,6 +1,6 @@
1 1 <project name="java-helloworld" basedir="." default="runcukes">
2 2 <property name="repo" value="https://oss.sonatype.org/content/repositories/releases"/>
3   - <property name="cucumber.version" value="1.0.0.RC21"/>
  3 + <property name="cucumber.version" value="1.0.0.RC23"/>
4 4 <property name="gherkin.version" value="2.9.1"/>
5 5
6 6 <target name="download">
6 examples/java-helloworld/pom.xml
@@ -3,7 +3,7 @@
3 3
4 4 <groupId>info.cukes</groupId>
5 5 <artifactId>java-helloworld</artifactId>
6   - <version>1.0.0.RC21</version>
  6 + <version>1.0.0.RC23</version>
7 7 <packaging>jar</packaging>
8 8 <name>Examples: Java Hello World</name>
9 9
@@ -11,13 +11,13 @@
11 11 <dependency>
12 12 <groupId>info.cukes</groupId>
13 13 <artifactId>cucumber-java</artifactId>
14   - <version>1.0.0.RC21</version>
  14 + <version>1.0.0.RC23</version>
15 15 <scope>test</scope>
16 16 </dependency>
17 17 <dependency>
18 18 <groupId>info.cukes</groupId>
19 19 <artifactId>cucumber-junit</artifactId>
20   - <version>1.0.0.RC21</version>
  20 + <version>1.0.0.RC23</version>
21 21 <scope>test</scope>
22 22 </dependency>
23 23 <dependency>
1  examples/java-helloworld/src/test/java/cucumber/examples/java/helloworld/RunCukesTest.java
@@ -4,5 +4,6 @@
4 4 import org.junit.runner.RunWith;
5 5
6 6 @RunWith(Cucumber.class)
  7 +@Cucumber.Options(format = {"pretty", "html:target/cucumber"})
7 8 public class RunCukesTest {
8 9 }
12 java/src/main/java/cucumber/annotation/Pending.java
... ... @@ -1,12 +0,0 @@
1   -package cucumber.annotation;
2   -
3   -import java.lang.annotation.ElementType;
4   -import java.lang.annotation.Retention;
5   -import java.lang.annotation.RetentionPolicy;
6   -import java.lang.annotation.Target;
7   -
8   -@Retention(RetentionPolicy.RUNTIME)
9   -@Target(ElementType.METHOD)
10   -public @interface Pending {
11   - String value() default "TODO";
12   -}
5 java/src/main/java/cucumber/runtime/java/JavaStepDefinition.java
... ... @@ -1,10 +1,8 @@
1 1 package cucumber.runtime.java;
2 2
3   -import cucumber.annotation.Pending;
4 3 import cucumber.runtime.CucumberException;
5 4 import cucumber.runtime.JdkPatternArgumentMatcher;
6 5 import cucumber.runtime.ParameterType;
7   -import cucumber.runtime.PendingException;
8 6 import cucumber.runtime.StepDefinition;
9 7 import gherkin.I18n;
10 8 import gherkin.formatter.Argument;
@@ -33,9 +31,6 @@ public JavaStepDefinition(Method method, Pattern pattern, ObjectFactory objectFa
33 31 }
34 32
35 33 public void execute(I18n i18n, Object[] args) throws Throwable {
36   - if (method.isAnnotationPresent(Pending.class)) {
37   - throw new PendingException(method.getAnnotation(Pending.class).value());
38   - }
39 34 Class<?> clazz = method.getDeclaringClass();
40 35 Object target = objectFactory.getInstance(clazz);
41 36 try {

0 comments on commit 2a400fe

Please sign in to comment.
Something went wrong with that request. Please try again.