Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve structure and naming of ProxyExceptionHandlingTests

Browse Source 
Closes gh-33797
This commit is contained in:
Sam Brannen
2024-10-25 16:13:52 +02:00
parent f19a1b50e5
commit 52e813d0ad
3 changed files with 100 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
spring-aop/src/test/java/org/springframework/aop/framework/ProxyExceptionHandlingTests.java → spring-aop/src/test/java/org/springframework/aop/framework/AbstractProxyExceptionHandlingTests.java
View File

@@ -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.junit.jupiter.api.Test;
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,45 +63,24 @@ abstract class ProxyExceptionHandlingTests {
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;
@@ -110,13 +88,13 @@ abstract class ProxyExceptionHandlingTests {
@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,7 +104,7 @@ abstract class ProxyExceptionHandlingTests {
@Test
void targetThrowsDeclaredCheckedException() throws DeclaredCheckedException {
doThrow(declaredCheckedException).when(target).doSomething();
willThrow(declaredCheckedException).given(target).doSomething();
invokeProxy();
assertThat(throwableSeenByInterceptor).isSameAs(declaredCheckedException);
assertThat(throwableSeenByCaller).isSameAs(declaredCheckedException);
@@ -134,7 +112,7 @@ abstract class ProxyExceptionHandlingTests {
@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 @@ abstract class ProxyExceptionHandlingTests {
@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 @@ abstract class ProxyExceptionHandlingTests {
@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 @@ abstract class ProxyExceptionHandlingTests {
}
@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 {
}
}

42
spring-aop/src/test/java/org/springframework/aop/framework/CglibProxyExceptionHandlingTests.java Normal file
View File

@@ -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();
}
}

35
spring-aop/src/test/java/org/springframework/aop/framework/JdkProxyExceptionHandlingTests.java Normal file
View File

@@ -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();
}
}