[hibernate-commits] Hibernate SVN: r17713 - in core/trunk/annotations/src/test/java/org/hibernate/test/annotations: lob and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2009-10-13 05:20:40 -0400 (Tue, 13 Oct 2009)
New Revision: 17713

Modified:
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/TestCase.java
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/lob/LobTest.java
Log:
HHH-4415 removed the ambigous dialect instance variable in TestCase. Instead use the static method Dialect.getDialect

Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/TestCase.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/TestCase.java	2009-10-13 02:50:50 UTC (rev 17712)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/TestCase.java	2009-10-13 09:20:40 UTC (rev 17713)
@@ -37,7 +37,6 @@
 
 	private static SessionFactory sessions;
 	private static AnnotationConfiguration cfg;
-	private static Dialect dialect;
 	private static Class<?> lastTestClass;
 	private Session session;
 
@@ -86,7 +85,6 @@
 				InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream( xmlFile );
 				getCfg().addInputStream( is );
 			}
-			setDialect( Dialect.getDialect() );
 			setSessions( getCfg().buildSessionFactory( /* new TestInterceptor() */ ) );
 		}
 		catch ( Exception e ) {
@@ -261,12 +259,8 @@
 		return sessions;
 	}
 
-	private void setDialect(Dialect dialect) {
-		TestCase.dialect = dialect;
-	}
-
 	protected Dialect getDialect() {
-		return dialect;
+		return Dialect.getDialect();
 	}
 
 	protected static void setCfg(AnnotationConfiguration cfg) {

Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/lob/LobTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/lob/LobTest.java	2009-10-13 02:50:50 UTC (rev 17712)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/lob/LobTest.java	2009-10-13 09:20:40 UTC (rev 17713)
@@ -3,6 +3,7 @@
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;
+import org.hibernate.dialect.Dialect;
 import org.hibernate.test.annotations.TestCase;
 
 /**