HSEARCH-755 Hibernate Core no longer wraps exception of Integrator / Listener initialization

Author: emmanuelbernard

hibernate-search/src/test/java/org/hibernate/search/test/analyzer/DuplicatedAnalyzerDefinitionTest.java

@@ -34,6 +34,7 @@
 import org.hibernate.HibernateException;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.search.Environment;
+import org.hibernate.search.SearchException;
 import org.hibernate.search.cfg.SearchMapping;
 import org.hibernate.search.test.SearchTestCase;
 import org.hibernate.search.util.logging.impl.Log;
@@ -61,9 +62,9 @@ public void testDuplicatedAnalyzerDefinitionThrowsException() throws Exception {
 			config.buildSessionFactory();
 			fail( "Session creation should have failed due to duplicate analyzer definition" );
 		}
-		catch ( HibernateException e ) { // the SearchException will be wrapped in a HibernateException
+		catch ( SearchException e ) { // the SearchException will be wrapped in a HibernateException
 			assertTrue(
-					e.getCause().getMessage().equals(
+					e.getMessage().equals(
 							"Multiple analyzer definitions with the same name: my-analyzer"
 					)
 			);
@@ -78,9 +79,9 @@ public void testDuplicatedProgrammaticAnalyzerDefinitionThrowsException() throws
 			config.buildSessionFactory();
 			fail( "Session creation should have failed due to duplicate analyzer definition" );
 		}
-		catch ( HibernateException e ) { // the SearchException will be wrapped in a HibernateException
+		catch ( SearchException e ) { // the SearchException will be wrapped in a HibernateException
 			assertTrue(
-					e.getCause().getMessage().equals( "Multiple analyzer definitions with the same name: english" )
+					e	.getMessage().equals( "Multiple analyzer definitions with the same name: english" )
 			);
 		}
 	}

hibernate-search/src/test/java/org/hibernate/search/test/configuration/ResourceNotFoundMessageTest.java

@@ -53,11 +53,8 @@ public void testIllegalAnalyzerDefinition() {
 					.build();
 			Assert.fail( "should not reach this" );
 		}
-		catch ( org.hibernate.HibernateException initException ) {
-			Throwable causeException = initException.getCause();
-			Assert.assertTrue( causeException instanceof SearchException );
-			SearchException searchException = (SearchException) causeException;
-			String message = searchException.getMessage();
+		catch ( SearchException initException ) {
+			String message = initException.getMessage();
 			Assert.assertEquals( "Resource not found: non-existent-resourcename.file", message );
 		}
 	}

hibernate-search/src/test/java/org/hibernate/search/test/directoryProvider/CustomLockProviderTest.java

@@ -23,6 +23,7 @@
  */
 package org.hibernate.search.test.directoryProvider;
 
+import org.hibernate.search.SearchException;
 import org.hibernate.search.test.util.FullTextSessionBuilder;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -31,7 +32,7 @@
  * @author Sanne Grinovero
  */
 public class CustomLockProviderTest {
-	
+
 	@Test
 	public void testUseOfCustomLockingFactory() {
 		assertNull( CustomLockFactoryFactory.optionValue );
@@ -57,11 +58,8 @@ public void testFailOnInexistentLockingFactory() {
 			builder.close();
 			fail();
 		}
-		catch (org.hibernate.HibernateException e) {
-			Throwable causeSearch = e.getCause();
-			assertNotNull( causeSearch );
-			assertTrue( causeSearch instanceof org.hibernate.search.SearchException );
-			assertEquals( "Unable to find locking_strategy implementation class: org.hibernate.NotExistingFactory", causeSearch.getMessage() );
+		catch (SearchException e) {
+			assertEquals( "Unable to find locking_strategy implementation class: org.hibernate.NotExistingFactory", e.getMessage() );
 		}
 	}
 

hibernate-search/src/test/java/org/hibernate/search/test/directoryProvider/FSDirectorySelectionTest.java

@@ -65,8 +65,8 @@ public void testInvalidDirectoryType() throws Exception {
 			createSessionFactoryUsingDirectoryType( "foobar" );
 			fail( "Factory creation should fail with invalid 'hibernate.search.default.filesystem_access_type' parameter " );
 		}
-		catch ( HibernateException e ) {
-			assertTrue( e.getCause() instanceof SearchException );
+		catch ( SearchException e ) {
+			//success
 		}
 	}
 

hibernate-search/src/test/java/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java

@@ -254,8 +254,7 @@ public void testSourceNotReady() throws Exception {
 		try {
 			cfg.buildSessionFactory();
 		}
-		catch ( HibernateException e ) {
-			assertTrue( "expected configuration failure", e.getCause() instanceof SearchException );
+		catch ( SearchException e ) {
 			final long elapsedTime = TimeUnit.NANOSECONDS.toSeconds( System.nanoTime() - start );
 			assertTrue( "Should be around 10 seconds: " + elapsedTime, elapsedTime > retries*5 - 1 ); // -1 for safety
 		}

hibernate-search/src/test/java/org/hibernate/search/test/directoryProvider/RetryInitializeTest.java

@@ -25,6 +25,7 @@
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.store.RAMDirectory;
 import org.hibernate.HibernateException;
+import org.hibernate.search.SearchException;
 import org.hibernate.search.store.DirectoryProvider;
 import org.hibernate.search.test.util.FullTextSessionBuilder;
 
@@ -67,7 +68,7 @@ public void testStandardInitialization() {
 		slave = createSlaveNode( false );
 	}
 
-	@Test(expected=HibernateException.class)
+	@Test(expected=SearchException.class)
 	public void testInitiallyFailing() {
 		slave = createSlaveNode( false );
 	}

hibernate-search/src/test/java/org/hibernate/search/test/id/DuplicateDocumentIdTest.java

@@ -24,6 +24,7 @@
 package org.hibernate.search.test.id;
 
 import org.hibernate.HibernateException;
+import org.hibernate.search.SearchException;
 import org.hibernate.search.test.SearchTestCase;
 
 /**
@@ -45,10 +46,10 @@ public void testDuplicateDocumentId() throws Exception {
 			buildConfiguration();
 			fail( "Building of configuration should fail, because Foo defines multiple document ids." );
 		}
-		catch ( HibernateException e ) { // getting a HibernateException here, because the listener registration fails
+		catch ( SearchException e ) { // getting a HibernateException here, because the listener registration fails
 			assertEquals(
 					"More than one @DocumentId specified on entity org.hibernate.search.test.id.Foo",
-					e.getCause().getMessage()
+					e.getMessage()
 			);
 		}
 	}

hibernate-search/src/test/java/org/hibernate/search/test/similarity/SimilarityTest.java

@@ -26,6 +26,7 @@
 import java.util.List;
 
 import org.hibernate.HibernateException;
+import org.hibernate.search.SearchException;
 import org.hibernate.search.test.SearchTestCase;
 import org.hibernate.search.Search;
 import org.hibernate.search.FullTextSession;
@@ -52,9 +53,9 @@ public void testIndexLevelSimilarity() throws Exception {
 			config.buildSessionFactory();
 			fail( "Session creation should have failed due to duplicate similarity definition" );
 		}
-		catch ( HibernateException e ) { // the SearchException will be wrapped in a HibernateException
+		catch ( SearchException e ) { // the SearchException will be wrapped in a HibernateException
 			assertTrue(
-					e.getCause().getMessage().startsWith(
+					e.getMessage().startsWith(
 							"Multiple similarities defined"
 					)
 			);