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

HHH-4822 - Added @FailureExpected to annotations module 

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@18594 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
Hardy Ferentschik 2010-01-20 20:18:56 +00:00
parent 2f3a967c65
commit 1a090752a3
5 changed files with 197 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
annotations/src/test/java/org/hibernate/test/annotations/FailureExpected.java Normal file
View File

@ -0,0 +1,42 @@
// $Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2010, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
* Lesser General Public License, as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this distribution; if not, write to:
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.test.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* Annotations used to mark a expected test failure.
*
* @author Hardy Ferentschik
*/
@Target({ ElementType.METHOD, ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
public @interface FailureExpected {
String message() default "";
String issueNumber() default "";
}

25
annotations/src/test/java/org/hibernate/test/annotations/RequiresDialect.java
View File

@ -1,4 +1,27 @@
// $Id:$
// $Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2010, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
* Lesser General Public License, as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this distribution; if not, write to:
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.test.annotations;
import java.lang.annotation.ElementType;

23
annotations/src/test/java/org/hibernate/test/annotations/SkipForDialect.java
View File

@ -1,4 +1,27 @@
// $Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2010, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
* Lesser General Public License, as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this distribution; if not, write to:
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.test.annotations;
import java.lang.annotation.ElementType;

95
annotations/src/test/java/org/hibernate/test/annotations/TestCase.java
View File

@ -1,8 +1,30 @@
//$Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2010, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
* Lesser General Public License, as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this distribution; if not, write to:
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.test.annotations;
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.sql.Connection;
@ -24,6 +46,7 @@ import org.hibernate.cfg.Environment;
import org.hibernate.dialect.Dialect;
import org.hibernate.jdbc.Work;
import org.hibernate.tool.hbm2ddl.SchemaExport;
import org.hibernate.util.StringHelper;
/**
* A base class for all tests.
@ -113,14 +136,9 @@ public abstract class TestCase extends junit.framework.TestCase {
}
protected void runTest() throws Throwable {
try {
if ( runTest ) {
runTestMethod( runMethod );
handleUnclosedSession();
}
}
catch ( Throwable e ) {
closeSession( e );
if ( runTest ) {
runTestMethod( runMethod );
handleUnclosedSession();
}
}
@ -197,16 +215,38 @@ public abstract class TestCase extends junit.framework.TestCase {
}
private void runTestMethod(Method runMethod) throws Throwable {
boolean failureExpected = runMethod.getAnnotation( FailureExpected.class ) != null;
try {
runMethod.invoke( this, new Class[0] );
if ( failureExpected ) {
throw new FailureExpectedTestPassedException();
}
}
catch ( InvocationTargetException e ) {
e.fillInStackTrace();
throw e.getTargetException();
catch ( FailureExpectedTestPassedException t ) {
closeSession();
throw t;
}
catch ( IllegalAccessException e ) {
e.fillInStackTrace();
throw e;
catch ( Throwable t ) {
closeSession();
if ( failureExpected ) {
FailureExpected ann = runMethod.getAnnotation( FailureExpected.class );
StringBuilder builder = new StringBuilder();
if ( StringHelper.isNotEmpty( ann.message() ) ) {
builder.append( ann.message() );
}
else {
builder.append( "ignoring test methods annoated with @FailureExpected" );
}
if ( StringHelper.isNotEmpty( ann.issueNumber() ) ) {
builder.append( " (" );
builder.append( ann.issueNumber() );
builder.append( ")" );
}
reportSkip( builder.toString(), "Failed with: " + t.toString() );
}
else {
throw t;
}
}
}
@ -215,7 +255,7 @@ public abstract class TestCase extends junit.framework.TestCase {
assertNotNull( fName );
Method runMethod = null;
try {
runMethod = getClass().getMethod( fName, null );
runMethod = getClass().getMethod( fName );
}
catch ( NoSuchMethodException e ) {
fail( "Method \"" + fName + "\" not found" );
@ -240,7 +280,7 @@ public abstract class TestCase extends junit.framework.TestCase {
}
}
private void closeSession(Throwable e) throws Throwable {
private void closeSession() {
try {
if ( session != null && session.isOpen() ) {
if ( session.isConnected() ) {
@ -259,7 +299,6 @@ public abstract class TestCase extends junit.framework.TestCase {
}
catch ( Exception ignore ) {
}
throw e;
}
public Session openSession() throws HibernateException {
@ -314,10 +353,30 @@ public abstract class TestCase extends junit.framework.TestCase {
export.create( true, true );
}
protected void reportSkip(String reason, String testDescription) {
StringBuilder builder = new StringBuilder( );
builder.append( "*** skipping test [" );
builder.append( runMethod.getDeclaringClass().getName() );
builder.append( "." );
builder.append(runMethod.getName() );
builder.append( "] - " );
builder.append( testDescription );
builder.append( " : " );
builder.append( reason );
log.warn( builder.toString() );
}
public class RollbackWork implements Work {
public void execute(Connection connection) throws SQLException {
connection.rollback();
}
}
private static class FailureExpectedTestPassedException extends Exception {
public FailureExpectedTestPassedException() {
super( "Test marked as @FailureExpected, but did not fail!" );
}
}
}

60
annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java
View File

@ -1,3 +1,4 @@
// $Id:$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
@ -23,11 +24,10 @@
*/
package org.hibernate.test.annotations.idclassgeneratedvalue;
import java.math.BigDecimal;
import java.util.List;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.test.annotations.FailureExpected;
import org.hibernate.test.annotations.TestCase;
/**
@ -52,7 +52,7 @@ public class IdClassGeneratedValueTest extends TestCase {
s.beginTransaction();
List<Simple> simpleList = s.createQuery( "select s from Simple s" ).list();
assertEquals( simpleList.size(), 2 );
s1 = (Simple) s.load( Simple.class, new SimplePK( 1L, 2L ) );
s1 = ( Simple ) s.load( Simple.class, new SimplePK( 1L, 2L ) );
assertEquals( s1.getQuantity(), 10 );
s.clear();
s.createQuery( "delete Simple" ).executeUpdate();
@ -60,6 +60,7 @@ public class IdClassGeneratedValueTest extends TestCase {
s.close();
}
@FailureExpected(message = "Not yet implemented", issueNumber = "HHH-4552")
@SuppressWarnings({ "unchecked" })
public void testSingleGeneratedValue() {
Session s = openSession();
@ -76,38 +77,39 @@ public class IdClassGeneratedValueTest extends TestCase {
s.beginTransaction();
List<Simple> simpleList = s.createQuery( "select s from Simple2 s" ).list();
assertEquals( simpleList.size(), 2 );
s1 = (Simple2) s.load( Simple2.class, new SimplePK( s1Id1, 2L ) );
s1 = ( Simple2 ) s.load( Simple2.class, new SimplePK( s1Id1, 2L ) );
assertEquals( s1.getQuantity(), 10 );
s.clear();
s.createQuery( "delete Simple2" ).executeUpdate();
s.getTransaction().commit();
s.close();
}
@SuppressWarnings({ "unchecked" })
public void testMultipleGeneratedValue() {
Session s = openSession();
s.beginTransaction();
Multiple m1 = new Multiple( 1000L, 10 );
s.persist( m1 );
Long m1Id1 = m1.getId1();
Long m1Id2 = m1.getId2();
Multiple m2 = new Multiple( 2000L, 20 );
s.persist( m2 );
s.getTransaction().commit();
s.close();
s = openSession();
s.beginTransaction();
List<Simple> simpleList = s.createQuery( "select m from Multiple m" ).list();
assertEquals( simpleList.size(), 2 );
m1 = (Multiple) s.load( Multiple.class, new MultiplePK( m1Id1, m1Id2, 2L ) );
assertEquals( m1.getQuantity(), 10 );
s.clear();
s.createQuery( "delete Multiple" ).executeUpdate();
s.getTransaction().commit();
s.close();
}
@FailureExpected(message = "Not yet implemented", issueNumber = "HHH-4552")
@SuppressWarnings({ "unchecked" })
public void testMultipleGeneratedValue() {
Session s = openSession();
s.beginTransaction();
Multiple m1 = new Multiple( 1000L, 10 );
s.persist( m1 );
Long m1Id1 = m1.getId1();
Long m1Id2 = m1.getId2();
Multiple m2 = new Multiple( 2000L, 20 );
s.persist( m2 );
s.getTransaction().commit();
s.close();
s = openSession();
s.beginTransaction();
List<Simple> simpleList = s.createQuery( "select m from Multiple m" ).list();
assertEquals( simpleList.size(), 2 );
m1 = ( Multiple ) s.load( Multiple.class, new MultiplePK( m1Id1, m1Id2, 2L ) );
assertEquals( m1.getQuantity(), 10 );
s.clear();
s.createQuery( "delete Multiple" ).executeUpdate();
s.getTransaction().commit();
s.close();
}
// public void testComplexIdClass() {
// Session s = openSession();
@ -155,7 +157,7 @@ public class IdClassGeneratedValueTest extends TestCase {
Simple.class,
Simple2.class,
Multiple.class
};
}
}