Add tests for RetryOperationsInterceptor proxy attribute cleanup

Author: junhyeongkim2

src/test/java/org/springframework/retry/interceptor/RetryOperationsInterceptorTests.java

@@ -36,9 +36,11 @@
 import org.springframework.retry.RetryCallback;
 import org.springframework.retry.RetryContext;
 import org.springframework.retry.RetryListener;
+import org.springframework.retry.context.RetryContextSupport;
 import org.springframework.retry.listener.MethodInvocationRetryListenerSupport;
 import org.springframework.retry.policy.NeverRetryPolicy;
 import org.springframework.retry.policy.SimpleRetryPolicy;
+import org.springframework.retry.support.RetrySynchronizationManager;
 import org.springframework.retry.support.RetryTemplate;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
@@ -47,6 +49,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Dave Syer
@@ -257,6 +260,70 @@ public Object proceed() {
 		})).withMessageContaining("MethodInvocation");
 	}
 
+	@Test
+	public void testProxyAttributeCleanupWithCorrectKey() {
+		RetryContext directContext = new RetryContextSupport(null);
+		Object mockProxy = new Object();
+		RetrySynchronizationManager.register(directContext);
+		directContext.setAttribute("___proxy___", mockProxy);
+		RetryContext retrievedContext = RetrySynchronizationManager.getContext();
+		retrievedContext.removeAttribute("___proxy___");
+		assertThat(RetrySynchronizationManager.getContext().getAttribute("___proxy___")).isNull();
+		RetrySynchronizationManager.clear();
+	}
+
+	@Test
+	public void testProxyAttributeRemainWithWrongKey() {
+		RetryContext directContext = new RetryContextSupport(null);
+		Object mockProxy = new Object();
+		RetrySynchronizationManager.register(directContext);
+		directContext.setAttribute("___proxy___", mockProxy);
+		RetryContext retrievedContext = RetrySynchronizationManager.getContext();
+		retrievedContext.removeAttribute("__proxy__");
+		Object remainingProxy = RetrySynchronizationManager.getContext().getAttribute("___proxy___");
+		assertThat(remainingProxy).isNotNull();
+		assertThat(remainingProxy).isSameAs(mockProxy);
+		RetrySynchronizationManager.clear();
+	}
+
+	@Test
+	public void testProxyAttributeCleanupEvenWhenIllegalStateExceptionThrown() {
+		RetryContext context = new RetryContextSupport(null);
+		Object mockProxy = new Object();
+		RetrySynchronizationManager.register(context);
+		context.setAttribute("___proxy___", mockProxy);
+		assertThat(context.getAttribute("___proxy___")).isNotNull();
+		assertThatIllegalStateException().isThrownBy(() -> this.interceptor.invoke(new MethodInvocation() {
+			@Override
+			public Method getMethod() {
+				return ClassUtils.getMethod(RetryOperationsInterceptorTests.class,
+						"testProxyAttributeCleanupEvenWhenIllegalStateExceptionThrown");
+			}
+
+			@Override
+			public Object[] getArguments() {
+				return new Object[0];
+			}
+
+			@Override
+			public Object proceed() {
+				return null;
+			}
+
+			@Override
+			public Object getThis() {
+				return new Object();
+			}
+
+			@Override
+			public AccessibleObject getStaticPart() {
+				return null;
+			}
+		})).withMessageContaining("MethodInvocation");
+		assertThat(context.getAttribute("___proxy___")).isNull();
+		RetrySynchronizationManager.clear();
+	}
+
 	public static interface Service {
 
 		void service() throws Exception;