Improve structure and naming of ProxyExceptionHandlingTests

Closes gh-33797

Author: sbrannen

…amework/ProxyExceptionHandlingTests.java …AbstractProxyExceptionHandlingTests.javaspring-aop/src/test/java/org/springframework/aop/framework/ProxyExceptionHandlingTests.java renamed to spring-aop/src/test/java/org/springframework/aop/framework/AbstractProxyExceptionHandlingTests.java spring-aop/src/test/java/org/springframework/aop/framework/ProxyExceptionHandlingTests.java renamed to spring-aop/src/test/java/org/springframework/aop/framework/AbstractProxyExceptionHandlingTests.java

@@ -16,7 +16,6 @@
 
 package org.springframework.aop.framework;
 
-import java.lang.reflect.Proxy;
 import java.lang.reflect.UndeclaredThrowableException;
 import java.util.Objects;
 
@@ -27,20 +26,22 @@
 import org.mockito.Mockito;
 import org.mockito.stubbing.Answer;
 
-import org.springframework.cglib.proxy.Enhancer;
 import org.springframework.lang.Nullable;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
-import static org.mockito.BDDMockito.doAnswer;
-import static org.mockito.BDDMockito.doThrow;
-import static org.mockito.BDDMockito.mock;
+import static org.mockito.BDDMockito.willAnswer;
+import static org.mockito.BDDMockito.willThrow;
+import static org.mockito.Mockito.mock;
 
 /**
  * @author Mikaël Francoeur
+ * @author Sam Brannen
  * @since 6.2
+ * @see JdkProxyExceptionHandlingTests
+ * @see CglibProxyExceptionHandlingTests
  */
