depedency upgrades and test clean ups

Author: ben-manes

.github/workflows/dependency-submission.yml

@@ -43,12 +43,12 @@ jobs:
           attempt_limit: 3
           attempt_delay: 2000
       - name: Submit Dependency Graph
-        uses: mikepenz/gradle-dependency-submission@v0.7.2
+        uses: mikepenz/gradle-dependency-submission@v0.8.0
         with:
           gradle-build-module: |-
             :simulator
             :caffeine
             :jcache
             :guava
+          include-build-environment: true
           sub-module-mode: INDIVIDUAL_DEEP
-          gradle-build-configuration: testCompileClasspath

build.gradle

@@ -18,6 +18,11 @@ buildscript {
 
   dependencies {
     classpath gradlePlugins.values()
+    classpath platforms.collect { platform(it) }
+
+    restrictions.each { module, version ->
+      constraints.classpath(module).version { require version }
+    }
   }
 }
 
@@ -60,11 +65,12 @@ subprojects {
     testImplementation testLibraries.hamcrest
     testImplementation testLibraries.awaitility
     testImplementation testLibraries.osgiCompile
+    testImplementation platforms.collect { platform(it) }
 
     testRuntimeOnly testLibraries.osgiRuntime
 
-    constraints {
-      implementation('org.jetbrains.kotlin:kotlin-stdlib:1.7.10+')
+    restrictions.each { module, version ->
+      constraints.testImplementation(module).version { require version }
     }
   }
 
@@ -104,8 +110,12 @@ def isNonStable = { String version ->
   def regex = /^[0-9,.v-]+(-r)?$/
   return (!stableKeyword || unstableKeyword) && !(version ==~ regex)
 }
-dependencyUpdates.rejectVersionIf {
-  (it.candidate.group == 'javax.json.bind') && isNonStable(it.candidate.version)
+dependencyUpdates {
+  rejectVersionIf {
+    isNonStable(it.candidate.version) && it.candidate.group in [
+      'javax.json.bind', 'org.jetbrains.kotlin'
+    ]
+  }
 }
 
 dependencyCheck {

caffeine/src/test/java/com/github/benmanes/caffeine/cache/AsyncTest.java

@@ -45,7 +45,7 @@ public final class AsyncTest {
   private static final long ONE_MINUTE = TimeUnit.MINUTES.toNanos(1);
 
   @Test
-  public void reflectivelyConstruct() throws Exception {
+  public void reflectivelyConstruct() throws ReflectiveOperationException {
     var constructor = Async.class.getDeclaredConstructor();
     constructor.setAccessible(true);
     constructor.newInstance();

caffeine/src/test/java/com/github/benmanes/caffeine/cache/CaffeineTest.java

@@ -28,7 +28,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.testng.Assert;
-import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
@@ -57,16 +56,9 @@ public final class CaffeineTest {
   @Mock Expiry<Object, Object> expiry;
   @Mock CacheLoader<Object, Object> loader;
 
-  AutoCloseable mocks;
-
   @BeforeClass
-  public void beforeClass() {
-    mocks = MockitoAnnotations.openMocks(this);
-  }
-
-  @AfterClass
-  public void afterClass() throws Exception {
-    mocks.close();
+  public void beforeClass() throws Exception {
+    MockitoAnnotations.openMocks(this).close();
   }
 
   @Test

caffeine/src/test/java/com/github/benmanes/caffeine/cache/LinkedDequeTests.java

@@ -50,7 +50,7 @@ public final class LinkedDequeTests extends TestCase {
   // cause unexpected mutations. Instead, a different collection type should be used for comparison
   static final ThreadLocal<Boolean> useTarget = ThreadLocal.withInitial(() -> false);
 
-  public static Test suite() throws Exception {
+  public static Test suite() {
     var suite = new TestSuite();
     suite.addTest(suite("AccessOrderDeque", AccessOrderDeque::new));
     suite.addTest(suite("WriteOrderDeque", WriteOrderDeque::new));

caffeine/src/test/java/com/github/benmanes/caffeine/cache/LoadingCacheTest.java

@@ -915,7 +915,7 @@ public void refresh_timeout_noLog(CacheContext context) {
   @CheckNoEvictions
   @Test(dataProvider = "caches")
   @CacheSpec(implementation = Implementation.Caffeine, population = Population.EMPTY)
-  public void refresh_error_log(CacheContext context) throws Exception {
+  public void refresh_error_log(CacheContext context) {
     var expected = new RuntimeException();
     CacheLoader<Int, Int> cacheLoader = key -> { throw expected; };
     LoadingCache<Int, Int> cache = context.isAsync()
@@ -1104,7 +1104,7 @@ public void asyncLoad() throws Exception {
   public void asyncLoadAll_exception() throws Exception {
     var e = new Exception();
     var loader = new CacheLoader<Int, Int>() {
-      @Override public Int load(Int key) throws Exception {
+      @Override public Int load(Int key) {
         throw new AssertionError();
       }
       @Override public Map<Int, Int> loadAll(Set<? extends Int> keys) throws Exception {

caffeine/src/test/java/com/github/benmanes/caffeine/cache/MpscGrowableQueueSanityTest.java

@@ -24,23 +24,20 @@
  * @author nitsanw@yahoo.com (Nitsan Wakart)
  */
 @RunWith(Parameterized.class)
-@SuppressWarnings("deprecation")
 public final class MpscGrowableQueueSanityTest extends QueueSanityTest {
 
-  public MpscGrowableQueueSanityTest(
-      org.jctools.queues.spec.ConcurrentQueueSpec spec, Queue<Integer> queue) {
-    super(spec, queue);
+  public MpscGrowableQueueSanityTest(Queue<Integer> queue,
+      Ordering ordering, int capacity, boolean isBounded) {
+    super(queue, ordering, capacity, isBounded);
   }
 
   @Parameterized.Parameters
   public static List<Object[]> parameters() {
     var list = new ArrayList<Object[]>();
     // MPSC size: 1
-    list.add(makeQueue(0, 1, 4, org.jctools.queues.spec.Ordering.FIFO,
-        new MpscGrowableArrayQueue<>(2, 4)));
+    list.add(new Object[] { new MpscGrowableArrayQueue<>(2, 4), Ordering.FIFO, 4, true });
     // MPSC size: SIZE
-    list.add(makeQueue(0, 1, SIZE, org.jctools.queues.spec.Ordering.FIFO,
-        new MpscGrowableArrayQueue<>(8, SIZE)));
+    list.add(new Object[] { new MpscGrowableArrayQueue<>(8, SIZE), Ordering.FIFO, SIZE, true });
     return list;
   }
 }

caffeine/src/test/java/com/github/benmanes/caffeine/cache/PacerTest.java

@@ -29,7 +29,6 @@
 
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -48,21 +47,15 @@ public final class PacerTest {
   @Mock Executor executor;
   @Mock Runnable command;
   @Mock Future<?> future;
-  AutoCloseable mocks;
 
   Pacer pacer;
 
   @BeforeMethod
-  public void beforeMethod() {
-    mocks = MockitoAnnotations.openMocks(this);
+  public void beforeMethod() throws Exception {
+    MockitoAnnotations.openMocks(this).close();
     pacer = new Pacer(scheduler);
   }
 
-  @AfterMethod
-  public void afterMethod() throws Exception {
-    mocks.close();
-  }
-
   @Test
   public void schedule_initialize() {
     long delay = random.nextInt(Ints.saturatedCast(Pacer.TOLERANCE));

caffeine/src/test/java/com/github/benmanes/caffeine/cache/QueueSanityTest.java

@@ -30,7 +30,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.hamcrest.Matcher;
-import org.jctools.queues.atomic.AtomicQueueFactory;
 import org.jctools.util.Pow2;
 import org.junit.Before;
 import org.junit.Test;
@@ -44,12 +43,16 @@ public abstract class QueueSanityTest {
   public static final int SIZE = 8192 * 2;
 
   private final Queue<Integer> queue;
-  private final org.jctools.queues.spec.ConcurrentQueueSpec spec;
+  private final Ordering ordering;
+  private final boolean isBounded;
+  private final int capacity;
 
-  protected QueueSanityTest(
-      org.jctools.queues.spec.ConcurrentQueueSpec spec, Queue<Integer> queue) {
+  protected QueueSanityTest(Queue<Integer> queue,
+      Ordering ordering, int capacity, boolean isBounded) {
     this.queue = queue;
-    this.spec = spec;
+    this.ordering = ordering;
+    this.capacity = capacity;
+    this.isBounded = isBounded;
   }
 
   @Before
@@ -69,7 +72,7 @@ public void sanity() {
     }
     int size = i;
     assertEquals(size, queue.size());
-    if (spec.ordering == org.jctools.queues.spec.Ordering.FIFO) {
+    if (ordering == Ordering.FIFO) {
       // expect FIFO
       i = 0;
       Integer p;
@@ -107,7 +110,7 @@ public void testSizeIsTheNumberOfOffers() {
 
   @Test
   public void whenFirstInThenFirstOut() {
-    assumeThat(spec.ordering, is(org.jctools.queues.spec.Ordering.FIFO));
+    assumeThat(ordering, is(Ordering.FIFO));
 
     // Arrange
     int i = 0;
@@ -157,8 +160,8 @@ public void whenOfferItemAndPollItemThenSameInstanceReturnedAndQueueIsEmpty() {
 
   @Test
   public void testPowerOf2Capacity() {
-    assumeThat(spec.isBounded(), is(true));
-    int n = Pow2.roundToPowerOfTwo(spec.capacity);
+    assumeThat(isBounded, is(true));
+    int n = Pow2.roundToPowerOfTwo(capacity);
 
     for (int i = 0; i < n; i++) {
       assertTrue("Failed to insert:" + i, queue.offer(i));
@@ -172,7 +175,7 @@ static final class Val {
 
   @Test
   @SuppressWarnings({"rawtypes", "unchecked"})
-  public void testHappensBefore() throws Exception {
+  public void testHappensBefore() throws InterruptedException {
     final AtomicBoolean stop = new AtomicBoolean();
     final Queue q = queue;
     final Val fail = new Val();
@@ -217,7 +220,7 @@ public void run() {
   }
 
   @Test
-  public void testSize() throws Exception {
+  public void testSize() throws InterruptedException {
     final AtomicBoolean stop = new AtomicBoolean();
     final Queue<Integer> q = queue;
     final Val fail = new Val();
@@ -253,7 +256,7 @@ public void run() {
   }
 
   @Test
-  public void testPollAfterIsEmpty() throws Exception {
+  public void testPollAfterIsEmpty() throws InterruptedException {
     final AtomicBoolean stop = new AtomicBoolean();
     final Queue<Integer> q = queue;
     final Val fail = new Val();
@@ -289,29 +292,11 @@ public void run() {
 
   }
 
-  public static Object[] makeQueue(int producers, int consumers, int capacity,
-      org.jctools.queues.spec.Ordering ordering, Queue<Integer> q) {
-    org.jctools.queues.spec.ConcurrentQueueSpec spec =
-        new org.jctools.queues.spec.ConcurrentQueueSpec(
-            producers, consumers, capacity, ordering, org.jctools.queues.spec.Preference.NONE);
-    if (q == null) {
-      q = org.jctools.queues.QueueFactory.newQueue(spec);
-    }
-    return new Object[] {spec, q};
-  }
-
-  public static Object[] makeAtomic(int producers, int consumers, int capacity,
-      org.jctools.queues.spec.Ordering ordering, Queue<Integer> q) {
-    org.jctools.queues.spec.ConcurrentQueueSpec spec =
-        new org.jctools.queues.spec.ConcurrentQueueSpec(
-            producers, consumers, capacity, ordering, org.jctools.queues.spec.Preference.NONE);
-    if (q == null) {
-      q = AtomicQueueFactory.newQueue(spec);
-    }
-    return new Object[] {spec, q};
-  }
-
   public static Matcher<Collection<?>> emptyAndZeroSize() {
     return allOf(hasSize(0), empty());
   }
+
+  enum Ordering {
+    FIFO
+  }
 }

caffeine/src/test/java/com/github/benmanes/caffeine/cache/SchedulerTest.java

@@ -83,7 +83,7 @@ public void disabledScheduler() {
   }
 
   @Test
-  public void disabledFuture() throws Exception {
+  public void disabledFuture() {
     assertThat(DisabledFuture.INSTANCE.get(0, TimeUnit.SECONDS)).isNull();
     assertThat(DisabledFuture.INSTANCE.isCancelled()).isFalse();
     assertThat(DisabledFuture.INSTANCE.cancel(false)).isFalse();