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

[hibernate-commits at lists.jboss.org]

Author: sannegrinovero
Date: 2010-04-09 04:49:25 -0400 (Fri, 09 Apr 2010)
New Revision: 19197

Modified:
   search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/JGroupsCommonTest.java
   search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/MultipleSessionsSearchTestCase.java
Log:
JGroups backend test cleanup

Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/JGroupsCommonTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/JGroupsCommonTest.java	2010-04-09 08:46:53 UTC (rev 19196)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/JGroupsCommonTest.java	2010-04-09 08:49:25 UTC (rev 19197)
@@ -28,7 +28,6 @@
 
 import org.apache.lucene.queryParser.QueryParser;
 import org.apache.lucene.search.Query;
-import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.cfg.Configuration;
@@ -41,16 +40,14 @@
 
 /**
  * In case of running test outside Hibernate Search Maven configuration set following VM configuration:
- * <br><br>
+ * <br>
  * <code>
  * 	-Djava.net.preferIPv4Stack=true -Djgroups.bind_addr=127.0.0.1
  * </code>
  * @author Lukasz Moren
  */
-
 public class JGroupsCommonTest extends MultipleSessionsSearchTestCase {
 
-	public static final String CHANNEL_NAME = "jgroups_test_channel";
 	private static final String DEFAULT_JGROUPS_CONFIGURATION_FILE = "flush-udp.xml";
 
 	public void testJGroupsBackend() throws Exception {
@@ -88,7 +85,6 @@
 		//need to sleep for the message consumption
 		Thread.sleep( 3000 );
 
-		parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
 		luceneQuery = parser.parse( "logo:Peter pan" );
 		query = ftSess.createFullTextQuery( luceneQuery );
 		result = query.list();
@@ -103,7 +99,6 @@
 		//Need to sleep for the message consumption
 		Thread.sleep( 3000 );
 
-		parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
 		luceneQuery = parser.parse( "logo:Boston or logo:Mapple leaves" );
 		query = ftSess.createFullTextQuery( luceneQuery );
 		result = query.list();
@@ -130,10 +125,6 @@
 		cfg.setProperty( JGroupsBackendQueueProcessorFactory.CONFIGURATION_FILE, DEFAULT_JGROUPS_CONFIGURATION_FILE );
 	}
 
-	public static Session getSession() throws HibernateException {
-		return sessions.openSession();
-	}
-
 	@Override
 	protected Class<?>[] getMappings() {
 		return new Class[] {
@@ -147,5 +138,4 @@
 		};
 	}
 
-
 }

Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/MultipleSessionsSearchTestCase.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/MultipleSessionsSearchTestCase.java	2010-04-09 08:46:53 UTC (rev 19196)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/MultipleSessionsSearchTestCase.java	2010-04-09 08:49:25 UTC (rev 19197)
@@ -26,8 +26,6 @@
 
 import java.io.InputStream;
 
-import org.slf4j.Logger;
-
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.AnnotationConfiguration;
 import org.hibernate.cfg.Configuration;
@@ -43,19 +41,17 @@
  */
 public abstract class MultipleSessionsSearchTestCase extends SearchTestCase {
 
-	private static final Logger log = org.hibernate.search.util.LoggerFactory.make();
+	private static final String masterCopy = "/master/copy";
 
-	private String masterCopy = "/master/copy";
-
 	/**
 	 * The lucene index directory which is specific to the master node.
 	 */
-	private String masterMain = "/master/main";
+	private static final String masterMain = "/master/main";
 
 	/**
 	 * The lucene index directory which is specific to the slave node.
 	 */
-	private String slave = "/slave";
+	private static final String slave = "/slave";
 
 
 	protected static SessionFactory slaveSessionFactory;
@@ -107,41 +103,31 @@
 		if ( slaveSessionFactory != null ) {
 			slaveSessionFactory.close();
 		}
-		if ( getSessions() != null ) {
-			getSessions().close();
-		}
-		log.info( "Deleting test directory {} ", getIndexDir().getAbsolutePath() );
 		FileHelper.delete( getIndexDir() );
 	}
 
 	private void buildCommonSessionFactory(Class<?>[] classes, String[] packages, String[] xmlFiles) throws Exception {
-		try {
-			if ( getSlaveSessionFactory() != null ) {
-				getSlaveSessionFactory().close();
-			}
+		if ( getSlaveSessionFactory() != null ) {
+			getSlaveSessionFactory().close();
+		}
 
-			setCommonCfg( new AnnotationConfiguration() );
-			commonConfigure( commonCfg );
-			if ( recreateSchema() ) {
-				commonCfg.setProperty( org.hibernate.cfg.Environment.HBM2DDL_AUTO, "create-drop" );
-			}
-			for ( String aPackage : packages ) {
-				( ( AnnotationConfiguration ) getCommonConfiguration() ).addPackage( aPackage );
-			}
-			for ( Class<?> aClass : classes ) {
-				( ( AnnotationConfiguration ) getCommonConfiguration() ).addAnnotatedClass( aClass );
-			}
-			for ( String xmlFile : xmlFiles ) {
-				InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream( xmlFile );
-				getCommonConfiguration().addInputStream( is );
-			}
-			setDialect( Dialect.getDialect() );
-			slaveSessionFactory = getCommonConfiguration().buildSessionFactory();
+		setCommonCfg( new AnnotationConfiguration() );
+		commonConfigure( commonCfg );
+		if ( recreateSchema() ) {
+			commonCfg.setProperty( org.hibernate.cfg.Environment.HBM2DDL_AUTO, "create-drop" );
 		}
-		catch ( Exception e ) {
-			e.printStackTrace();
-			throw e;
+		for ( String aPackage : packages ) {
+			((AnnotationConfiguration) getCommonConfiguration()).addPackage( aPackage );
 		}
+		for ( Class<?> aClass : classes ) {
+			((AnnotationConfiguration) getCommonConfiguration()).addAnnotatedClass( aClass );
+		}
+		for ( String xmlFile : xmlFiles ) {
+			InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream( xmlFile );
+			getCommonConfiguration().addInputStream( is );
+		}
+		setDialect( Dialect.getDialect() );
+		slaveSessionFactory = getCommonConfiguration().buildSessionFactory();
 	}
 
 	private void setCommonCfg(Configuration configuration) {