-abstract class ProxyExceptionHandlingTests {
+abstract class AbstractProxyExceptionHandlingTests {
 
 	private static final RuntimeException uncheckedException = new RuntimeException();
 
@@ -52,10 +53,8 @@ abstract class ProxyExceptionHandlingTests {
 
 	protected final ProxyFactory proxyFactory = new ProxyFactory(target);
 
-	@Nullable
 	protected MyInterface proxy;
 
-	@Nullable
 	private Throwable throwableSeenByCaller;
 
 
@@ -64,59 +63,38 @@ void clear() {
 		Mockito.clearInvocations(target);
 	}
 
+
 	protected abstract void assertProxyType(Object proxy);
 
+
 	private void invokeProxy() {
 		throwableSeenByCaller = catchThrowable(() -> Objects.requireNonNull(proxy).doSomething());
 	}
 
 	@SuppressWarnings("SameParameterValue")
-	private Answer<?> sneakyThrow(Throwable throwable) {
+	private static Answer<?> sneakyThrow(Throwable throwable) {
 		return invocation -> {
 			throw throwable;
 		};
 	}
 
 
-	static class JdkAopProxyTests extends ProxyExceptionHandlingTests {
-
-		@Override
-		protected void assertProxyType(Object proxy) {
-			assertThat(Proxy.isProxyClass(proxy.getClass())).isTrue();
-		}
-	}
-
-
-	static class CglibAopProxyTests extends ProxyExceptionHandlingTests {
-
-		@BeforeEach
-		void setup() {
-			proxyFactory.setProxyTargetClass(true);
-		}
-
-		@Override
-		protected void assertProxyType(Object proxy) {
-			assertThat(Enhancer.isEnhanced(proxy.getClass())).isTrue();
-		}
-	}
-
-
 	@Nested
-	class WhenThereIsOneInterceptor {
+	class WhenThereIsOneInterceptorTests {
 
 		@Nullable
 		private Throwable throwableSeenByInterceptor;
 
 		@BeforeEach
 		void beforeEach() {
 			proxyFactory.addAdvice(captureThrowable());
-			proxy = (MyInterface) proxyFactory.getProxy(ProxyExceptionHandlingTests.class.getClassLoader());
+			proxy = (MyInterface) proxyFactory.getProxy(getClass().getClassLoader());
 			assertProxyType(proxy);
 		}
 
 		@Test
 		void targetThrowsUndeclaredCheckedException() throws DeclaredCheckedException {
-			doAnswer(sneakyThrow(undeclaredCheckedException)).when(target).doSomething();
+			willAnswer(sneakyThrow(undeclaredCheckedException)).given(target).doSomething();
 			invokeProxy();
 			assertThat(throwableSeenByInterceptor).isSameAs(undeclaredCheckedException);
 			assertThat(throwableSeenByCaller)
@@ -126,15 +104,15 @@ void targetThrowsUndeclaredCheckedException() throws DeclaredCheckedException {
 
 		@Test
 		void targetThrowsDeclaredCheckedException() throws DeclaredCheckedException {
-			doThrow(declaredCheckedException).when(target).doSomething();
+			willThrow(declaredCheckedException).given(target).doSomething();
 			invokeProxy();
 			assertThat(throwableSeenByInterceptor).isSameAs(declaredCheckedException);
 			assertThat(throwableSeenByCaller).isSameAs(declaredCheckedException);
 		}
 
 		@Test
 		void targetThrowsUncheckedException() throws DeclaredCheckedException {
-			doThrow(uncheckedException).when(target).doSomething();
+			willThrow(uncheckedException).given(target).doSomething();
 			invokeProxy();
 			assertThat(throwableSeenByInterceptor).isSameAs(uncheckedException);
 			assertThat(throwableSeenByCaller).isSameAs(uncheckedException);
@@ -155,17 +133,17 @@ private MethodInterceptor captureThrowable() {
 
 
 	@Nested
-	class WhenThereAreNoInterceptors {
+	class WhenThereAreNoInterceptorsTests {
 
 		@BeforeEach
 		void beforeEach() {
-			proxy = (MyInterface) proxyFactory.getProxy(ProxyExceptionHandlingTests.class.getClassLoader());
+			proxy = (MyInterface) proxyFactory.getProxy(getClass().getClassLoader());
 			assertProxyType(proxy);
 		}
 
 		@Test
 		void targetThrowsUndeclaredCheckedException() throws DeclaredCheckedException {
-			doAnswer(sneakyThrow(undeclaredCheckedException)).when(target).doSomething();
+			willAnswer(sneakyThrow(undeclaredCheckedException)).given(target).doSomething();
 			invokeProxy();
 			assertThat(throwableSeenByCaller)
 					.isInstanceOf(UndeclaredThrowableException.class)
@@ -174,21 +152,21 @@ void targetThrowsUndeclaredCheckedException() throws DeclaredCheckedException {
 
 		@Test
 		void targetThrowsDeclaredCheckedException() throws DeclaredCheckedException {
-			doThrow(declaredCheckedException).when(target).doSomething();
+			willThrow(declaredCheckedException).given(target).doSomething();
 			invokeProxy();
 			assertThat(throwableSeenByCaller).isSameAs(declaredCheckedException);
 		}
 
 		@Test
 		void targetThrowsUncheckedException() throws DeclaredCheckedException {
-			doThrow(uncheckedException).when(target).doSomething();
+			willThrow(uncheckedException).given(target).doSomething();
 			invokeProxy();
 			assertThat(throwableSeenByCaller).isSameAs(uncheckedException);
 		}
 	}
 
 
-	protected interface MyInterface {
+	interface MyInterface {
 
 		void doSomething() throws DeclaredCheckedException;
 	}
@@ -202,11 +180,11 @@ public void doSomething() throws DeclaredCheckedException {
 	}
 
 	@SuppressWarnings("serial")
-	protected static class UndeclaredCheckedException extends Exception {
+	private static class UndeclaredCheckedException extends Exception {
 	}
 
 	@SuppressWarnings("serial")
-	protected static class DeclaredCheckedException extends Exception {
+	private static class DeclaredCheckedException extends Exception {
 	}
 
 }

spring-aop/src/test/java/org/springframework/aop/framework/CglibProxyExceptionHandlingTests.java

@@ -0,0 +1,42 @@
+/*
+ * 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.framework;
+
+import org.junit.jupiter.api.BeforeEach;
+
+import org.springframework.cglib.proxy.Enhancer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Mikaël Francoeur
+ * @since 6.2
+ * @see JdkProxyExceptionHandlingTests
+ */
+class CglibProxyExceptionHandlingTests extends AbstractProxyExceptionHandlingTests {
+
+	@BeforeEach
+	void setup() {
+		proxyFactory.setProxyTargetClass(true);
+	}
+
+	@Override
+	protected void assertProxyType(Object proxy) {
+		assertThat(Enhancer.isEnhanced(proxy.getClass())).isTrue();
+	}
+
+}

spring-aop/src/test/java/org/springframework/aop/framework/JdkProxyExceptionHandlingTests.java

@@ -0,0 +1,35 @@
+/*
+ * 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.framework;
+
+import java.lang.reflect.Proxy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Mikaël Francoeur
+ * @since 6.2
+ * @see CglibProxyExceptionHandlingTests
+ */
+class JdkProxyExceptionHandlingTests extends AbstractProxyExceptionHandlingTests {
+
+	@Override
+	protected void assertProxyType(Object proxy) {
+		assertThat(Proxy.isProxyClass(proxy.getClass())).isTrue();
+	}
+
+}