From 1e141336a891cf67d9e82a1c624b113ea04415c0 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Tue, 7 Jun 2022 12:22:22 +0200
Subject: [PATCH] Fix ErrorBindingTests

---
 .../cloud/stream/binder/ErrorBindingTests.java      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ErrorBindingTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ErrorBindingTests.java
index 92f2479b2..78948dcaa 100644
--- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ErrorBindingTests.java
+++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ErrorBindingTests.java
@@ -39,7 +39,11 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class ErrorBindingTests {
 
 	@Test
+<<<<<<< HEAD
 	void testConfigurationWithDefaultErrorHandler() {
+=======
+	public void testConfigurationWithDefaultErrorHandler() {
+>>>>>>> 3a7ab48d5... Fix ErrorBindingTests
 		ApplicationContext context = new SpringApplicationBuilder(
 				TestChannelBinderConfiguration.getCompleteConfiguration(
 						ErrorBindingTests.ErrorConfigurationDefault.class))
@@ -95,10 +99,10 @@ public class ErrorBindingTests {
 		private int counter;
 
 		@Bean
-		public Consumer<Object> handle() {
+		public Function<String, String> handle() {
 			return v -> {
 				this.counter++;
-				throw new RuntimeException("BOOM!");
+				throw new RuntimeException("Intentional");
 			};
 		}
 
@@ -116,11 +120,10 @@ public class ErrorBindingTests {
 
 		private int counter;
 
-		@Bean
-		public Consumer<Object> handle() {
+		public Function<String, String> handle() {
 			return v -> {
 				this.counter++;
-				throw new RuntimeException("BOOM!");
+				throw new RuntimeException("Intentional");
 			};
 		}