You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/05/23 12:24:54 UTC
[commons-pool] branch master updated: Remove unused exceptions from tests.
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
The following commit(s) were added to refs/heads/master by this push:
new ec083399 Remove unused exceptions from tests.
ec083399 is described below
commit ec083399442c012232b0f1c828e57d66bce2aa68
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon May 23 08:24:48 2022 -0400
Remove unused exceptions from tests.
---
.../org/apache/commons/pool2/ObjectPoolIssue326.java | 5 +++--
src/test/java/org/apache/commons/pool2/PoolTest.java | 2 +-
.../org/apache/commons/pool2/TestBaseObjectPool.java | 14 +++++++-------
.../org/apache/commons/pool2/TestKeyedObjectPool.java | 16 ++++++++--------
.../java/org/apache/commons/pool2/TestPoolUtils.java | 4 ++--
.../commons/pool2/impl/TestAbandonedKeyedObjectPool.java | 4 ++--
.../commons/pool2/performance/PerformanceTest.java | 4 ++--
.../pool2/proxy/BaseTestProxiedKeyedObjectPool.java | 10 +++++-----
.../commons/pool2/proxy/BaseTestProxiedObjectPool.java | 10 +++++-----
9 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java b/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java
index 9123eaa6..f6ba49d0 100644
--- a/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java
+++ b/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
@@ -69,7 +70,7 @@ public final class ObjectPoolIssue326 {
}
@Override
- public Object call() throws Exception {
+ public Object call() throws E {
try {
final Object value;
value = m_pool.borrowObject(m_key);
@@ -107,7 +108,7 @@ public final class ObjectPoolIssue326 {
return tasks;
}
- private void run() throws Exception {
+ private void run() throws InterruptedException, ExecutionException {
final GenericKeyedObjectPoolConfig<Object> poolConfig = new GenericKeyedObjectPoolConfig<>();
poolConfig.setMaxTotal(10);
poolConfig.setMaxTotalPerKey(5);
diff --git a/src/test/java/org/apache/commons/pool2/PoolTest.java b/src/test/java/org/apache/commons/pool2/PoolTest.java
index 6dac8a13..9aa8a6bf 100644
--- a/src/test/java/org/apache/commons/pool2/PoolTest.java
+++ b/src/test/java/org/apache/commons/pool2/PoolTest.java
@@ -71,7 +71,7 @@ public class PoolTest {
private static final long EVICTION_PERIOD_IN_MILLIS = 100;
@Test
- public void testPool() throws Exception {
+ public void testPool() {
final GenericObjectPoolConfig<Foo> poolConfig = new GenericObjectPoolConfig<>();
poolConfig.setTestWhileIdle(true /* testWhileIdle */);
final PooledFooFactory pooledFooFactory = new PooledFooFactory();
diff --git a/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java b/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
index edb4da2e..fb20afda 100644
--- a/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
@@ -91,7 +91,7 @@ public class TestBaseObjectPool extends TestObjectPool {
}
@Test
- public void testBaseAddObject() throws Exception {
+ public void testBaseAddObject() {
try {
pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException e) {
@@ -118,7 +118,7 @@ public class TestBaseObjectPool extends TestObjectPool {
}
@Test
- public void testBaseBorrow() throws Exception {
+ public void testBaseBorrow() {
try {
pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException e) {
@@ -131,7 +131,7 @@ public class TestBaseObjectPool extends TestObjectPool {
}
@Test
- public void testBaseBorrowReturn() throws Exception {
+ public void testBaseBorrowReturn() {
try {
pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException e) {
@@ -170,7 +170,7 @@ public class TestBaseObjectPool extends TestObjectPool {
}
@Test
- public void testBaseClear() throws Exception {
+ public void testBaseClear() {
try {
pool = makeEmptyPool(3);
} catch (final UnsupportedOperationException e) {
@@ -195,7 +195,7 @@ public class TestBaseObjectPool extends TestObjectPool {
}
@Test
- public void testBaseClosePool() throws Exception {
+ public void testBaseClosePool() {
try {
pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException e) {
@@ -209,7 +209,7 @@ public class TestBaseObjectPool extends TestObjectPool {
}
@Test
- public void testBaseInvalidateObject() throws Exception {
+ public void testBaseInvalidateObject() {
try {
pool = makeEmptyPool(3);
} catch (final UnsupportedOperationException e) {
@@ -231,7 +231,7 @@ public class TestBaseObjectPool extends TestObjectPool {
}
@Test
- public void testBaseNumActiveNumIdle() throws Exception {
+ public void testBaseNumActiveNumIdle() {
try {
pool = makeEmptyPool(3);
} catch (final UnsupportedOperationException e) {
diff --git a/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java b/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
index 468ba103..7f558fb5 100644
--- a/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
@@ -240,7 +240,7 @@ public abstract class TestKeyedObjectPool {
}
@Test
- public void testBaseAddObject() throws Exception {
+ public void testBaseAddObject() {
try {
pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException uoe) {
@@ -276,7 +276,7 @@ public abstract class TestKeyedObjectPool {
}
@Test
- public void testBaseBorrow() throws Exception {
+ public void testBaseBorrow() {
try {
pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException uoe) {
@@ -294,7 +294,7 @@ public abstract class TestKeyedObjectPool {
}
@Test
- public void testBaseBorrowReturn() throws Exception {
+ public void testBaseBorrowReturn() {
try {
pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException uoe) {
@@ -333,7 +333,7 @@ public abstract class TestKeyedObjectPool {
}
@Test
- public void testBaseClear() throws Exception {
+ public void testBaseClear() {
try {
pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException uoe) {
@@ -359,7 +359,7 @@ public abstract class TestKeyedObjectPool {
}
@Test
- public void testBaseInvalidateObject() throws Exception {
+ public void testBaseInvalidateObject() {
try {
pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException uoe) {
@@ -382,7 +382,7 @@ public abstract class TestKeyedObjectPool {
}
@Test
- public void testBaseNumActiveNumIdle() throws Exception {
+ public void testBaseNumActiveNumIdle() {
try {
pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException uoe) {
@@ -411,7 +411,7 @@ public abstract class TestKeyedObjectPool {
}
@Test
- public void testBaseNumActiveNumIdle2() throws Exception {
+ public void testBaseNumActiveNumIdle2() {
try {
pool = makeEmptyPool(6);
} catch(final UnsupportedOperationException uoe) {
@@ -667,7 +667,7 @@ public abstract class TestKeyedObjectPool {
}
@Test
- public void testKPOFInvalidateObjectUsages() throws Exception {
+ public void testKPOFInvalidateObjectUsages() throws InterruptedException {
final FailingKeyedPooledObjectFactory factory = new FailingKeyedPooledObjectFactory();
final KeyedObjectPool<Object, Object, PrivateException> pool;
try {
diff --git a/src/test/java/org/apache/commons/pool2/TestPoolUtils.java b/src/test/java/org/apache/commons/pool2/TestPoolUtils.java
index 8478e886..e7a801f2 100644
--- a/src/test/java/org/apache/commons/pool2/TestPoolUtils.java
+++ b/src/test/java/org/apache/commons/pool2/TestPoolUtils.java
@@ -157,7 +157,7 @@ public class TestPoolUtils {
}
@Test
- public void testCheckMinIdleKeyedObjectPool() throws Exception {
+ public void testCheckMinIdleKeyedObjectPool() throws InterruptedException {
assertThrows(IllegalArgumentException.class, () -> PoolUtils.checkMinIdle(null, new Object(), 1, 1),
"PoolUtils.checkMinIdle(KeyedObjectPool,Object,int,long) must not allow null pool.");
try (@SuppressWarnings("unchecked")
@@ -552,7 +552,7 @@ public class TestPoolUtils {
}
@Test
- public void testErodingPoolObjectPool() throws Exception {
+ public void testErodingPoolObjectPool() throws InterruptedException {
assertThrows(IllegalArgumentException.class, () -> PoolUtils.erodingPool((ObjectPool<Object, RuntimeException>) null),
"PoolUtils.erodingPool(ObjectPool) must not allow a null pool.");
diff --git a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedKeyedObjectPool.java b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedKeyedObjectPool.java
index 3c2f23d8..9f85c6dc 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedKeyedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedKeyedObjectPool.java
@@ -190,10 +190,10 @@ public class TestAbandonedKeyedObjectPool {
* Verify that an object that gets flagged as abandoned and is subsequently
* invalidated is only destroyed (and pool counter decremented) once.
*
- * @throws Exception May occur in some failure modes
+ * @throws InterruptedException May occur in some failure modes
*/
@Test
- public void testAbandonedInvalidate() throws Exception {
+ public void testAbandonedInvalidate() throws InterruptedException {
abandonedConfig = new AbandonedConfig();
abandonedConfig.setRemoveAbandonedOnMaintenance(true);
abandonedConfig.setRemoveAbandonedTimeout(TestConstants.ONE_SECOND_DURATION);
diff --git a/src/test/java/org/apache/commons/pool2/performance/PerformanceTest.java b/src/test/java/org/apache/commons/pool2/performance/PerformanceTest.java
index 03eb38f0..0fddf1dd 100644
--- a/src/test/java/org/apache/commons/pool2/performance/PerformanceTest.java
+++ b/src/test/java/org/apache/commons/pool2/performance/PerformanceTest.java
@@ -29,16 +29,16 @@ import org.apache.commons.pool2.impl.GenericObjectPool;
/**
* Multi-thread performance test
- *
*/
public class PerformanceTest {
+
class PerfTask implements Callable<TaskStats> {
final TaskStats taskStats = new TaskStats();
long borrowTimeMillis;
long returnTimeMillis;
@Override
- public TaskStats call() throws Exception {
+ public TaskStats call() {
runOnce(); // warmup
for (int i = 0; i < nrIterations; i++) {
runOnce();
diff --git a/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java b/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
index 7c64922b..4ff3f7c2 100644
--- a/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
@@ -113,7 +113,7 @@ public abstract class BaseTestProxiedKeyedObjectPool {
@Test
- public void testAccessAfterInvalidate() throws Exception {
+ public void testAccessAfterInvalidate() {
final TestObject obj = pool.borrowObject(KEY1);
assertNotNull(obj);
@@ -132,7 +132,7 @@ public abstract class BaseTestProxiedKeyedObjectPool {
@Test
- public void testAccessAfterReturn() throws Exception {
+ public void testAccessAfterReturn() {
final TestObject obj = pool.borrowObject(KEY1);
assertNotNull(obj);
@@ -148,7 +148,7 @@ public abstract class BaseTestProxiedKeyedObjectPool {
}
@Test
- public void testBorrowObject() throws Exception {
+ public void testBorrowObject() {
final TestObject obj = pool.borrowObject(KEY1);
assertNotNull(obj);
@@ -161,7 +161,7 @@ public abstract class BaseTestProxiedKeyedObjectPool {
@Test
- public void testPassThroughMethods01() throws Exception {
+ public void testPassThroughMethods01() {
assertEquals(0, pool.getNumActive());
assertEquals(0, pool.getNumIdle());
@@ -185,7 +185,7 @@ public abstract class BaseTestProxiedKeyedObjectPool {
}
@Test
- public void testUsageTracking() throws Exception {
+ public void testUsageTracking() throws InterruptedException {
final TestObject obj = pool.borrowObject(KEY1);
assertNotNull(obj);
diff --git a/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java b/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java
index d560fe07..cfdf886d 100644
--- a/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java
@@ -108,7 +108,7 @@ public abstract class BaseTestProxiedObjectPool {
@Test
- public void testAccessAfterInvalidate() throws Exception {
+ public void testAccessAfterInvalidate() {
final TestObject obj = pool.borrowObject();
assertNotNull(obj);
@@ -127,7 +127,7 @@ public abstract class BaseTestProxiedObjectPool {
@Test
- public void testAccessAfterReturn() throws Exception {
+ public void testAccessAfterReturn() {
final TestObject obj = pool.borrowObject();
assertNotNull(obj);
@@ -145,7 +145,7 @@ public abstract class BaseTestProxiedObjectPool {
@Test
- public void testBorrowObject() throws Exception {
+ public void testBorrowObject() {
final TestObject obj = pool.borrowObject();
assertNotNull(obj);
@@ -157,7 +157,7 @@ public abstract class BaseTestProxiedObjectPool {
}
@Test
- public void testPassThroughMethods01() throws Exception {
+ public void testPassThroughMethods01() {
assertEquals(0, pool.getNumActive());
assertEquals(0, pool.getNumIdle());
@@ -183,7 +183,7 @@ public abstract class BaseTestProxiedObjectPool {
@Test
- public void testUsageTracking() throws Exception {
+ public void testUsageTracking() throws InterruptedException {
final TestObject obj = pool.borrowObject();
assertNotNull(obj);