[jbehave-scm] [scm-core][1/2] JBEHAVE-871: Fixed a test broken on JDK 7

[wheleph]

commit 9a858691adcc69a3ad96901e27d69a9aaba42c30
Author:     wheleph <whel...@gmail.com>
AuthorDate: Sat, 22 Dec 2012 23:58:21 +0200
Commit:     Mauro Talevi <mauro.tal...@aquilonia.org>
CommitDate: Sun, 23 Dec 2012 00:14:46 +0100

    JBEHAVE-871: Fixed a test broken on JDK 7

diff --git 
a/jbehave-core/src/test/java/org/jbehave/core/steps/StepsBehaviour.java 
b/jbehave-core/src/test/java/org/jbehave/core/steps/StepsBehaviour.java
index 45adc1e..b867281 100755
--- a/jbehave-core/src/test/java/org/jbehave/core/steps/StepsBehaviour.java
+++ b/jbehave-core/src/test/java/org/jbehave/core/steps/StepsBehaviour.java
@@ -255,12 +255,19 @@ public class StepsBehaviour {
     }
 
     @Test
-    public void shouldReportFailuresInBeforeAndAfterMethods() {
-       BeforeAndAfterSteps steps = new BeforeAndAfterSteps();
+    public void shouldReportFailuresInBeforeMethods() {
+        assertFailureReturnedOnStepsPerformed(new BeforeSteps());
+    }
+
+    @Test
+    public void shouldReportFailuresInAfterMethods() {
+        assertFailureReturnedOnStepsPerformed(new AfterSteps());
+    }
+
+    private void assertFailureReturnedOnStepsPerformed(Steps steps) {
         ScenarioType scenarioType = ScenarioType.NORMAL;
-       List<BeforeOrAfterStep> beforeScenario = 
steps.listBeforeOrAfterScenario(scenarioType);
-       beforeScenario.get(0).createStep().perform(null);
-       StepResult stepResult = 
beforeScenario.get(1).createStep().perform(null);
+        List<BeforeOrAfterStep> beforeOrAfterStepList = 
steps.listBeforeOrAfterScenario(scenarioType);
+        StepResult stepResult = 
beforeOrAfterStepList.get(0).createStep().perform(null);
         assertThat(stepResult, instanceOf(Failed.class));
         assertThat(stepResult.getFailure(), 
instanceOf(UUIDExceptionWrapper.class));
         assertThat(stepResult.getFailure().getCause(), 
instanceOf(BeforeOrAfterFailed.class));
@@ -440,14 +447,19 @@ public class StepsBehaviour {
 
     }
 
-    static class BeforeAndAfterSteps extends Steps {
+    static class BeforeSteps extends Steps {
         
         @org.jbehave.core.annotations.BeforeScenario
         public void beforeScenario() {
+            throw new RuntimeException("Damn, I failed!");
         }
 
-        @org.jbehave.core.annotations.BeforeScenario
-        public void beforeScenarioThatFails() {
+    }
+
+    static class AfterSteps extends Steps {
+
+        @org.jbehave.core.annotations.AfterScenario
+        public void afterScenario() {
             throw new RuntimeException("Damn, I failed!");
         }