This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-pool.git
commit d6da62d97736297a9045ec08d5c93e01c2d26581
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue Jun 10 09:42:37 2025 -0400
Sort members
---
.../pool3/proxy/AbstractTestProxiedObjectPool.java | 48 +++++++++++-----------
.../proxy/TestProxiedObjectPoolWithCglibProxy.java | 10 ++---
.../proxy/TestProxiedObjectPoolWithJdkProxy.java | 10 ++---
3 files changed, 34 insertions(+), 34 deletions(-)
diff --git
a/src/test/java/org/apache/commons/pool3/proxy/AbstractTestProxiedObjectPool.java
b/src/test/java/org/apache/commons/pool3/proxy/AbstractTestProxiedObjectPool.java
index 10e3cf2d..37cc25df 100644
---
a/src/test/java/org/apache/commons/pool3/proxy/AbstractTestProxiedObjectPool.java
+++
b/src/test/java/org/apache/commons/pool3/proxy/AbstractTestProxiedObjectPool.java
@@ -38,6 +38,8 @@ import org.junit.jupiter.api.Test;
public abstract class AbstractTestProxiedObjectPool {
+ private static class MyException extends RuntimeException { }
+
protected interface TestObject {
String getData();
void setData(String data);
@@ -94,8 +96,6 @@ public abstract class AbstractTestProxiedObjectPool {
private StringWriter log;
- protected abstract ProxySource<TestObject> getProxySource(boolean
unwrapInvocationTargetException);
-
private ProxiedObjectPool<TestObject, RuntimeException>
createProxiedObjectPool() {
return createProxiedObjectPool(false, null);
}
@@ -120,6 +120,10 @@ public abstract class AbstractTestProxiedObjectPool {
return new ProxiedObjectPool<>(innerPool,
getProxySource(unwrapInvocationTargetException));
}
+ protected abstract Class<? extends Throwable>
getInvocationTargetExceptionType();
+
+ protected abstract ProxySource<TestObject> getProxySource(boolean
unwrapInvocationTargetException);
+
@BeforeEach
public void setUp() {
log = new StringWriter();
@@ -210,6 +214,24 @@ public abstract class AbstractTestProxiedObjectPool {
() -> pool.addObject());
}
+ @Test
+ public void testUnwrapInvocationTargetExceptionFalse() {
+ @SuppressWarnings("resource")
+ final ObjectPool<TestObject, RuntimeException> pool =
createProxiedObjectPool(false, new MyException());
+
+ final TestObject object = pool.borrowObject();
+ assertThrows(getInvocationTargetExceptionType(), object::getData);
+ }
+
+ @Test
+ public void testUnwrapInvocationTargetExceptionTrue() {
+ @SuppressWarnings("resource")
+ final ObjectPool<TestObject, RuntimeException> pool =
createProxiedObjectPool(true, new MyException());
+
+ final TestObject object = pool.borrowObject();
+ assertThrows(MyException.class, object::getData);
+ }
+
@Test
public void testUsageTracking() throws InterruptedException {
@SuppressWarnings("resource")
@@ -232,26 +254,4 @@ public abstract class AbstractTestProxiedObjectPool {
assertTrue(logOutput.contains("Pooled object created"));
assertTrue(logOutput.contains("The last code to use this object was"));
}
-
- @Test
- public void testUnwrapInvocationTargetExceptionTrue() {
- @SuppressWarnings("resource")
- final ObjectPool<TestObject, RuntimeException> pool =
createProxiedObjectPool(true, new MyException());
-
- final TestObject object = pool.borrowObject();
- assertThrows(MyException.class, object::getData);
- }
-
- @Test
- public void testUnwrapInvocationTargetExceptionFalse() {
- @SuppressWarnings("resource")
- final ObjectPool<TestObject, RuntimeException> pool =
createProxiedObjectPool(false, new MyException());
-
- final TestObject object = pool.borrowObject();
- assertThrows(getInvocationTargetExceptionType(), object::getData);
- }
-
- protected abstract Class<? extends Throwable>
getInvocationTargetExceptionType();
-
- private static class MyException extends RuntimeException { }
}
diff --git
a/src/test/java/org/apache/commons/pool3/proxy/TestProxiedObjectPoolWithCglibProxy.java
b/src/test/java/org/apache/commons/pool3/proxy/TestProxiedObjectPoolWithCglibProxy.java
index c7914918..3b0f6781 100644
---
a/src/test/java/org/apache/commons/pool3/proxy/TestProxiedObjectPoolWithCglibProxy.java
+++
b/src/test/java/org/apache/commons/pool3/proxy/TestProxiedObjectPoolWithCglibProxy.java
@@ -21,6 +21,11 @@ import java.lang.reflect.InvocationTargetException;
public class TestProxiedObjectPoolWithCglibProxy extends
AbstractTestProxiedObjectPool {
+ @Override
+ protected Class<? extends Throwable> getInvocationTargetExceptionType() {
+ return InvocationTargetException.class;
+ }
+
@Override
protected ProxySource<TestObject> getProxySource(boolean
unwrapInvocationTargetException) {
// @formatter:off
@@ -30,9 +35,4 @@ public class TestProxiedObjectPoolWithCglibProxy extends
AbstractTestProxiedObje
.get();
// @formatter:on
}
-
- @Override
- protected Class<? extends Throwable> getInvocationTargetExceptionType() {
- return InvocationTargetException.class;
- }
}
diff --git
a/src/test/java/org/apache/commons/pool3/proxy/TestProxiedObjectPoolWithJdkProxy.java
b/src/test/java/org/apache/commons/pool3/proxy/TestProxiedObjectPoolWithJdkProxy.java
index becd2418..b9b57c06 100644
---
a/src/test/java/org/apache/commons/pool3/proxy/TestProxiedObjectPoolWithJdkProxy.java
+++
b/src/test/java/org/apache/commons/pool3/proxy/TestProxiedObjectPoolWithJdkProxy.java
@@ -21,6 +21,11 @@ import java.lang.reflect.UndeclaredThrowableException;
public class TestProxiedObjectPoolWithJdkProxy extends
AbstractTestProxiedObjectPool {
+ @Override
+ protected Class<? extends Throwable> getInvocationTargetExceptionType() {
+ return UndeclaredThrowableException.class;
+ }
+
@Override
protected ProxySource<TestObject> getProxySource(boolean
unwrapInvocationTargetException) {
// @formatter:off
@@ -31,9 +36,4 @@ public class TestProxiedObjectPoolWithJdkProxy extends
AbstractTestProxiedObject
.get();
// @formatter:on
}
-
- @Override
- protected Class<? extends Throwable> getInvocationTargetExceptionType() {
- return UndeclaredThrowableException.class;
- }
}
