From d4832788f6f69c7f52fbef54d1795f44b9e64eb5 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 28 Jun 2022 15:02:16 +0200 Subject: [PATCH] Resolve conflicts for backport. --- .../cloud/openfeign/circuitbreaker/CircuitBreakerTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java index ecc598bb..3dc1cad5 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java @@ -117,13 +117,13 @@ public class CircuitBreakerTests { } @Test - void testRuntimeExceptionUnwrapped() { + public void testRuntimeExceptionUnwrapped() { assertThatExceptionOfType(UnsupportedOperationException.class) .isThrownBy(() -> exceptionClient.getRuntimeException()); } @Test - void testCheckedExceptionWrapped() { + public void testCheckedExceptionWrapped() { assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> exceptionClient.getCheckedException()); }