upgrade slf4j-test to next major version

ben-manes · Jul 14, 2023 · c6434e3 · c6434e3
1 parent b2dc82d
commit c6434e3
Show file tree

Hide file tree

Showing 21 changed files with 44 additions and 36 deletions.
diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/cache/AsMapTest.java b/caffeine/src/test/java/com/github/benmanes/caffeine/cache/AsMapTest.java
@@ -35,8 +35,8 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
-import static uk.org.lidalia.slf4jext.Level.ERROR;
-import static uk.org.lidalia.slf4jext.Level.WARN;
+import static org.slf4j.event.Level.ERROR;
+import static org.slf4j.event.Level.WARN;
 
 import java.util.AbstractMap;
 import java.util.Arrays;

diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/cache/AsyncAsMapTest.java b/caffeine/src/test/java/com/github/benmanes/caffeine/cache/AsyncAsMapTest.java
@@ -35,8 +35,8 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
-import static uk.org.lidalia.slf4jext.Level.ERROR;
-import static uk.org.lidalia.slf4jext.Level.WARN;
+import static org.slf4j.event.Level.ERROR;
+import static org.slf4j.event.Level.WARN;
 
 import java.util.AbstractMap;
 import java.util.Arrays;

diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/cache/AsyncCacheTest.java b/caffeine/src/test/java/com/github/benmanes/caffeine/cache/AsyncCacheTest.java
@@ -31,7 +31,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
-import static uk.org.lidalia.slf4jext.Level.WARN;
+import static org.slf4j.event.Level.WARN;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/cache/AsyncLoadingCacheTest.java b/caffeine/src/test/java/com/github/benmanes/caffeine/cache/AsyncLoadingCacheTest.java
@@ -27,7 +27,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static java.util.function.Function.identity;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static uk.org.lidalia.slf4jext.Level.WARN;
+import static org.slf4j.event.Level.WARN;
 
 import java.time.Duration;
 import java.util.ArrayList;

diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/cache/BoundedLocalCacheTest.java b/caffeine/src/test/java/com/github/benmanes/caffeine/cache/BoundedLocalCacheTest.java
@@ -64,9 +64,8 @@
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
-import static uk.org.lidalia.slf4jext.ConventionalLevelHierarchy.WARN_LEVELS;
-import static uk.org.lidalia.slf4jext.Level.ERROR;
-import static uk.org.lidalia.slf4jext.Level.WARN;
+import static org.slf4j.event.Level.ERROR;
+import static org.slf4j.event.Level.WARN;
 
 import java.io.IOException;
 import java.lang.ref.Reference;
@@ -95,6 +94,7 @@
 import org.apache.commons.lang3.mutable.MutableInt;
 import org.mockito.Mockito;
 import org.mockito.stubbing.Answer;
+import org.slf4j.event.Level;
 import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
