diff --git a/no-deps/pom.xml b/no-deps/pom.xml index 6d7867f5f..e25c57ec6 100644 --- a/no-deps/pom.xml +++ b/no-deps/pom.xml @@ -56,11 +56,23 @@ org.jctools:jctools-core - - org/jctools/counters/** - org/jctools/maps/** - org/jctools/queues/unpadded/** - + + org/jctools/queues/atomic/unpadded/** + org/jctools/queues/MessagePassingQueue* + org/jctools/queues/IndexedQueueSizeUtil* + org/jctools/queues/QueueProgressIndicators* + org/jctools/queues/SupportsIterator* + org/jctools/queues/BaseLinkedQueue* + org/jctools/queues/LinkedQueueNode* + org/jctools/queues/atomic/AtomicQueueUtil* + org/jctools/queues/atomic/AtomicReferenceArrayQueue* + org/jctools/queues/atomic/SequencedAtomicReferenceArrayQueue* + org/jctools/queues/atomic/LinkedQueueAtomicNode* + org/jctools/util/SpscLookAheadUtil* + org/jctools/util/Pow2* + org/jctools/util/RangeUtil* + org/jctools/util/UnsafeAccess* + diff --git a/no-deps/src/test/java/io/smallrye/mutiny/nodeps/ShadingIT.java b/no-deps/src/test/java/io/smallrye/mutiny/nodeps/ShadingIT.java index b34e4647a..b6eb890a1 100644 --- a/no-deps/src/test/java/io/smallrye/mutiny/nodeps/ShadingIT.java +++ b/no-deps/src/test/java/io/smallrye/mutiny/nodeps/ShadingIT.java @@ -15,36 +15,30 @@ public class ShadingIT { @Test - public void check_shaded_classes() throws ClassNotFoundException { + public void check_class_relocation() throws ClassNotFoundException { Class.forName("io.smallrye.mutiny.shaded.org.jctools.queues.BaseLinkedQueue"); Class.forName("io.smallrye.mutiny.shaded.org.jctools.queues.atomic.unpadded.BaseLinkedAtomicUnpaddedQueue"); Class.forName("io.smallrye.mutiny.shaded.io.smallrye.common.annotation.CheckReturnValue"); } @Test - public void mpsc_queue_factory() { - Queue queue = Queues.createMpscArrayQueue(256); - - queue.add("foo"); - queue.add("bar"); - assertEquals("foo", queue.poll()); - assertEquals("bar", queue.poll()); - assertNull(queue.poll()); - - assertTrue(queue.getClass().getCanonicalName().contains("shaded")); - } - - @Test - public void spsc_queue_factory() { - Queue queue = Queues.createSpscArrayQueue(256); - - queue.add("foo"); - queue.add("bar"); - assertEquals("foo", queue.poll()); - assertEquals("bar", queue.poll()); - assertNull(queue.poll()); - - assertTrue(queue.getClass().getCanonicalName().contains("shaded")); + public void check_factories() { + List> queues = List.of( + Queues.createSpscArrayQueue(256), + Queues.createSpscUnboundedArrayQueue(256), + Queues.createSpscChunkedArrayQueue(256), + Queues.createMpscQueue(), + Queues.createSpscUnboundedQueue(256), + Queues.createMpscArrayQueue(256)); + + queues.forEach(queue -> { + queue.add("foo"); + queue.add("bar"); + assertEquals("foo", queue.poll()); + assertEquals("bar", queue.poll()); + assertNull(queue.poll()); + assertTrue(queue.getClass().getCanonicalName().contains("shaded")); + }); } @Test