HSEARCH-3238 Upgrade to Easymock 4.0.1

hibernate · Nov 22, 2018 · 2c89f64 · 2c89f64
1 parent 654275d
commit 2c89f64
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/.../org/hibernate/search/elasticsearch/processor/impl/DefaultContextualErrorHandlerTest.java b/.../org/hibernate/search/elasticsearch/processor/impl/DefaultContextualErrorHandlerTest.java
@@ -9,6 +9,7 @@
 import static org.easymock.EasyMock.capture;
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.newCapture;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.ArrayList;
@@ -56,7 +57,7 @@ public void initMocks() {
 
 	@Test
 	public void singleError() {
-		Capture<ErrorContext> capture = new Capture<>();
+		Capture<ErrorContext> capture = newCapture();
 
 		replay();
 		DefaultContextualErrorHandler handler =
@@ -101,7 +102,7 @@ public void noError() {
 
 	@Test
 	public void nonWorkError() {
-		Capture<ErrorContext> capture = new Capture<>();
+		Capture<ErrorContext> capture = newCapture();
 
 		replay();
 		DefaultContextualErrorHandler handler =
@@ -138,7 +139,7 @@ public void nonWorkError() {
 
 	@Test
 	public void multipleErrors_works() {
-		Capture<ErrorContext> capture = new Capture<>();
+		Capture<ErrorContext> capture = newCapture();
 
 		replay();
 		DefaultContextualErrorHandler handler =
@@ -172,7 +173,7 @@ public void multipleErrors_works() {
 
 	@Test
 	public void multipleErrors_workAndNotWork() {
-		Capture<ErrorContext> capture = new Capture<>();
+		Capture<ErrorContext> capture = newCapture();
 
 		replay();
 		DefaultContextualErrorHandler handler =

diff --git a/...org/hibernate/search/elasticsearch/processor/impl/DefaultElasticsearchWorkBulkerTest.java b/...org/hibernate/search/elasticsearch/processor/impl/DefaultElasticsearchWorkBulkerTest.java
@@ -8,6 +8,7 @@
 
 import static org.easymock.EasyMock.capture;
 import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.newCapture;
 import static org.hibernate.search.test.util.FutureAssert.assertThat;
 
 import java.util.ArrayList;
@@ -41,7 +42,6 @@ public class DefaultElasticsearchWorkBulkerTest {
 	private Function<List<BulkableElasticsearchWork<?>>, ElasticsearchWork<BulkResult>> bulkWorkFactoryMock;
 
 	@Before
-	@SuppressWarnings("unchecked")
 	public void initMocks() {
 		sequenceBuilderMock = EasyMock.createStrictMock( ElasticsearchWorkSequenceBuilder.class );
 		bulkResultExtractionStepMock = EasyMock.createStrictMock( BulkResultExtractionStep.class );
@@ -56,7 +56,7 @@ public void simple() {
 		BulkableElasticsearchWork<Void> work2 = bulkableWork( 2 );
 		ElasticsearchWork<BulkResult> bulkWork = work( 3 );
 
-		Capture<CompletableFuture<ElasticsearchWork<BulkResult>>> bulkWorkFutureCapture = new Capture<>();
+		Capture<CompletableFuture<ElasticsearchWork<BulkResult>>> bulkWorkFutureCapture = newCapture();
 		CompletableFuture<BulkResult> bulkWorkResultFuture = new CompletableFuture<>();
 
 		replay();
@@ -127,7 +127,7 @@ public void alwaysBulkIfAboveThreshold() {
 		BulkableElasticsearchWork<?> work1 = bulkableWork( 1 );
 		ElasticsearchWork<BulkResult> bulkWork = work( 2 );
 
-		Capture<CompletableFuture<ElasticsearchWork<BulkResult>>> bulkWorkFutureCapture = new Capture<>();
+		Capture<CompletableFuture<ElasticsearchWork<BulkResult>>> bulkWorkFutureCapture = newCapture();
 		CompletableFuture<BulkResult> bulkWorkResultFuture = new CompletableFuture<>();
 
 		replay();
@@ -169,7 +169,7 @@ public void sameBulkOnFlushBulked() {
 		BulkableElasticsearchWork<Void> work4 = bulkableWork( 4 );
 		ElasticsearchWork<BulkResult> bulkWork = work( 5 );
 
-		Capture<CompletableFuture<ElasticsearchWork<BulkResult>>> bulkWorkFutureCapture = new Capture<>();
+		Capture<CompletableFuture<ElasticsearchWork<BulkResult>>> bulkWorkFutureCapture = newCapture();
 		CompletableFuture<BulkResult> bulkWorkResultFuture = new CompletableFuture<>();
 
 		replay();
@@ -230,8 +230,8 @@ public void newBulkOnFlushBulk() {
 
 		CompletableFuture<BulkResult> bulkWork1ResultFuture = new CompletableFuture<>();
 		CompletableFuture<BulkResult> bulkWork2ResultFuture = new CompletableFuture<>();
-		Capture<CompletableFuture<ElasticsearchWork<BulkResult>>> bulkWork1FutureCapture = new Capture<>();
-		Capture<CompletableFuture<ElasticsearchWork<BulkResult>>> bulkWork2FutureCapture = new Capture<>();
+		Capture<CompletableFuture<ElasticsearchWork<BulkResult>>> bulkWork1FutureCapture = newCapture();
+		Capture<CompletableFuture<ElasticsearchWork<BulkResult>>> bulkWork2FutureCapture = newCapture();
 
 		replay();
 		DefaultElasticsearchWorkBulker bulker =
@@ -300,8 +300,8 @@ public void newBulkOnTooManyBulkedWorks() {
 
 		CompletableFuture<BulkResult> bulkWork1ResultFuture = new CompletableFuture<>();
 		CompletableFuture<BulkResult> bulkWork2ResultFuture = new CompletableFuture<>();
-		Capture<CompletableFuture<ElasticsearchWork<BulkResult>>> bulkWork1FutureCapture = new Capture<>();
-		Capture<CompletableFuture<ElasticsearchWork<BulkResult>>> bulkWork2FutureCapture = new Capture<>();
+		Capture<CompletableFuture<ElasticsearchWork<BulkResult>>> bulkWork1FutureCapture = newCapture();
+		Capture<CompletableFuture<ElasticsearchWork<BulkResult>>> bulkWork2FutureCapture = newCapture();
 
 		replay();
 		DefaultElasticsearchWorkBulker bulker =
@@ -361,14 +361,12 @@ private void verify() {
 	}
 
 	private <T> ElasticsearchWork<T> work(int index) {
-		@SuppressWarnings("unchecked")
 		ElasticsearchWork<T> mock = EasyMock.createStrictMock( "work" + index, ElasticsearchWork.class );
 		mocks.add( mock );
 		return mock;
 	}
 
 	private <T> BulkableElasticsearchWork<T> bulkableWork(int index) {
-		@SuppressWarnings("unchecked")
 		BulkableElasticsearchWork<T> mock = EasyMock.createStrictMock( "bulkableWork" + index, BulkableElasticsearchWork.class );
 		mocks.add( mock );
 		return mock;

diff --git a/...rc/test/java/org/hibernate/search/elasticsearch/test/DefaultElasticsearchServiceTest.java b/...rc/test/java/org/hibernate/search/elasticsearch/test/DefaultElasticsearchServiceTest.java
@@ -10,6 +10,7 @@
 import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.getCurrentArguments;
+import static org.easymock.EasyMock.newCapture;
 import static org.easymock.EasyMock.replay;
 
 import java.util.Properties;
@@ -62,7 +63,7 @@ public class DefaultElasticsearchServiceTest {
 	@Test
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public void propertyMasking() throws Exception {
-		Capture<Properties> propertiesCapture = new Capture<>();
+		Capture<Properties> propertiesCapture = newCapture();
 
 		expect( contextMock.getServiceManager() ).andReturn( serviceManagerMock ).anyTimes();
 		expect( serviceManagerMock.requestReference( anyObject() ) ).andAnswer(

diff --git a/...va/org/hibernate/search/test/configuration/integration/HibernateSearchIntegratorTest.java b/...va/org/hibernate/search/test/configuration/integration/HibernateSearchIntegratorTest.java
@@ -9,6 +9,7 @@
 import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.isA;
+import static org.easymock.EasyMock.newCapture;
 import static org.easymock.EasyMock.startsWith;
 
 import java.util.Collections;
@@ -98,7 +99,7 @@ public void testEventListenersAreRegisteredIfSearchIsImplicitlyEnabledInConfigur
 
 	@SuppressWarnings("unchecked")
 	private void assertObserverCalledAndEventListenersRegistered() {
-		Capture<SessionFactoryObserver> capturedSessionFactoryObserver = new Capture<SessionFactoryObserver>();
+		Capture<SessionFactoryObserver> capturedSessionFactoryObserver = newCapture();
 		mockSessionFactoryImplementor.addObserver(
 				EasyMock.and(
 						EasyMock.capture( capturedSessionFactoryObserver ),

diff --git a/pom.xml b/pom.xml
@@ -252,7 +252,7 @@
         <!-- Test dependencies -->
 
         <version.junit>4.12</version.junit>
-        <version.org.easymock>3.6</version.org.easymock>
+        <version.org.easymock>4.0.1</version.org.easymock>
         <version.org.unitils>3.4.6</version.org.unitils>
         <version.simple-jndi>0.11.4.1</version.simple-jndi>
         <version.org.assertj.assertj-core>3.9.1</version.org.assertj.assertj-core>