@@ -1892,7 +1892,7 @@ public void put_warnIfEvictionBlocked(BoundedLocalCache<Int, Int> cache, CacheCo
     try {
       ConcurrentTestHarness.execute(() -> {
         var logger = TestLoggerFactory.getTestLogger(BoundedLocalCache.class);
-        logger.setEnabledLevels(WARN_LEVELS);
+        logger.setEnabledLevels(Level.WARN, Level.ERROR);
         thread.set(Thread.currentThread());
         testLogger.set(logger);
 

diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/cache/CacheTest.java b/caffeine/src/test/java/com/github/benmanes/caffeine/cache/CacheTest.java
@@ -28,8 +28,8 @@
 import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
-import static uk.org.lidalia.slf4jext.Level.ERROR;
-import static uk.org.lidalia.slf4jext.Level.WARN;
+import static org.slf4j.event.Level.ERROR;
+import static org.slf4j.event.Level.WARN;
 
 import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;

diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/cache/EvictionTest.java b/caffeine/src/test/java/com/github/benmanes/caffeine/cache/EvictionTest.java
@@ -37,7 +37,7 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static uk.org.lidalia.slf4jext.Level.WARN;
+import static org.slf4j.event.Level.WARN;
 
 import java.time.Duration;
 import java.util.ConcurrentModificationException;

diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/cache/ExpirationTest.java b/caffeine/src/test/java/com/github/benmanes/caffeine/cache/ExpirationTest.java
@@ -39,7 +39,7 @@
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
-import static uk.org.lidalia.slf4jext.Level.WARN;
+import static org.slf4j.event.Level.WARN;
 
 import java.time.Duration;
 import java.util.ArrayList;

diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/cache/ExpireAfterAccessTest.java b/caffeine/src/test/java/com/github/benmanes/caffeine/cache/ExpireAfterAccessTest.java
@@ -28,7 +28,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth8.assertThat;
 import static org.junit.Assert.assertThrows;
-import static uk.org.lidalia.slf4jext.Level.WARN;
+import static org.slf4j.event.Level.WARN;
 
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;

diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/cache/ExpireAfterVarTest.java b/caffeine/src/test/java/com/github/benmanes/caffeine/cache/ExpireAfterVarTest.java
@@ -42,7 +42,7 @@
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
-import static uk.org.lidalia.slf4jext.Level.WARN;
+import static org.slf4j.event.Level.WARN;
 
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;

diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/cache/ExpireAfterWriteTest.java b/caffeine/src/test/java/com/github/benmanes/caffeine/cache/ExpireAfterWriteTest.java
@@ -29,7 +29,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth8.assertThat;
 import static org.junit.Assert.assertThrows;
-import static uk.org.lidalia.slf4jext.Level.WARN;
+import static org.slf4j.event.Level.WARN;
 
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;

diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/cache/LoadingCacheTest.java b/caffeine/src/test/java/com/github/benmanes/caffeine/cache/LoadingCacheTest.java
@@ -34,8 +34,8 @@
 import static com.google.common.truth.Truth.assertThat;
 import static java.util.function.Function.identity;
 import static org.junit.Assert.assertThrows;
-import static uk.org.lidalia.slf4jext.Level.TRACE;
-import static uk.org.lidalia.slf4jext.Level.WARN;
+import static org.slf4j.event.Level.TRACE;
+import static org.slf4j.event.Level.WARN;
 
 import java.time.Duration;
 import java.util.ArrayList;

diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/cache/MultiThreadedTest.java b/caffeine/src/test/java/com/github/benmanes/caffeine/cache/MultiThreadedTest.java
@@ -17,7 +17,7 @@
 
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.function.Function.identity;
-import static uk.org.lidalia.slf4jext.Level.WARN;
+import static org.slf4j.event.Level.WARN;
 
 import java.util.List;
 import java.util.Map;

diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/cache/ReferenceTest.java b/caffeine/src/test/java/com/github/benmanes/caffeine/cache/ReferenceTest.java
@@ -36,7 +36,7 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static uk.org.lidalia.slf4jext.Level.WARN;
+import static org.slf4j.event.Level.WARN;
 
 import java.util.AbstractMap;
 import java.util.AbstractMap.SimpleEntry;

diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/cache/RefreshAfterWriteTest.java b/caffeine/src/test/java/com/github/benmanes/caffeine/cache/RefreshAfterWriteTest.java
@@ -33,7 +33,7 @@
 import static java.util.function.Function.identity;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThrows;
-import static uk.org.lidalia.slf4jext.Level.WARN;
+import static org.slf4j.event.Level.WARN;
 
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;

diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/cache/UnboundedLocalCacheTest.java b/caffeine/src/test/java/com/github/benmanes/caffeine/cache/UnboundedLocalCacheTest.java
@@ -16,7 +16,7 @@
 package com.github.benmanes.caffeine.cache;
 
 import static com.google.common.truth.Truth8.assertThat;
-import static uk.org.lidalia.slf4jext.Level.TRACE;
+import static org.slf4j.event.Level.TRACE;
 
 import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;

diff --git a/...ine/src/test/java/com/github/benmanes/caffeine/cache/testing/CacheValidationListener.java b/...ine/src/test/java/com/github/benmanes/caffeine/cache/testing/CacheValidationListener.java
@@ -23,7 +23,6 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 import static org.testng.ITestResult.FAILURE;
-import static uk.org.lidalia.slf4jext.ConventionalLevelHierarchy.TRACE_LEVELS;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -36,6 +35,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.joor.Reflect;
 import org.mockito.Mockito;
+import org.slf4j.event.Level;
 import org.testng.Assert;
 import org.testng.IInvokedMethod;
 import org.testng.IInvokedMethodListener;
@@ -60,17 +60,20 @@
 import com.github.benmanes.caffeine.cache.testing.CacheSpec.CacheScheduler;
 import com.github.benmanes.caffeine.cache.testing.CacheSpec.ExecutorFailure;
 import com.github.valfirst.slf4jtest.TestLoggerFactory;
+import com.google.common.collect.ImmutableList;
 
 /**
  * A listener that validates the internal structure after a successful test execution.
  *
  * @author ben.manes@gmail.com (Ben Manes)
  */
 public final class CacheValidationListener implements ISuiteListener, IInvokedMethodListener {
+  private static final ImmutableList<Level> TRACE_LEVELS = ImmutableList.copyOf(Level.values());
+  private static final Object[] EMPTY_PARAMS = {};
+
   private static final Cache<Object, String> simpleNames = Caffeine.newBuilder().build();
   private static final AtomicBoolean detailedParams = new AtomicBoolean(false);
   private static final ITestContext testngContext = Mockito.mock();
-  private static final Object[] EMPTY_PARAMS = {};
 
   private final List<Collection<?>> resultQueues = new CopyOnWriteArrayList<>();
   private final AtomicBoolean beforeCleanup = new AtomicBoolean();
@@ -229,7 +232,7 @@ private static void checkLogger(ITestResult testResult) {
             .getRealClass().getAnnotation(CheckMaxLogLevel.class));
     if (checkMaxLogLevel != null) {
       var events = TestLoggerFactory.getLoggingEvents().stream()
-          .filter(event -> event.getLevel().ordinal() > checkMaxLogLevel.value().ordinal())
+          .filter(event -> event.getLevel().toInt() > checkMaxLogLevel.value().toInt())
           .collect(toImmutableList());
       assertWithMessage("maxLevel=%s", checkMaxLogLevel.value()).that(events).isEmpty();
     }

diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/cache/testing/CheckMaxLogLevel.java b/caffeine/src/test/java/com/github/benmanes/caffeine/cache/testing/CheckMaxLogLevel.java
@@ -22,7 +22,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import uk.org.lidalia.slf4jext.Level;
+import org.slf4j.event.Level;
 
 /**
  * A test class or method with this annotation has indicated that logging should not exceed the

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -76,7 +76,7 @@ picocli = "4.7.4"
 pmd = "7.0.0-rc3"
 protobuf = "3.23.4"
 slf4j = "2.0.7"
-slf4j-test = "2.9.0"
+slf4j-test = "3.0.1"
 snakeyaml = "2.0"
 sonarqube = "4.2.1.3168"
 spotbugs-contrib = "7.6.0"

diff --git a/simulator/src/main/java/com/github/benmanes/caffeine/cache/simulator/Simulator.java b/simulator/src/main/java/com/github/benmanes/caffeine/cache/simulator/Simulator.java
@@ -91,22 +91,22 @@ private void broadcast(TraceReader trace, List<PolicyActor> policies) {
       events.forEach(event -> {
         batch.add(event);
         if (batch.size() == batchSize) {
-          var accessEvents = List.copyOf(batch);
+          var accessEvents = ImmutableList.copyOf(batch);
           for (var policy : policies) {
             policy.send(accessEvents);
           }
           batch.clear();
         }
       });
 
-      var remainder = List.copyOf(batch);
+      var remainder = ImmutableList.copyOf(batch);
       for (var policy : policies) {
         policy.send(remainder);
         policy.finish();
       }
 
       var futures = policies.stream()
-          .map(PolicyActor::future)
+          .map(PolicyActor::completed)
           .toArray(CompletableFuture<?>[]::new);
       CompletableFuture.allOf(futures).join();
     }
@@ -142,9 +142,9 @@ private void throwError(RuntimeException error, Iterable<PolicyActor> policies)
       throw error;
     }
     for (var policy : policies) {
-      if (policy.future().isCompletedExceptionally()) {
+      if (policy.completed().isCompletedExceptionally()) {
         try {
-          policy.future().join();
+          policy.completed().join();
         } catch (CompletionException e) {
           Throwables.throwIfUnchecked(e.getCause());
           e.addSuppressed(error);

diff --git a/simulator/src/main/java/com/github/benmanes/caffeine/cache/simulator/policy/PolicyActor.java b/simulator/src/main/java/com/github/benmanes/caffeine/cache/simulator/policy/PolicyActor.java
@@ -22,13 +22,15 @@
 import java.util.concurrent.Semaphore;
 
 import com.github.benmanes.caffeine.cache.simulator.BasicSettings;
+import com.google.common.collect.ImmutableList;
 
 /**
  * An actor that proxies to the page replacement policy.
  *
  * @author ben.manes@gmail.com (Ben Manes)
  */
 public final class PolicyActor {
+  private final CompletableFuture<Void> completed;
   private final Semaphore semaphore;
   private final Policy policy;
   private final Thread parent;
@@ -45,12 +47,13 @@ public final class PolicyActor {
   public PolicyActor(Thread parent, Policy policy, BasicSettings settings) {
     this.semaphore = new Semaphore(settings.actor().mailboxSize());
     this.future = CompletableFuture.completedFuture(null);
+    this.completed = new CompletableFuture<>();
     this.policy = requireNonNull(policy);
     this.parent = requireNonNull(parent);
   }
 
   /** Sends the access events for async processing and blocks until accepted into the mailbox. */
-  public void send(List<AccessEvent> events) {
+  public void send(ImmutableList<AccessEvent> events) {
     submit(new Execute(events));
   }
 
@@ -60,8 +63,8 @@ public void finish() {
   }
 
   /** Return the future that signals the policy's completion. */
-  public CompletableFuture<Void> future() {
-    return future;
+  public CompletableFuture<Void> completed() {
+    return completed;
   }
 
   /** Submits the command to the mailbox and blocks until accepted. */
@@ -108,6 +111,7 @@ private final class Execute extends Command {
   private final class Finish extends Command {
     @Override public void execute() {
       policy.finished();
+      completed.complete(null);
     }
   }
 
@@ -118,6 +122,7 @@ private abstract class Command implements Runnable {
       try {
         execute();
       } catch (Throwable t) {
+        completed.completeExceptionally(t);
         parent.interrupt();
         throw t;
       } finally {