From feb682c4a35389818f50b85285a8d59ed59d97e4 Mon Sep 17 00:00:00 2001 From: Chris Vest Date: Sat, 6 Jul 2024 09:59:23 -0700 Subject: [PATCH] Move non-tests out of the stormpot test package The `stormpot` test package now only contain tests that rely on implementation details. --- src/test/java/blackbox/AbstractPoolTest.java | 24 +++--- .../java/blackbox/AllocatorBasedPoolTest.java | 78 +++++++++---------- src/test/java/blackbox/DefaultPoolTest.java | 4 +- src/test/java/blackbox/ExpirationTest.java | 10 +-- src/test/java/blackbox/InlinePoolTest.java | 4 +- src/test/java/blackbox/PoolBuilderTest.java | 14 ++-- .../java/blackbox/ThreadBasedPoolTest.java | 54 ++++++------- src/test/java/blackbox/ThreadedPoolTest.java | 4 +- src/test/java/blackbox/simulations/Sim.java | 10 +-- .../simulations/TimeSpreadExpirationSim.java | 2 +- .../java/blackbox/slow/DefaultPoolIT.java | 4 +- src/test/java/blackbox/slow/InlinePoolIT.java | 4 +- src/test/java/blackbox/slow/PoolIT.java | 26 +++---- .../java/blackbox/slow/ThreadBasedPoolIT.java | 24 +++--- .../java/blackbox/slow/ThreadedPoolIT.java | 4 +- .../ThreadLocalWeakRefTest.java | 2 +- .../PoolBuilderReallocatingAdaptorTest.java | 22 +++--- .../stormpot/ReallocatingAdaptorTest.java | 10 ++- src/test/java/stormpot/RefillPileTest.java | 1 + .../stormpot/WhiteboxPoolBuilderTest.java | 2 + .../java/{stormpot => testkits}/AlloKit.java | 6 +- .../ExpectedException.java | 2 +- .../{stormpot => testkits}/ExpireKit.java | 6 +- .../FixedMeanMetricsRecorder.java | 4 +- .../GenericPoolable.java | 5 +- .../LastSampleMetricsRecorder.java | 4 +- .../java/{stormpot => testkits}/NullSlot.java | 5 +- .../{stormpot => testkits}/SlotInfoStub.java | 4 +- .../SomeRandomException.java | 4 +- .../SomeRandomThrowable.java | 2 +- .../java/{stormpot => testkits}/UnitKit.java | 13 +++- 31 files changed, 197 insertions(+), 161 deletions(-) rename src/test/java/{stormpot => examples}/ThreadLocalWeakRefTest.java (99%) rename src/test/java/{stormpot => testkits}/AlloKit.java (98%) rename src/test/java/{stormpot => testkits}/ExpectedException.java (97%) rename src/test/java/{stormpot => testkits}/ExpireKit.java (97%) rename src/test/java/{stormpot => testkits}/FixedMeanMetricsRecorder.java (98%) rename src/test/java/{stormpot => testkits}/GenericPoolable.java (93%) rename src/test/java/{stormpot => testkits}/LastSampleMetricsRecorder.java (98%) rename src/test/java/{stormpot => testkits}/NullSlot.java (92%) rename src/test/java/{stormpot => testkits}/SlotInfoStub.java (96%) rename src/test/java/{stormpot => testkits}/SomeRandomException.java (92%) rename src/test/java/{stormpot => testkits}/SomeRandomThrowable.java (97%) rename src/test/java/{stormpot => testkits}/UnitKit.java (96%) diff --git a/src/test/java/blackbox/AbstractPoolTest.java b/src/test/java/blackbox/AbstractPoolTest.java index 5b620e95..7f3b5033 100644 --- a/src/test/java/blackbox/AbstractPoolTest.java +++ b/src/test/java/blackbox/AbstractPoolTest.java @@ -24,7 +24,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; import stormpot.Completion; -import stormpot.ExpectedException; +import testkits.ExpectedException; import stormpot.Expiration; import stormpot.ManagedPool; import stormpot.Pool; @@ -54,17 +54,17 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static stormpot.UnitKit.$await; -import static stormpot.UnitKit.$catchFrom; -import static stormpot.UnitKit.$claim; -import static stormpot.UnitKit.$claimRelease; -import static stormpot.UnitKit.$interruptUponState; -import static stormpot.UnitKit.capture; -import static stormpot.UnitKit.fork; -import static stormpot.UnitKit.forkFuture; -import static stormpot.UnitKit.join; -import static stormpot.UnitKit.spinwait; -import static stormpot.UnitKit.waitForThreadState; +import static testkits.UnitKit.$await; +import static testkits.UnitKit.$catchFrom; +import static testkits.UnitKit.$claim; +import static testkits.UnitKit.$claimRelease; +import static testkits.UnitKit.$interruptUponState; +import static testkits.UnitKit.capture; +import static testkits.UnitKit.fork; +import static testkits.UnitKit.forkFuture; +import static testkits.UnitKit.join; +import static testkits.UnitKit.spinwait; +import static testkits.UnitKit.waitForThreadState; @Execution(ExecutionMode.CONCURRENT) @org.junit.jupiter.api.Timeout(42) diff --git a/src/test/java/blackbox/AllocatorBasedPoolTest.java b/src/test/java/blackbox/AllocatorBasedPoolTest.java index a9083b60..2d77f67f 100644 --- a/src/test/java/blackbox/AllocatorBasedPoolTest.java +++ b/src/test/java/blackbox/AllocatorBasedPoolTest.java @@ -19,13 +19,13 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import stormpot.AlloKit; +import testkits.AlloKit; import stormpot.Allocator; import stormpot.Completion; import stormpot.Expiration; -import stormpot.FixedMeanMetricsRecorder; -import stormpot.GenericPoolable; -import stormpot.LastSampleMetricsRecorder; +import testkits.FixedMeanMetricsRecorder; +import testkits.GenericPoolable; +import testkits.LastSampleMetricsRecorder; import stormpot.ManagedPool; import stormpot.Pool; import stormpot.PoolBuilder; @@ -34,8 +34,8 @@ import stormpot.Poolable; import stormpot.Reallocator; import stormpot.Slot; -import stormpot.SomeRandomException; -import stormpot.SomeRandomThrowable; +import testkits.SomeRandomException; +import testkits.SomeRandomThrowable; import stormpot.Timeout; import java.lang.ref.WeakReference; @@ -60,39 +60,39 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import static stormpot.AlloKit.$countDown; -import static stormpot.AlloKit.$incrementAnd; -import static stormpot.AlloKit.$new; -import static stormpot.AlloKit.$null; -import static stormpot.AlloKit.$observeNull; -import static stormpot.AlloKit.$sleep; -import static stormpot.AlloKit.$sync; -import static stormpot.AlloKit.$throw; -import static stormpot.AlloKit.CountingAllocator; -import static stormpot.AlloKit.alloc; -import static stormpot.AlloKit.allocator; -import static stormpot.AlloKit.dealloc; -import static stormpot.AlloKit.realloc; -import static stormpot.AlloKit.reallocator; -import static stormpot.ExpireKit.$age; -import static stormpot.ExpireKit.$capture; -import static stormpot.ExpireKit.$claimCount; -import static stormpot.ExpireKit.$expired; -import static stormpot.ExpireKit.$expiredIf; -import static stormpot.ExpireKit.$explicitExpire; -import static stormpot.ExpireKit.$fresh; -import static stormpot.ExpireKit.$if; -import static stormpot.ExpireKit.$poolable; -import static stormpot.ExpireKit.$throwExpire; -import static stormpot.ExpireKit.CountingExpiration; -import static stormpot.ExpireKit.expire; -import static stormpot.UnitKit.$delayedReleases; -import static stormpot.UnitKit.claimRelease; -import static stormpot.UnitKit.fork; -import static stormpot.UnitKit.forkFuture; -import static stormpot.UnitKit.join; -import static stormpot.UnitKit.spinwait; -import static stormpot.UnitKit.waitForThreadState; +import static testkits.AlloKit.$countDown; +import static testkits.AlloKit.$incrementAnd; +import static testkits.AlloKit.$new; +import static testkits.AlloKit.$null; +import static testkits.AlloKit.$observeNull; +import static testkits.AlloKit.$sleep; +import static testkits.AlloKit.$sync; +import static testkits.AlloKit.$throw; +import static testkits.AlloKit.CountingAllocator; +import static testkits.AlloKit.alloc; +import static testkits.AlloKit.allocator; +import static testkits.AlloKit.dealloc; +import static testkits.AlloKit.realloc; +import static testkits.AlloKit.reallocator; +import static testkits.ExpireKit.$age; +import static testkits.ExpireKit.$capture; +import static testkits.ExpireKit.$claimCount; +import static testkits.ExpireKit.$expired; +import static testkits.ExpireKit.$expiredIf; +import static testkits.ExpireKit.$explicitExpire; +import static testkits.ExpireKit.$fresh; +import static testkits.ExpireKit.$if; +import static testkits.ExpireKit.$poolable; +import static testkits.ExpireKit.$throwExpire; +import static testkits.ExpireKit.CountingExpiration; +import static testkits.ExpireKit.expire; +import static testkits.UnitKit.$delayedReleases; +import static testkits.UnitKit.claimRelease; +import static testkits.UnitKit.fork; +import static testkits.UnitKit.forkFuture; +import static testkits.UnitKit.join; +import static testkits.UnitKit.spinwait; +import static testkits.UnitKit.waitForThreadState; /** * This is the generic test for Pool implementations. The test ensures that diff --git a/src/test/java/blackbox/DefaultPoolTest.java b/src/test/java/blackbox/DefaultPoolTest.java index ceec97ab..a73fff90 100644 --- a/src/test/java/blackbox/DefaultPoolTest.java +++ b/src/test/java/blackbox/DefaultPoolTest.java @@ -15,8 +15,8 @@ */ package blackbox; -import stormpot.AlloKit; -import stormpot.GenericPoolable; +import testkits.AlloKit; +import testkits.GenericPoolable; import stormpot.Pool; import stormpot.PoolBuilder; diff --git a/src/test/java/blackbox/ExpirationTest.java b/src/test/java/blackbox/ExpirationTest.java index 0d2edd2e..fe2fafc3 100644 --- a/src/test/java/blackbox/ExpirationTest.java +++ b/src/test/java/blackbox/ExpirationTest.java @@ -17,10 +17,10 @@ import org.junit.jupiter.api.Test; import stormpot.Expiration; -import stormpot.GenericPoolable; +import testkits.GenericPoolable; import stormpot.Poolable; import stormpot.SlotInfo; -import stormpot.SlotInfoStub; +import testkits.SlotInfoStub; import java.util.Iterator; import java.util.LinkedList; @@ -36,9 +36,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static stormpot.ExpireKit.$expired; -import static stormpot.ExpireKit.$fresh; -import static stormpot.ExpireKit.expire; +import static testkits.ExpireKit.$expired; +import static testkits.ExpireKit.$fresh; +import static testkits.ExpireKit.expire; class ExpirationTest { @Test diff --git a/src/test/java/blackbox/InlinePoolTest.java b/src/test/java/blackbox/InlinePoolTest.java index e287ea55..95f2637f 100644 --- a/src/test/java/blackbox/InlinePoolTest.java +++ b/src/test/java/blackbox/InlinePoolTest.java @@ -16,8 +16,8 @@ package blackbox; import org.junit.jupiter.api.Test; -import stormpot.AlloKit.CountingAllocator; -import stormpot.GenericPoolable; +import testkits.AlloKit.CountingAllocator; +import testkits.GenericPoolable; import stormpot.Pool; import stormpot.PoolBuilder; diff --git a/src/test/java/blackbox/PoolBuilderTest.java b/src/test/java/blackbox/PoolBuilderTest.java index 5e3041b2..236813f1 100644 --- a/src/test/java/blackbox/PoolBuilderTest.java +++ b/src/test/java/blackbox/PoolBuilderTest.java @@ -17,13 +17,13 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import stormpot.AlloKit; +import testkits.AlloKit; import stormpot.Allocator; import stormpot.Expiration; -import stormpot.ExpireKit; -import stormpot.FixedMeanMetricsRecorder; -import stormpot.GenericPoolable; -import stormpot.LastSampleMetricsRecorder; +import testkits.ExpireKit; +import testkits.FixedMeanMetricsRecorder; +import testkits.GenericPoolable; +import testkits.LastSampleMetricsRecorder; import stormpot.MetricsRecorder; import stormpot.Pool; import stormpot.PoolBuilder; @@ -39,8 +39,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static stormpot.AlloKit.CountingAllocator; -import static stormpot.AlloKit.allocator; +import static testkits.AlloKit.CountingAllocator; +import static testkits.AlloKit.allocator; class PoolBuilderTest { private Allocator allocator; diff --git a/src/test/java/blackbox/ThreadBasedPoolTest.java b/src/test/java/blackbox/ThreadBasedPoolTest.java index 5181e6ca..409c9911 100644 --- a/src/test/java/blackbox/ThreadBasedPoolTest.java +++ b/src/test/java/blackbox/ThreadBasedPoolTest.java @@ -18,9 +18,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import stormpot.ExpireKit; -import stormpot.GenericPoolable; -import stormpot.LastSampleMetricsRecorder; +import testkits.ExpireKit; +import testkits.GenericPoolable; +import testkits.LastSampleMetricsRecorder; import stormpot.ManagedPool; import stormpot.Pool; import stormpot.PoolBuilder; @@ -46,30 +46,30 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import static stormpot.AlloKit.$acquire; -import static stormpot.AlloKit.$countDown; -import static stormpot.AlloKit.$if; -import static stormpot.AlloKit.$new; -import static stormpot.AlloKit.$null; -import static stormpot.AlloKit.$throw; -import static stormpot.AlloKit.Action; -import static stormpot.AlloKit.CountingReallocator; -import static stormpot.AlloKit.alloc; -import static stormpot.AlloKit.allocator; -import static stormpot.AlloKit.realloc; -import static stormpot.AlloKit.reallocator; -import static stormpot.ExpireKit.$countDown; -import static stormpot.ExpireKit.$expired; -import static stormpot.ExpireKit.$expiredIf; -import static stormpot.ExpireKit.$fresh; -import static stormpot.ExpireKit.$throwExpire; -import static stormpot.ExpireKit.CountingExpiration; -import static stormpot.ExpireKit.expire; -import static stormpot.UnitKit.$claim; -import static stormpot.UnitKit.$claimRelease; -import static stormpot.UnitKit.capture; -import static stormpot.UnitKit.forkFuture; -import static stormpot.UnitKit.spinwait; +import static testkits.AlloKit.$acquire; +import static testkits.AlloKit.$countDown; +import static testkits.AlloKit.$if; +import static testkits.AlloKit.$new; +import static testkits.AlloKit.$null; +import static testkits.AlloKit.$throw; +import static testkits.AlloKit.Action; +import static testkits.AlloKit.CountingReallocator; +import static testkits.AlloKit.alloc; +import static testkits.AlloKit.allocator; +import static testkits.AlloKit.realloc; +import static testkits.AlloKit.reallocator; +import static testkits.ExpireKit.$countDown; +import static testkits.ExpireKit.$expired; +import static testkits.ExpireKit.$expiredIf; +import static testkits.ExpireKit.$fresh; +import static testkits.ExpireKit.$throwExpire; +import static testkits.ExpireKit.CountingExpiration; +import static testkits.ExpireKit.expire; +import static testkits.UnitKit.$claim; +import static testkits.UnitKit.$claimRelease; +import static testkits.UnitKit.capture; +import static testkits.UnitKit.forkFuture; +import static testkits.UnitKit.spinwait; abstract class ThreadBasedPoolTest extends AllocatorBasedPoolTest { diff --git a/src/test/java/blackbox/ThreadedPoolTest.java b/src/test/java/blackbox/ThreadedPoolTest.java index da05c584..451bcdcc 100644 --- a/src/test/java/blackbox/ThreadedPoolTest.java +++ b/src/test/java/blackbox/ThreadedPoolTest.java @@ -15,8 +15,8 @@ */ package blackbox; -import stormpot.AlloKit; -import stormpot.GenericPoolable; +import testkits.AlloKit; +import testkits.GenericPoolable; import stormpot.Pool; import stormpot.PoolBuilder; diff --git a/src/test/java/blackbox/simulations/Sim.java b/src/test/java/blackbox/simulations/Sim.java index 5f2610c9..5c9b5e2f 100644 --- a/src/test/java/blackbox/simulations/Sim.java +++ b/src/test/java/blackbox/simulations/Sim.java @@ -17,7 +17,7 @@ import org.HdrHistogram.Histogram; import stormpot.Expiration; -import stormpot.GenericPoolable; +import testkits.GenericPoolable; import stormpot.ManagedPool; import stormpot.MetricsRecorder; import stormpot.Pool; @@ -44,10 +44,10 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import static stormpot.AlloKit.$new; -import static stormpot.AlloKit.CountingAllocator; -import static stormpot.AlloKit.alloc; -import static stormpot.AlloKit.allocator; +import static testkits.AlloKit.$new; +import static testkits.AlloKit.CountingAllocator; +import static testkits.AlloKit.alloc; +import static testkits.AlloKit.allocator; public abstract class Sim { diff --git a/src/test/java/blackbox/simulations/TimeSpreadExpirationSim.java b/src/test/java/blackbox/simulations/TimeSpreadExpirationSim.java index 32f7eb9c..24f0cba3 100644 --- a/src/test/java/blackbox/simulations/TimeSpreadExpirationSim.java +++ b/src/test/java/blackbox/simulations/TimeSpreadExpirationSim.java @@ -16,7 +16,7 @@ package blackbox.simulations; import stormpot.Expiration; -import stormpot.GenericPoolable; +import testkits.GenericPoolable; import stormpot.Pool; import stormpot.Timeout; diff --git a/src/test/java/blackbox/slow/DefaultPoolIT.java b/src/test/java/blackbox/slow/DefaultPoolIT.java index 0027c1aa..40cb6260 100644 --- a/src/test/java/blackbox/slow/DefaultPoolIT.java +++ b/src/test/java/blackbox/slow/DefaultPoolIT.java @@ -15,8 +15,8 @@ */ package blackbox.slow; -import stormpot.AlloKit; -import stormpot.GenericPoolable; +import testkits.AlloKit; +import testkits.GenericPoolable; import stormpot.Pool; import stormpot.PoolBuilder; diff --git a/src/test/java/blackbox/slow/InlinePoolIT.java b/src/test/java/blackbox/slow/InlinePoolIT.java index 1b444099..de4f1c3d 100644 --- a/src/test/java/blackbox/slow/InlinePoolIT.java +++ b/src/test/java/blackbox/slow/InlinePoolIT.java @@ -15,8 +15,8 @@ */ package blackbox.slow; -import stormpot.AlloKit; -import stormpot.GenericPoolable; +import testkits.AlloKit; +import testkits.GenericPoolable; import stormpot.Pool; import stormpot.PoolBuilder; diff --git a/src/test/java/blackbox/slow/PoolIT.java b/src/test/java/blackbox/slow/PoolIT.java index 0fc4244a..c52d6b10 100644 --- a/src/test/java/blackbox/slow/PoolIT.java +++ b/src/test/java/blackbox/slow/PoolIT.java @@ -24,12 +24,12 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.RegisterExtension; import stormpot.Completion; -import stormpot.GenericPoolable; +import testkits.GenericPoolable; import stormpot.Pool; import stormpot.PoolBuilder; import stormpot.PoolException; import stormpot.Slot; -import stormpot.SomeRandomException; +import testkits.SomeRandomException; import stormpot.Timeout; import java.util.ArrayList; @@ -50,17 +50,17 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static stormpot.AlloKit.$countDown; -import static stormpot.AlloKit.$new; -import static stormpot.AlloKit.$null; -import static stormpot.AlloKit.$release; -import static stormpot.AlloKit.Action; -import static stormpot.AlloKit.CountingAllocator; -import static stormpot.AlloKit.alloc; -import static stormpot.AlloKit.allocator; -import static stormpot.AlloKit.dealloc; -import static stormpot.AlloKit.realloc; -import static stormpot.AlloKit.reallocator; +import static testkits.AlloKit.$countDown; +import static testkits.AlloKit.$new; +import static testkits.AlloKit.$null; +import static testkits.AlloKit.$release; +import static testkits.AlloKit.Action; +import static testkits.AlloKit.CountingAllocator; +import static testkits.AlloKit.alloc; +import static testkits.AlloKit.allocator; +import static testkits.AlloKit.dealloc; +import static testkits.AlloKit.realloc; +import static testkits.AlloKit.reallocator; @SuppressWarnings("unchecked") @ExtendWith(FailurePrinterExtension.class) diff --git a/src/test/java/blackbox/slow/ThreadBasedPoolIT.java b/src/test/java/blackbox/slow/ThreadBasedPoolIT.java index caa87b44..688c2c8b 100644 --- a/src/test/java/blackbox/slow/ThreadBasedPoolIT.java +++ b/src/test/java/blackbox/slow/ThreadBasedPoolIT.java @@ -16,8 +16,8 @@ package blackbox.slow; import org.junit.jupiter.api.Test; -import stormpot.ExpireKit; -import stormpot.GenericPoolable; +import testkits.ExpireKit; +import testkits.GenericPoolable; import stormpot.Slot; import java.lang.management.ManagementFactory; @@ -35,16 +35,16 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assumptions.assumeTrue; -import static stormpot.AlloKit.$countDown; -import static stormpot.AlloKit.$new; -import static stormpot.AlloKit.$null; -import static stormpot.AlloKit.$release; -import static stormpot.AlloKit.Action; -import static stormpot.AlloKit.alloc; -import static stormpot.AlloKit.allocator; -import static stormpot.AlloKit.dealloc; -import static stormpot.ExpireKit.$expiredIf; -import static stormpot.ExpireKit.expire; +import static testkits.AlloKit.$countDown; +import static testkits.AlloKit.$new; +import static testkits.AlloKit.$null; +import static testkits.AlloKit.$release; +import static testkits.AlloKit.Action; +import static testkits.AlloKit.alloc; +import static testkits.AlloKit.allocator; +import static testkits.AlloKit.dealloc; +import static testkits.ExpireKit.$expiredIf; +import static testkits.ExpireKit.expire; abstract class ThreadBasedPoolIT extends PoolIT { diff --git a/src/test/java/blackbox/slow/ThreadedPoolIT.java b/src/test/java/blackbox/slow/ThreadedPoolIT.java index bfbbbc7d..06cb87e6 100644 --- a/src/test/java/blackbox/slow/ThreadedPoolIT.java +++ b/src/test/java/blackbox/slow/ThreadedPoolIT.java @@ -15,8 +15,8 @@ */ package blackbox.slow; -import stormpot.AlloKit; -import stormpot.GenericPoolable; +import testkits.AlloKit; +import testkits.GenericPoolable; import stormpot.Pool; import stormpot.PoolBuilder; diff --git a/src/test/java/stormpot/ThreadLocalWeakRefTest.java b/src/test/java/examples/ThreadLocalWeakRefTest.java similarity index 99% rename from src/test/java/stormpot/ThreadLocalWeakRefTest.java rename to src/test/java/examples/ThreadLocalWeakRefTest.java index c2bea2ca..30ad12e8 100644 --- a/src/test/java/stormpot/ThreadLocalWeakRefTest.java +++ b/src/test/java/examples/ThreadLocalWeakRefTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package stormpot; +package examples; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/stormpot/PoolBuilderReallocatingAdaptorTest.java b/src/test/java/stormpot/PoolBuilderReallocatingAdaptorTest.java index fb57509b..56b92e72 100644 --- a/src/test/java/stormpot/PoolBuilderReallocatingAdaptorTest.java +++ b/src/test/java/stormpot/PoolBuilderReallocatingAdaptorTest.java @@ -17,19 +17,23 @@ import org.assertj.core.api.Condition; import org.junit.jupiter.api.Test; +import testkits.AlloKit; +import testkits.GenericPoolable; +import testkits.LastSampleMetricsRecorder; +import testkits.NullSlot; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.condition.Not.not; import static org.junit.jupiter.api.Assertions.fail; -import static stormpot.AlloKit.$new; -import static stormpot.AlloKit.$throw; -import static stormpot.AlloKit.CountingAllocator; -import static stormpot.AlloKit.CountingReallocator; -import static stormpot.AlloKit.alloc; -import static stormpot.AlloKit.allocator; -import static stormpot.AlloKit.dealloc; -import static stormpot.AlloKit.realloc; -import static stormpot.AlloKit.reallocator; +import static testkits.AlloKit.$new; +import static testkits.AlloKit.$throw; +import static testkits.AlloKit.CountingAllocator; +import static testkits.AlloKit.CountingReallocator; +import static testkits.AlloKit.alloc; +import static testkits.AlloKit.allocator; +import static testkits.AlloKit.dealloc; +import static testkits.AlloKit.realloc; +import static testkits.AlloKit.reallocator; class PoolBuilderReallocatingAdaptorTest { private PoolBuilder builder; diff --git a/src/test/java/stormpot/ReallocatingAdaptorTest.java b/src/test/java/stormpot/ReallocatingAdaptorTest.java index 721dcd9d..643767f0 100644 --- a/src/test/java/stormpot/ReallocatingAdaptorTest.java +++ b/src/test/java/stormpot/ReallocatingAdaptorTest.java @@ -19,12 +19,14 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import testkits.GenericPoolable; +import testkits.NullSlot; import static org.assertj.core.api.Assertions.assertThat; -import static stormpot.AlloKit.$throw; -import static stormpot.AlloKit.CountingAllocator; -import static stormpot.AlloKit.allocator; -import static stormpot.AlloKit.dealloc; +import static testkits.AlloKit.$throw; +import static testkits.AlloKit.CountingAllocator; +import static testkits.AlloKit.allocator; +import static testkits.AlloKit.dealloc; @ExtendWith(FailurePrinterExtension.class) class ReallocatingAdaptorTest { diff --git a/src/test/java/stormpot/RefillPileTest.java b/src/test/java/stormpot/RefillPileTest.java index 56e22de4..c8fb7c9c 100644 --- a/src/test/java/stormpot/RefillPileTest.java +++ b/src/test/java/stormpot/RefillPileTest.java @@ -19,6 +19,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import testkits.GenericPoolable; import java.util.HashSet; import java.util.Set; diff --git a/src/test/java/stormpot/WhiteboxPoolBuilderTest.java b/src/test/java/stormpot/WhiteboxPoolBuilderTest.java index 95a6c9a5..31cddcde 100644 --- a/src/test/java/stormpot/WhiteboxPoolBuilderTest.java +++ b/src/test/java/stormpot/WhiteboxPoolBuilderTest.java @@ -18,6 +18,8 @@ import com.codahale.metrics.MetricRegistry; import examples.DropwizardMetricsRecorder; import org.junit.jupiter.api.Test; +import testkits.AlloKit; +import testkits.GenericPoolable; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; diff --git a/src/test/java/stormpot/AlloKit.java b/src/test/java/testkits/AlloKit.java similarity index 98% rename from src/test/java/stormpot/AlloKit.java rename to src/test/java/testkits/AlloKit.java index 7d495eb2..b15c0f83 100644 --- a/src/test/java/stormpot/AlloKit.java +++ b/src/test/java/testkits/AlloKit.java @@ -13,7 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package stormpot; +package testkits; + +import stormpot.Allocator; +import stormpot.Reallocator; +import stormpot.Slot; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/stormpot/ExpectedException.java b/src/test/java/testkits/ExpectedException.java similarity index 97% rename from src/test/java/stormpot/ExpectedException.java rename to src/test/java/testkits/ExpectedException.java index 2b0f257e..9fe93d5b 100644 --- a/src/test/java/stormpot/ExpectedException.java +++ b/src/test/java/testkits/ExpectedException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package stormpot; +package testkits; import java.io.Serial; diff --git a/src/test/java/stormpot/ExpireKit.java b/src/test/java/testkits/ExpireKit.java similarity index 97% rename from src/test/java/stormpot/ExpireKit.java rename to src/test/java/testkits/ExpireKit.java index 4813efef..097bc957 100644 --- a/src/test/java/stormpot/ExpireKit.java +++ b/src/test/java/testkits/ExpireKit.java @@ -13,7 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package stormpot; +package testkits; + +import stormpot.Expiration; +import stormpot.Poolable; +import stormpot.SlotInfo; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/test/java/stormpot/FixedMeanMetricsRecorder.java b/src/test/java/testkits/FixedMeanMetricsRecorder.java similarity index 98% rename from src/test/java/stormpot/FixedMeanMetricsRecorder.java rename to src/test/java/testkits/FixedMeanMetricsRecorder.java index 602736c5..dbcd246f 100644 --- a/src/test/java/stormpot/FixedMeanMetricsRecorder.java +++ b/src/test/java/testkits/FixedMeanMetricsRecorder.java @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package stormpot; +package testkits; + +import stormpot.MetricsRecorder; import static java.lang.Double.NaN; diff --git a/src/test/java/stormpot/GenericPoolable.java b/src/test/java/testkits/GenericPoolable.java similarity index 93% rename from src/test/java/stormpot/GenericPoolable.java rename to src/test/java/testkits/GenericPoolable.java index 3ea3fda2..287aff81 100644 --- a/src/test/java/stormpot/GenericPoolable.java +++ b/src/test/java/testkits/GenericPoolable.java @@ -13,7 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package stormpot; +package testkits; + +import stormpot.BasePoolable; +import stormpot.Slot; public class GenericPoolable extends BasePoolable { @SuppressWarnings("WeakerAccess") diff --git a/src/test/java/stormpot/LastSampleMetricsRecorder.java b/src/test/java/testkits/LastSampleMetricsRecorder.java similarity index 98% rename from src/test/java/stormpot/LastSampleMetricsRecorder.java rename to src/test/java/testkits/LastSampleMetricsRecorder.java index a68d5427..138e6467 100644 --- a/src/test/java/stormpot/LastSampleMetricsRecorder.java +++ b/src/test/java/testkits/LastSampleMetricsRecorder.java @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package stormpot; +package testkits; + +import stormpot.MetricsRecorder; import static java.lang.Double.NaN; diff --git a/src/test/java/stormpot/NullSlot.java b/src/test/java/testkits/NullSlot.java similarity index 92% rename from src/test/java/stormpot/NullSlot.java rename to src/test/java/testkits/NullSlot.java index 3dd710bd..2878ad85 100644 --- a/src/test/java/stormpot/NullSlot.java +++ b/src/test/java/testkits/NullSlot.java @@ -13,7 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package stormpot; +package testkits; + +import stormpot.Poolable; +import stormpot.Slot; public class NullSlot implements Slot { @Override diff --git a/src/test/java/stormpot/SlotInfoStub.java b/src/test/java/testkits/SlotInfoStub.java similarity index 96% rename from src/test/java/stormpot/SlotInfoStub.java rename to src/test/java/testkits/SlotInfoStub.java index 27fbf027..34be23ae 100644 --- a/src/test/java/stormpot/SlotInfoStub.java +++ b/src/test/java/testkits/SlotInfoStub.java @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package stormpot; +package testkits; + +import stormpot.SlotInfo; public class SlotInfoStub implements SlotInfo { private long ageInMillis; diff --git a/src/test/java/stormpot/SomeRandomException.java b/src/test/java/testkits/SomeRandomException.java similarity index 92% rename from src/test/java/stormpot/SomeRandomException.java rename to src/test/java/testkits/SomeRandomException.java index 44bfc249..aa795b5f 100644 --- a/src/test/java/stormpot/SomeRandomException.java +++ b/src/test/java/testkits/SomeRandomException.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package stormpot; +package testkits; import java.io.Serial; /** * Thrown by tests to assert that exceptions bubble out when they should. - * @author Chris Vest <mr.chrisvest@gmail.com> + * @author Chris Vest * */ public class SomeRandomException extends Exception { diff --git a/src/test/java/stormpot/SomeRandomThrowable.java b/src/test/java/testkits/SomeRandomThrowable.java similarity index 97% rename from src/test/java/stormpot/SomeRandomThrowable.java rename to src/test/java/testkits/SomeRandomThrowable.java index 846a0325..1152ea49 100644 --- a/src/test/java/stormpot/SomeRandomThrowable.java +++ b/src/test/java/testkits/SomeRandomThrowable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package stormpot; +package testkits; import java.io.Serial; diff --git a/src/test/java/stormpot/UnitKit.java b/src/test/java/testkits/UnitKit.java similarity index 96% rename from src/test/java/stormpot/UnitKit.java rename to src/test/java/testkits/UnitKit.java index e55203dc..6a8ef974 100644 --- a/src/test/java/stormpot/UnitKit.java +++ b/src/test/java/testkits/UnitKit.java @@ -13,7 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package stormpot; +package testkits; + +import stormpot.Completion; +import stormpot.Pool; +import stormpot.PoolException; +import stormpot.PoolTap; +import stormpot.Poolable; +import stormpot.Timeout; import java.io.Serial; import java.lang.Thread.State; @@ -87,7 +94,7 @@ public static Future forkFuture(Callable procedure) { } public static Callable $claim( - final PoolTap pool, final Timeout timeout) { + final PoolTap pool, final Timeout timeout) { return () -> { try { return pool.claim(timeout); @@ -243,7 +250,7 @@ public static void claimRelease( } } - static void sneakyThrow(Throwable throwable) { + public static void sneakyThrow(Throwable throwable) { UnitKit._sneakyThrow(throwable); }