From d562e1a9b1acb2d3a67f93309a729190b082c96c Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Tue, 16 May 2023 15:12:20 +0200 Subject: [PATCH] Adapt to CompositeFuture changes --- .../impl/CircuitBreakerMetricsTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/io/vertx/circuitbreaker/impl/CircuitBreakerMetricsTest.java b/src/test/java/io/vertx/circuitbreaker/impl/CircuitBreakerMetricsTest.java index c7212e3..9d28421 100644 --- a/src/test/java/io/vertx/circuitbreaker/impl/CircuitBreakerMetricsTest.java +++ b/src/test/java/io/vertx/circuitbreaker/impl/CircuitBreakerMetricsTest.java @@ -71,7 +71,7 @@ public void testWithSuccessfulCommands(TestContext tc) { Future command2 = breaker.execute(commandThatWorks()); Future command3 = breaker.execute(commandThatWorks()); - CompositeFuture.all(command1, command2, command3) + Future.all(command1, command2, command3) .onComplete(ar -> { assertThat(ar).succeeded(); assertThat(metrics()) @@ -107,7 +107,7 @@ public void testWithFailedCommands(TestContext tc) { Future command3 = breaker.execute(commandThatWorks()); Future command4 = breaker.execute(commandThatFails()); - CompositeFuture.join(command1, command2, command3, command4) + Future.join(command1, command2, command3, command4) .onComplete(ar -> { assertThat(metrics()) .contains("name", "some-circuit-breaker") @@ -136,7 +136,7 @@ public void testWithCrashingCommands(TestContext tc) { Future command4 = breaker.execute(commandThatFails()); Future command5 = breaker.execute(commandThatCrashes()); - CompositeFuture.join(command1, command2, command3, command4, command5) + Future.join(command1, command2, command3, command4, command5) .onComplete(ar -> { assertThat(metrics()) .contains("name", "some-circuit-breaker") @@ -165,7 +165,7 @@ public void testWithTimeoutCommands(TestContext tc) { Future command4 = breaker.execute(commandThatFails()); Future command5 = breaker.execute(commandThatTimeout(100)); - CompositeFuture.join(command1, command2, command3, command4, command5) + Future.join(command1, command2, command3, command4, command5) .onComplete(ar -> { assertThat(metrics()) .contains("name", "some-circuit-breaker") @@ -194,7 +194,7 @@ public void testLatencyComputation(TestContext tc) { IntStream.range(0, count) .mapToObj(i -> breaker.execute(commandThatWorks())) - .collect(collectingAndThen(toList(), CompositeFuture::all)) + .collect(collectingAndThen(toList(), Future::all)) .onComplete(ar -> { assertThat(ar).succeeded(); assertThat(metrics()) @@ -228,7 +228,7 @@ public void testEviction(TestContext tc) { list.add(breaker.execute(commandThatWorks())); } - CompositeFuture.all(list) + Future.all(list) .onComplete(ar -> { assertThat(ar).succeeded(); assertThat(metrics().getInteger("totalOperationCount")).isEqualTo(1000);