Improve assertions in TimedAspectTest

izeye · Sep 19, 2024 · f530d87 · f530d87
1 parent 8994c8f
commit f530d87
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/micrometer-core/src/test/java/io/micrometer/core/aop/TimedAspectTest.java b/micrometer-core/src/test/java/io/micrometer/core/aop/TimedAspectTest.java
@@ -201,7 +201,7 @@ void timeMethodWhenCompletedExceptionally() {
         assertThat(registry.getMeters()).isEmpty();
 
         guardedResult.complete(new IllegalStateException("simulated"));
-        catchThrowableOfType(completableFuture::join, CompletionException.class);
+        assertThatThrownBy(completableFuture::join).isInstanceOf(CompletionException.class);
 
         assertThat(registry.get("call")
             .tag("class", getClass().getName() + "$AsyncTimedService")
@@ -261,8 +261,8 @@ void timeMethodWithLongTaskTimerWhenCompletedExceptionally() {
             .longTaskTimer()
             .activeTasks()).isEqualTo(1);
 
-        guardedResult.complete(new NullPointerException());
-        catchThrowableOfType(completableFuture::join, CompletionException.class);
+        guardedResult.complete(new IllegalStateException("simulated"));
+        assertThatThrownBy(completableFuture::join).isInstanceOf(CompletionException.class);
 
         assertThat(registry.get("longCall")
             .tag("class", getClass().getName() + "$AsyncTimedService")
@@ -336,7 +336,7 @@ void timeClassWithSkipPredicate() {
 
         service.call();
 
-        assertThat(registry.find("call").timer()).isNull();
+        assertThat(registry.getMeters()).isEmpty();
     }
 
     @Test