From hibernate-commits at lists.jboss.org Tue Jan  5 04:45:31 2010
Content-Type: multipart/mixed; boundary="===============7311896499017025270=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r18407 - in
 core/trunk/annotations/src/test/java/org/hibernate/test: annotations/override
 and 1 other directories.
Date: Tue, 05 Jan 2010 04:45:31 -0500
Message-ID: <201001050945.o059jVmp029813@svn01.web.mwc.hst.phx2.redhat.com>

--===============7311896499017025270==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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/over=
ride/AttributeOverrideTest.java
Log:
Extract Schema helper methods

Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotatio=
ns/override/AttributeOverrideTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/ove=
rride/AttributeOverrideTest.java	2010-01-05 03:18:23 UTC (rev 18406)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/ove=
rride/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 =3D ( Iterator<Table> ) getCfg().getTableMa=
ppings();
-		while (tables.hasNext()) {
-			Table table =3D tables.next();
-			if (tableName.equals( table.getName() ) ) {
-				Iterator<Column> columns =3D (Iterator<Column>) table.getColumnIterato=
r();
-				while ( columns.hasNext() ) {
-					Column column =3D 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/SchemaU=
til.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 =3D ( Iterator<Table> ) cfg.getTableMapping=
s();
+		while (tables.hasNext()) {
+			Table table =3D tables.next();
+			if (tableName.equals( table.getName() ) ) {
+				Iterator<Column> columns =3D (Iterator<Column>) table.getColumnIterato=
r();
+				while ( columns.hasNext() ) {
+					Column column =3D columns.next();
+					if ( columnName.equals( column.getName() ) ) {
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+
+	public static boolean isTablePresent(String tableName, Configuration cfg)=
 {
+		final Iterator<Table> tables =3D ( Iterator<Table> ) cfg.getTableMapping=
s();
+		while (tables.hasNext()) {
+			Table table =3D tables.next();
+			if (tableName.equals( table.getName() ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+}


--===============7311896499017025270==--