[hibernate-commits] Hibernate SVN: r19196 - search/trunk/hibernate-search/src/test/java/org/hibernate/search/test.

[hibernate-commits at lists.jboss.org]

Author: sannegrinovero
Date: 2010-04-09 04:46:53 -0400 (Fri, 09 Apr 2010)
New Revision: 19196

Modified:
   search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/SearchTestCase.java
   search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/TestCase.java
Log:
HSEARCH-500 Some tests don't close the SessionFactory and SearchFactory

Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/SearchTestCase.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/SearchTestCase.java	2010-04-09 07:37:38 UTC (rev 19195)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/SearchTestCase.java	2010-04-09 08:46:53 UTC (rev 19196)
@@ -50,6 +50,7 @@
 import org.hibernate.search.SearchFactory;
 import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.event.FullTextIndexEventListener;
+import org.hibernate.search.impl.SearchFactoryImpl;
 import org.hibernate.search.store.RAMDirectoryProvider;
 import org.hibernate.tool.hbm2ddl.SchemaExport;
 
@@ -69,7 +70,7 @@
 
 	private static File indexDir;
 	
-	private SearchFactory searchFactory;
+	private SearchFactoryImpl searchFactory;
 
 	static {
 		String buildDir = System.getProperty( "build.dir" );
@@ -87,8 +88,12 @@
 	}
 
 	protected void tearDown() throws Exception {
+		super.tearDown();
 		SchemaExport export = new SchemaExport( cfg );
 		export.drop( false, true );
+		if ( searchFactory != null ) {
+			searchFactory.close();
+		}
 		searchFactory = null;
 	}
 
@@ -134,7 +139,7 @@
 		if ( searchFactory == null ) {
 			Session session = openSession();
 			FullTextSession fullTextSession = Search.getFullTextSession( session );
-			searchFactory = fullTextSession.getSearchFactory();
+			searchFactory = (SearchFactoryImpl) fullTextSession.getSearchFactory();
 			fullTextSession.close();
 		}
 		return searchFactory;

Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/TestCase.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/TestCase.java	2010-04-09 07:37:38 UTC (rev 19195)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/TestCase.java	2010-04-09 08:46:53 UTC (rev 19196)
@@ -91,6 +91,13 @@
 			lastTestClass = getClass();
 		}
 	}
+	
+	protected void tearDown() throws Exception {
+		super.tearDown();
+		if ( sessions != null ) {
+			sessions.close();
+		}
+	}
 
 	protected void runTest() throws Throwable {
 		try {