reading of annotation not takes the executed test class into account …

…and not the class where the test method is declared (fixes #171)

CHANGELOG.md

@@ -18,6 +18,7 @@ The `@Table` annotation to format step parameters as tables has been extended wi
 
 ## Fixed Issues
 
+* Fixed the issue that tags of subclasses would not be visible on scenarios of superclasses [#171](https://github.com/TNG/JGiven/issues/171)
 * Fixed the issue that exceptions called within step methods are captured [#173](https://github.com/TNG/JGiven/issues/173)
 
 # v0.9.5

gradle.properties

@@ -1 +1 @@
-version=0.10.0-SNAPSHOT
+version=0.10.0

jgiven-core/src/main/java/com/tngtech/jgiven/impl/ScenarioBase.java

@@ -70,9 +70,9 @@ public void wireSteps( CanWire canWire ) {
         executor.wireSteps( canWire );
     }
 
-    public ScenarioBase startScenario( Method method, List<NamedArgument> arguments ) {
+    public ScenarioBase startScenario( Class<?> testClass, Method method, List<NamedArgument> arguments ) {
         performInitialization();
-        executor.startScenario( method, arguments );
+        executor.startScenario( testClass, method, arguments );
         return this;
     }
 

jgiven-core/src/main/java/com/tngtech/jgiven/impl/ScenarioExecutor.java

@@ -56,7 +56,7 @@ public enum State {
      * @param method the method that started the scenario
      * @param arguments the test arguments with their parameter names
      */
-    void startScenario( Method method, List<NamedArgument> arguments );
+    void startScenario( Class<?> testClass, Method method, List<NamedArgument> arguments );
 
     void setListener( ScenarioListener listener );
 

jgiven-core/src/main/java/com/tngtech/jgiven/impl/ScenarioModelBuilder.java

@@ -276,9 +276,9 @@ public void scenarioFailed( Throwable e ) {
     }
 
     @Override
-    public void scenarioStarted( Method method, List<NamedArgument> namedArguments ) {
-        readConfiguration( method.getDeclaringClass() );
-        readAnnotations( method );
+    public void scenarioStarted( Class<?> testClass, Method method, List<NamedArgument> namedArguments ) {
+        readConfiguration( testClass );
+        readAnnotations( testClass, method );
         setParameterNames( getNames( namedArguments ) );
 
         // must come at last
@@ -328,7 +328,7 @@ private void readConfiguration( Class<?> testClass ) {
         configuration = ConfigurationUtil.getConfiguration( testClass );
     }
 
-    private void readAnnotations( Method method ) {
+    private void readAnnotations( Class<?> testClass, Method method ) {
         String scenarioDescription = method.getName();
 
         if( method.isAnnotationPresent( Description.class ) ) {
@@ -348,7 +348,7 @@ private void readAnnotations( Method method ) {
         }
 
         if( scenarioCaseModel.getCaseNr() == 1 ) {
-            addTags( method.getDeclaringClass().getAnnotations() );
+            addTags( testClass.getAnnotations() );
             addTags( method.getAnnotations() );
         }
     }

jgiven-core/src/main/java/com/tngtech/jgiven/impl/StandaloneScenarioExecutor.java

@@ -436,8 +436,8 @@ public void startScenario( String description ) {
      * @param arguments the test arguments with their parameter names
      */
     @Override
-    public void startScenario( Method method, List<NamedArgument> arguments ) {
-        listener.scenarioStarted( method, arguments );
+    public void startScenario( Class<?> testClass, Method method, List<NamedArgument> arguments ) {
+        listener.scenarioStarted( testClass, method, arguments );
 
         if( method.isAnnotationPresent( Pending.class ) ) {
             Pending annotation = method.getAnnotation( Pending.class );

jgiven-core/src/main/java/com/tngtech/jgiven/impl/intercept/NoOpScenarioListener.java

@@ -16,7 +16,7 @@ public void scenarioFailed( Throwable e ) {}
     public void scenarioStarted( String string ) {}
 
     @Override
-    public void scenarioStarted( Method method, List<NamedArgument> arguments ) {}
+    public void scenarioStarted( Class<?> testClass, Method method, List<NamedArgument> arguments ) {}
 
     @Override
     public void stepMethodInvoked( Method method, List<NamedArgument> arguments, InvocationMode mode, boolean hasNestedSteps ) {}

jgiven-core/src/main/java/com/tngtech/jgiven/impl/intercept/ScenarioListener.java

@@ -13,7 +13,7 @@ public interface ScenarioListener {
 
     void scenarioStarted( String string );
 
-    void scenarioStarted( Method method, List<NamedArgument> arguments );
+    void scenarioStarted( Class<?> testClass, Method method, List<NamedArgument> arguments );
 
     void stepMethodInvoked( Method method, List<NamedArgument> arguments, InvocationMode mode, boolean hasNestedSteps );
 

jgiven-core/src/test/java/com/tngtech/jgiven/impl/ConfigurationTest.java

@@ -26,7 +26,7 @@ public class ConfigurationTest extends ScenarioTestBase<ConfigurationTest.FooSta
     @Test
     public void testFormatterConfiguration() throws Throwable {
         getScenario().setModel( new ReportModel() );
-        getScenario().startScenario( ConfigurationTest.class.getMethod( "testFormatterConfiguration" ),
+        getScenario().startScenario( this.getClass(), ConfigurationTest.class.getMethod( "testFormatterConfiguration" ),
             Collections.<NamedArgument>emptyList() );
         given().some_step( new FooParam() );
         given().another_step( new FooParam() );

jgiven-junit/src/main/java/com/tngtech/jgiven/junit/ScenarioExecutionRule.java

@@ -8,12 +8,7 @@
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 import org.junit.internal.AssumptionViolatedException;
 import org.junit.rules.MethodRule;
@@ -112,7 +107,7 @@ protected void starting( Statement base, FrameworkMethod testMethod, Object targ
         scenario.setModel( reportModel );
         scenario.getExecutor().injectSteps( target );
 
-        scenario.startScenario( testMethod.getMethod(), getNamedArguments( base, testMethod, target ) );
+        scenario.startScenario( target.getClass(), testMethod.getMethod(), getNamedArguments( base, testMethod, target ) );
 
         // inject state from the test itself
         scenario.getExecutor().readScenarioState( target );

jgiven-junit/src/test/java/com/tngtech/jgiven/junit/tags/AbstractScenarioForTestingTagInheritance.java

@@ -0,0 +1,22 @@
+package com.tngtech.jgiven.junit.tags;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.tngtech.jgiven.junit.ScenarioTest;
+
+public abstract class AbstractScenarioForTestingTagInheritance<G, W, T> extends ScenarioTest<G, W, T> {
+
+    @Test
+    public void ensure_all_tags_are_found() throws Throwable {
+        getScenario().finished();
+
+        List<String> tagIds = getScenario().getModel().getLastScenarioModel().getTagIds();
+        assertThat( tagIds ).containsAll( Arrays.asList( "TestTag" ) );
+
+    }
+}

jgiven-junit/src/test/java/com/tngtech/jgiven/junit/tags/ClassImplementingAbstractScenario.java

@@ -0,0 +1,9 @@
+package com.tngtech.jgiven.junit.tags;
+
+@TestTag
+public class ClassImplementingAbstractScenario
+        extends
+        AbstractScenarioForTestingTagInheritance<ClassImplementingAbstractScenario.GivenStep<?>, ClassImplementingAbstractScenario.GivenStep<?>, ClassImplementingAbstractScenario.GivenStep<?>> {
+
+    public static class GivenStep<T> {}
+}

jgiven-junit/src/test/java/com/tngtech/jgiven/junit/tags/TestTag.java

@@ -0,0 +1,14 @@
+package com.tngtech.jgiven.junit.tags;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import com.tngtech.jgiven.annotation.IsTag;
+
+@IsTag(name = "Security")
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+public @interface TestTag {
+
+}

jgiven-testng/src/main/java/com/tngtech/jgiven/testng/ScenarioTestListener.java

@@ -51,7 +51,7 @@ public void onTestStart( ITestResult paramITestResult ) {
         scenario.getExecutor().injectSteps( instance );
 
         Method method = paramITestResult.getMethod().getConstructorOrMethod().getMethod();
-        scenario.startScenario( method, getArgumentsFrom( method, paramITestResult ) );
+        scenario.startScenario( instance.getClass(), method, getArgumentsFrom( method, paramITestResult ) );
 
         // inject state from the test itself
         scenario.getExecutor().readScenarioState( instance );