Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-8039: Changed evaluate method to handle annotation for @BeforeClass methods

This commit is contained in:
John Verhaeg 2013-02-28 10:47:56 -06:00
parent 69fda3d610
commit 5a993dd903
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hibernate-testing/src/main/java/org/hibernate/testing/junit4/BeforeClassCallbackHandler.java
View File

@ -44,8 +44,8 @@ public class BeforeClassCallbackHandler extends Statement {
public void evaluate() throws Throwable {
try {
runner.getTestClassMetadata().performBeforeClassCallbacks( runner.getTestInstance() );
}
catch ( CallbackException error ) {
wrappedStatement.evaluate();
} catch ( Throwable error ) {
runner.setBeforeClassMethodFailed();
if ( runner.getTestClass().getJavaClass().getAnnotation( FailureExpected.class ) == null &&
( !runner.useNewMetamodel() ||
@ -53,6 +53,5 @@ public class BeforeClassCallbackHandler extends Statement {
throw error;
}
}
wrappedStatement.evaluate();
}
}