Author: epbernard Date: 2010-01-05 04:45:30 -0500 (Tue, 05 Jan 2010) New Revision: 18407 Added: core/trunk/annotations/src/test/java/org/hibernate/test/util/ core/trunk/annotations/src/test/java/org/hibernate/test/util/SchemaUtil.java Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/AttributeOverrideTest.java Log: Extract Schema helper methods Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/AttributeOverrideTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/AttributeOverrideTest.java 2010-01-05 03:18:23 UTC (rev 18406) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/AttributeOverrideTest.java 2010-01-05 09:45:30 UTC (rev 18407) @@ -3,6 +3,7 @@ import java.util.Iterator; import org.hibernate.test.annotations.TestCase; +import org.hibernate.test.util.SchemaUtil; import org.hibernate.metadata.CollectionMetadata; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.persister.collection.CollectionPersister; @@ -34,20 +35,7 @@ } public boolean isColumnPresent(String tableName, String columnName) { - final Iterator<Table> tables = ( Iterator<Table> ) getCfg().getTableMappings(); - while (tables.hasNext()) { - Table table = tables.next(); - if (tableName.equals( table.getName() ) ) { - Iterator<Column> columns = (Iterator<Column>) table.getColumnIterator(); - while ( columns.hasNext() ) { - Column column = columns.next(); - if ( columnName.equals( column.getName() ) ) { - return true; - } - } - } - } - return false; + return SchemaUtil.isColumnPresent( tableName, columnName, getCfg() ); } protected Class<?>[] getMappings() { Added: core/trunk/annotations/src/test/java/org/hibernate/test/util/SchemaUtil.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/util/SchemaUtil.java (rev 0) +++ core/trunk/annotations/src/test/java/org/hibernate/test/util/SchemaUtil.java 2010-01-05 09:45:30 UTC (rev 18407) @@ -0,0 +1,42 @@ +package org.hibernate.test.util; + +import java.util.Iterator; + +import org.hibernate.mapping.Table; +import org.hibernate.mapping.Column; +import org.hibernate.cfg.Configuration; + +/** + * Check that the Hibernate metamodel contains some database objects + * + * @author Emmanuel Bernard + */ +public abstract class SchemaUtil { + public static boolean isColumnPresent(String tableName, String columnName, Configuration cfg) { + final Iterator<Table> tables = ( Iterator<Table> ) cfg.getTableMappings(); + while (tables.hasNext()) { + Table table = tables.next(); + if (tableName.equals( table.getName() ) ) { + Iterator<Column> columns = (Iterator<Column>) table.getColumnIterator(); + while ( columns.hasNext() ) { + Column column = columns.next(); + if ( columnName.equals( column.getName() ) ) { + return true; + } + } + } + } + return false; + } + + public static boolean isTablePresent(String tableName, Configuration cfg) { + final Iterator<Table> tables = ( Iterator<Table> ) cfg.getTableMappings(); + while (tables.hasNext()) { + Table table = tables.next(); + if (tableName.equals( table.getName() ) ) { + return true; + } + } + return false; + } +}