HSEARCH-3877 Replace SubTest.expectException with Assertions.assertTh…

…rownBy() For consistency, and because custom code is not necessary in this case.
hibernate · Apr 2, 2020 · af4f1ec · af4f1ec
1 parent 475ae65
commit af4f1ec
Show file tree

Hide file tree

Showing 121 changed files with 862 additions and 1,452 deletions.
diff --git a/...ackend/elasticsearch/client/impl/ElasticsearchClientUtilsGetElasticsearchVersionTest.java b/...ackend/elasticsearch/client/impl/ElasticsearchClientUtilsGetElasticsearchVersionTest.java
@@ -84,7 +84,7 @@ public void testValid() {
 	public void testInvalid() {
 		String invalidVersionString = versionString.substring( 0, versionString.length() - 1 ) + "-A-B";
 		doMock( invalidVersionString );
-		assertThatThrownBy( () ->  ElasticsearchClientUtils.getElasticsearchVersion( clientMock ) )
+		assertThatThrownBy( () -> ElasticsearchClientUtils.getElasticsearchVersion( clientMock ) )
 				.is( matching( ExceptionMatcherBuilder.isException( SearchException.class )
 						.withMessage( "HSEARCH400080" )
 						.causedBy( SearchException.class )

diff --git a/.../hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactoryTest.java b/.../hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactoryTest.java
@@ -7,6 +7,7 @@
 package org.hibernate.search.backend.elasticsearch.dialect.impl;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.hibernate.search.backend.elasticsearch.ElasticsearchVersion;
 import org.hibernate.search.backend.elasticsearch.dialect.model.impl.Elasticsearch56ModelDialect;
@@ -21,7 +22,6 @@
 import org.hibernate.search.backend.elasticsearch.dialect.protocol.impl.Elasticsearch70ProtocolDialect;
 import org.hibernate.search.backend.elasticsearch.dialect.protocol.impl.ElasticsearchProtocolDialect;
 import org.hibernate.search.util.common.SearchException;
-import org.hibernate.search.util.impl.test.SubTest;
 import org.hibernate.search.util.impl.test.annotation.TestForIssue;
 import org.hibernate.search.util.impl.test.rule.ExpectedLog4jLog;
 
@@ -388,26 +388,24 @@ public void es800() {
 	}
 
 	private void testUnsupported(String unsupportedVersionString) {
-		SubTest.expectException(
-				"Test unsupported version " + unsupportedVersionString,
+		assertThatThrownBy(
 				() -> {
 					dialectFactory.createModelDialect( ElasticsearchVersion.of( unsupportedVersionString ) );
-				}
+				},
+				"Test unsupported version " + unsupportedVersionString
 		)
-				.assertThrown()
 				.isInstanceOf( SearchException.class )
 				.hasMessageContaining( "HSEARCH400081" )
 				.hasMessageContaining( "'" + unsupportedVersionString + "'" );
 	}
 
 	private void testAmbiguous(String versionString) {
-		SubTest.expectException(
-				"Test ambiguous version " + versionString,
+		assertThatThrownBy(
 				() -> {
 					dialectFactory.createModelDialect( ElasticsearchVersion.of( versionString ) );
-				}
+				},
+				"Test ambiguous version " + versionString
 		)
-				.assertThrown()
 				.isInstanceOf( SearchException.class )
 				.hasMessageContaining( "HSEARCH400561" )
 				.hasMessageContaining( "Ambiguous Elasticsearch version: '" + versionString + "'." )

diff --git a/.../test/java/org/hibernate/search/backend/lucene/lowlevel/index/impl/IndexAccessorTest.java b/.../test/java/org/hibernate/search/backend/lucene/lowlevel/index/impl/IndexAccessorTest.java
@@ -18,7 +18,7 @@
 import org.hibernate.search.backend.lucene.lowlevel.writer.impl.IndexWriterProvider;
 import org.hibernate.search.engine.reporting.spi.EventContexts;
 import org.hibernate.search.util.common.reporting.EventContext;
-import org.hibernate.search.util.impl.test.SubTest;
+import org.assertj.core.api.Assertions;
 
 import org.junit.After;
 import org.junit.Before;
@@ -92,8 +92,7 @@ public void commit_runtimeException() {
 		indexWriterDelegatorMock.commit();
 		expectLastCall().andThrow( exception );
 		replayAll();
-		SubTest.expectException( () -> accessor.commit() )
-				.assertThrown()
+		Assertions.assertThatThrownBy( () -> accessor.commit() )
 				.isSameAs( exception );
 		verifyAll();
 	}
@@ -127,8 +126,7 @@ public void commitOrDelay_runtimeException() {
 		indexWriterDelegatorMock.commitOrDelay();
 		expectLastCall().andThrow( exception );
 		replayAll();
-		SubTest.expectException( () -> accessor.commitOrDelay() )
-				.assertThrown()
+		Assertions.assertThatThrownBy( () -> accessor.commitOrDelay() )
 				.isSameAs( exception );
 		verifyAll();
 	}
@@ -150,8 +148,7 @@ public void refresh_runtimeException() {
 		indexReaderProviderMock.refresh();
 		expectLastCall().andThrow( exception );
 		replayAll();
-		SubTest.expectException( () -> accessor.refresh() )
-				.assertThrown()
+		Assertions.assertThatThrownBy( () -> accessor.refresh() )
 				.isSameAs( exception );
 		verifyAll();
 	}

diff --git a/...rg/hibernate/search/backend/lucene/orchestration/impl/LuceneBatchedWorkProcessorTest.java b/...rg/hibernate/search/backend/lucene/orchestration/impl/LuceneBatchedWorkProcessorTest.java
@@ -21,7 +21,7 @@
 import org.hibernate.search.backend.lucene.work.impl.IndexingWorkExecutionContext;
 import org.hibernate.search.engine.reporting.spi.EventContexts;
 import org.hibernate.search.util.common.reporting.EventContext;
-import org.hibernate.search.util.impl.test.SubTest;
+import org.assertj.core.api.Assertions;
 
 import org.junit.Test;
 
@@ -94,8 +94,8 @@ public void error_workExecute() throws IOException {
 		expectWorkGetInfo( 50 );
 		indexAccessorMock.cleanUpAfterFailure( workException, workInfo( 50 ) );
 		replayAll();
-		SubTest.expectException( () -> processor.submit( failingWork ) )
-				.assertThrown().isSameAs( workException );
+		Assertions.assertThatThrownBy( () -> processor.submit( failingWork ) )
+				.isSameAs( workException );
 		verifyAll();
 
 		// Subsequent works must be executed regardless of previous failures in the same batch
@@ -127,8 +127,7 @@ public void error_forceCommit() throws IOException {
 		expectLastCall().andThrow( commitException );
 		indexAccessorMock.cleanUpAfterFailure( commitException, "Commit after a set of index works" );
 		replayAll();
-		SubTest.expectException( () -> processor.forceCommit() )
-				.assertThrown()
+		Assertions.assertThatThrownBy( () -> processor.forceCommit() )
 				.isSameAs( commitException );
 		verifyAll();
 
@@ -157,8 +156,7 @@ public void error_forceRefresh() {
 		indexAccessorMock.refresh();
 		expectLastCall().andThrow( refreshException );
 		replayAll();
-		SubTest.expectException( () -> processor.forceRefresh() )
-				.assertThrown()
+		Assertions.assertThatThrownBy( () -> processor.forceRefresh() )
 				.isSameAs( refreshException );
 		verifyAll();
 	}

diff --git a/...g/hibernate/search/documentation/mapper/orm/entityindexmapping/HibernateOrmIndexedIT.java b/...g/hibernate/search/documentation/mapper/orm/entityindexmapping/HibernateOrmIndexedIT.java
@@ -24,7 +24,7 @@
 import org.hibernate.search.util.impl.integrationtest.common.rule.BackendConfiguration;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelper;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils;
-import org.hibernate.search.util.impl.test.SubTest;
+import org.assertj.core.api.Assertions;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -86,7 +86,7 @@ public void search_separateQueries() {
 
 	@Test
 	public void search_singleQuery() {
-		SubTest.expectException(
+		Assertions.assertThatThrownBy(
 				() -> OrmUtils.withinJPATransaction( entityManagerFactory, entityManager -> {
 					SearchSession searchSession = Search.session( entityManager );
 
@@ -100,7 +100,6 @@ public void search_singleQuery() {
 					// end::cross-backend-search[]
 				} )
 		)
-				.assertThrown()
 				.isInstanceOf( SearchException.class )
 				.hasMessageContaining( "A multi-index scope cannot include both " )
 				.hasMessageContaining( " and another type of index" );

diff --git a/.../documentation/mapper/orm/indexedembedded/includepaths/IndexedEmbeddedIncludePathsIT.java b/.../documentation/mapper/orm/indexedembedded/includepaths/IndexedEmbeddedIncludePathsIT.java
@@ -21,7 +21,7 @@
 import org.hibernate.search.util.impl.integrationtest.common.rule.BackendConfiguration;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelper;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils;
-import org.hibernate.search.util.impl.test.SubTest;
+import org.assertj.core.api.Assertions;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -108,22 +108,20 @@ public void smoke() {
 
 		SearchMapping searchMapping = Search.mapping( entityManagerFactory );
 
-		SubTest.expectException(
+		Assertions.assertThatThrownBy(
 				() -> {
 					searchMapping.scope( Human.class ).predicate()
 							.match().field( "parents.parents.nickname" );
 				}
 		)
-				.assertThrown()
 				.isInstanceOf( SearchException.class )
 				.hasMessageContaining( "Unknown field" );
-		SubTest.expectException(
+		Assertions.assertThatThrownBy(
 				() -> {
 					searchMapping.scope( Human.class ).predicate()
 							.match().field( "parents.parents.parents.name" );
 				}
 		)
-				.assertThrown()
 				.isInstanceOf( SearchException.class )
 				.hasMessageContaining( "Unknown field" );
 

diff --git a/...apper/orm/indexedembedded/includepathsanddepth/IndexedEmbeddedIncludePathsAndDepthIT.java b/...apper/orm/indexedembedded/includepathsanddepth/IndexedEmbeddedIncludePathsAndDepthIT.java
@@ -21,7 +21,7 @@
 import org.hibernate.search.util.impl.integrationtest.common.rule.BackendConfiguration;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelper;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils;
-import org.hibernate.search.util.impl.test.SubTest;
+import org.assertj.core.api.Assertions;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -110,22 +110,20 @@ public void smoke() {
 
 		SearchMapping searchMapping = Search.mapping( entityManagerFactory );
 
-		SubTest.expectException(
+		Assertions.assertThatThrownBy(
 				() -> {
 					searchMapping.scope( Human.class ).predicate()
 							.match().field( "parents.parents.parents.nickname" );
 				}
 		)
-				.assertThrown()
 				.isInstanceOf( SearchException.class )
 				.hasMessageContaining( "Unknown field" );
-		SubTest.expectException(
+		Assertions.assertThatThrownBy(
 				() -> {
 					searchMapping.scope( Human.class ).predicate()
 							.match().field( "parents.parents.parents.parents.name" );
 				}
 		)
-				.assertThrown()
 				.isInstanceOf( SearchException.class )
 				.hasMessageContaining( "Unknown field" );
 	}

diff --git a/...test/java/org/hibernate/search/engine/cfg/spi/ConfigurationPropertyBeanReferenceTest.java b/...test/java/org/hibernate/search/engine/cfg/spi/ConfigurationPropertyBeanReferenceTest.java
@@ -18,7 +18,7 @@
 import org.hibernate.search.engine.environment.bean.BeanReference;
 import org.hibernate.search.engine.environment.bean.BeanResolver;
 import org.hibernate.search.engine.testsupport.util.AbstractBeanResolverPartialMock;
-import org.hibernate.search.util.impl.test.SubTest;
+import org.assertj.core.api.Assertions;
 
 import org.junit.Test;
 
@@ -260,8 +260,7 @@ public void invalidType() {
 		EasyMock.expect( sourceMock.get( key ) ).andReturn( (Optional) Optional.of( invalidTypeValue ) );
 		EasyMock.expect( sourceMock.resolve( key ) ).andReturn( Optional.of( resolvedKey ) );
 		replayAll();
-		SubTest.expectException( () -> property.get( sourceMock ) )
-				.assertThrown()
+		Assertions.assertThatThrownBy( () -> property.get( sourceMock ) )
 				.hasMessageContaining(
 						"Unable to convert configuration property '" + resolvedKey
 								+ "' with value '" + invalidTypeValue + "':"
@@ -290,12 +289,11 @@ public void invalidReference() {
 		EasyMock.expect( beanResolverMock.resolve( StubBean.class, "name" ) )
 				.andThrow( simulatedFailure );
 		replayAll();
-		SubTest.expectException(
+		Assertions.assertThatThrownBy(
 				() -> {
 					property.getAndMap( sourceMock, beanResolverMock::resolve );
 				}
 		)
-				.assertThrown()
 				.hasCause( simulatedFailure )
 				.hasMessageContaining(
 						"Unable to convert configuration property '" + resolvedKey
@@ -327,12 +325,11 @@ public void multiValued_invalidReference() {
 				.andThrow( simulatedFailure );
 		bean1Mock.close(); // Expect the first bean holder to be closed
 		replayAll();
-		SubTest.expectException(
+		Assertions.assertThatThrownBy(
 				() -> {
 					property.getAndMap( sourceMock, beanResolverMock::resolve );
 				}
 		)
-				.assertThrown()
 				.hasCause( simulatedFailure )
 				.hasMessageContaining(
 						"Unable to convert configuration property '" + resolvedKey

diff --git a/...ava/org/hibernate/search/engine/cfg/spi/ConfigurationPropertyInvalidSimpleValuesTest.java b/...ava/org/hibernate/search/engine/cfg/spi/ConfigurationPropertyInvalidSimpleValuesTest.java
@@ -15,7 +15,7 @@
 import java.util.function.Function;
 
 import org.hibernate.search.util.common.SearchException;
-import org.hibernate.search.util.impl.test.SubTest;
+import org.assertj.core.api.Assertions;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -101,8 +101,7 @@ public void withDefault() {
 		EasyMock.expect( sourceMock.get( key ) ).andReturn( (Optional) Optional.of( invalidStringValue ) );
 		EasyMock.expect( sourceMock.resolve( key ) ).andReturn( Optional.of( resolvedKey ) );
 		replayAll();
-		SubTest.expectException( () -> property.get( sourceMock ) )
-				.assertThrown()
+		Assertions.assertThatThrownBy( () -> property.get( sourceMock ) )
 				.hasMessageContaining(
 						"Unable to convert configuration property '" + resolvedKey
 								+ "' with value '" + invalidStringValue + "':"
@@ -116,8 +115,7 @@ public void withDefault() {
 		EasyMock.expect( sourceMock.get( key ) ).andReturn( (Optional) Optional.of( invalidTypeValue ) );
 		EasyMock.expect( sourceMock.resolve( key ) ).andReturn( Optional.of( resolvedKey ) );
 		replayAll();
-		SubTest.expectException( () -> property.get( sourceMock ) )
-				.assertThrown()
+		Assertions.assertThatThrownBy( () -> property.get( sourceMock ) )
 				.hasMessageContaining(
 						"Unable to convert configuration property '" + resolvedKey
 								+ "' with value '" + invalidTypeValue + "':"
@@ -140,8 +138,7 @@ public void withoutDefault() {
 		EasyMock.expect( sourceMock.get( key ) ).andReturn( (Optional) Optional.of( invalidStringValue ) );
 		EasyMock.expect( sourceMock.resolve( key ) ).andReturn( Optional.of( resolvedKey ) );
 		replayAll();
-		SubTest.expectException( () -> property.get( sourceMock ) )
-				.assertThrown()
+		Assertions.assertThatThrownBy( () -> property.get( sourceMock ) )
 				.hasMessageContaining(
 						"Unable to convert configuration property '" + resolvedKey
 								+ "' with value '" + invalidStringValue + "':"
@@ -155,8 +152,7 @@ public void withoutDefault() {
 		EasyMock.expect( sourceMock.get( key ) ).andReturn( (Optional) Optional.of( invalidTypeValue ) );
 		EasyMock.expect( sourceMock.resolve( key ) ).andReturn( Optional.of( resolvedKey ) );
 		replayAll();
-		SubTest.expectException( () -> property.get( sourceMock ) )
-				.assertThrown()
+		Assertions.assertThatThrownBy( () -> property.get( sourceMock ) )
 				.hasMessageContaining(
 						"Unable to convert configuration property '" + resolvedKey
 								+ "' with value '" + invalidTypeValue + "':"
@@ -181,8 +177,7 @@ public void multiValued() {
 		EasyMock.expect( sourceMock.get( key ) ).andReturn( (Optional) Optional.of( invalidStringValue ) );
 		EasyMock.expect( sourceMock.resolve( key ) ).andReturn( Optional.of( resolvedKey ) );
 		replayAll();
-		SubTest.expectException( () -> property.get( sourceMock ) )
-				.assertThrown()
+		Assertions.assertThatThrownBy( () -> property.get( sourceMock ) )
 				.hasMessageContaining(
 						"Unable to convert configuration property '" + resolvedKey
 								+ "' with value '" + invalidStringValue + "':"
@@ -197,8 +192,7 @@ public void multiValued() {
 		EasyMock.expect( sourceMock.get( key ) ).andReturn( (Optional) Optional.of( commaSeparatedStringValue ) );
 		EasyMock.expect( sourceMock.resolve( key ) ).andReturn( Optional.of( resolvedKey ) );
 		replayAll();
-		SubTest.expectException( () -> property.get( sourceMock ) )
-				.assertThrown()
+		Assertions.assertThatThrownBy( () -> property.get( sourceMock ) )
 				.hasMessageContaining(
 						"Unable to convert configuration property '" + resolvedKey
 								+ "' with value '" + commaSeparatedStringValue + "':"
@@ -213,8 +207,7 @@ public void multiValued() {
 		EasyMock.expect( sourceMock.get( key ) ).andReturn( (Optional) Optional.of( invalidTypeValueCollection ) );
 		EasyMock.expect( sourceMock.resolve( key ) ).andReturn( Optional.of( resolvedKey ) );
 		replayAll();
-		SubTest.expectException( () -> property.get( sourceMock ) )
-				.assertThrown()
+		Assertions.assertThatThrownBy( () -> property.get( sourceMock ) )
 				.hasMessageContaining(
 						"Unable to convert configuration property '" + resolvedKey
 								+ "' with value '" + invalidTypeValueCollection + "':"
@@ -228,8 +221,7 @@ public void multiValued() {
 		EasyMock.expect( sourceMock.get( key ) ).andReturn( (Optional) Optional.of( invalidTypeValue ) );
 		EasyMock.expect( sourceMock.resolve( key ) ).andReturn( Optional.of( resolvedKey ) );
 		replayAll();
-		SubTest.expectException( () -> property.get( sourceMock ) )
-				.assertThrown()
+		Assertions.assertThatThrownBy( () -> property.get( sourceMock ) )
 				.hasMessageContaining(
 						"Unable to convert configuration property '" + resolvedKey
 								+ "' with value '" + invalidTypeValue + "':"