From 64d289abc738386b0cc05a6080098b186ae85999 Mon Sep 17 00:00:00 2001
From: "Bao.Ngo" <bao.ngo@aeris.net>
Date: Wed, 27 Nov 2024 21:12:41 +0700
Subject: [PATCH] Add Unit Test for fixing wrong return type when invoking
 Async-annotated on interface

---
 .../AsyncExecutionInterceptor.java            |  1 +
 .../AsyncExecutionInterceptorTests.java       | 74 +++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 spring-aop/src/test/java/org/springframework/aop/interceptor/AsyncExecutionInterceptorTests.java

diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java
index 7ea44b90e6cf..a17ed63fe8fa 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java
@@ -61,6 +61,7 @@
  * @author Juergen Hoeller
  * @author Chris Beams
  * @author Stephane Nicoll
+ * @author Bao Ngo
  * @since 3.0
  * @see org.springframework.scheduling.annotation.Async
  * @see org.springframework.scheduling.annotation.AsyncAnnotationAdvisor
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/AsyncExecutionInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/AsyncExecutionInterceptorTests.java
new file mode 100644
index 000000000000..1bb59e41865e
--- /dev/null
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/AsyncExecutionInterceptorTests.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2002-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.aop.interceptor;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
+
+import org.aopalliance.intercept.MethodInvocation;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import org.springframework.core.task.AsyncTaskExecutor;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+
+/**
+ * Tests for {@link AsyncExecutionInterceptor}.
+ *
+ * @author Bao Ngo
+ * @since 7.0
+ */
+class AsyncExecutionInterceptorTests {
+
+	@Test
+	public void testInvokeOnInterface() throws Throwable {
+		AsyncExecutionInterceptor interceptor = spy( new AsyncExecutionInterceptor( null ) );
+		Impl impl = new Impl();
+		ArgumentCaptor<Class<?>> classArgumentCaptor = ArgumentCaptor.forClass( Class.class );
+		MethodInvocation mi = mock();
+		given( mi.getThis() ).willReturn( impl );
+		given( mi.getMethod() ).willReturn( I.class.getMethod( "doSomeThing" ) );
+		interceptor.invoke( mi );
+		verify( interceptor ).doSubmit(
+				any( Callable.class ),
+				any( AsyncTaskExecutor.class ),
+				classArgumentCaptor.capture()
+		);
+		assertThat( classArgumentCaptor.getValue() ).isEqualTo( Future.class );
+	}
+
+
+	private interface I<O> {
+		O doSomeThing();
+	}
+
+	private static final class Impl implements I<Future<Void>> {
+		@Override
+		public Future<Void> doSomeThing() {
+			return CompletableFuture.runAsync( () -> {
+			} );
+		}
+	}
+}