From f1fb512ea197b7ab865349346e59b5a480f458f7 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Thu, 21 May 2020 16:05:10 -0400 Subject: [PATCH] Migrates test to assertJ Fixes gh-1676 --- .../test/RouteConstructionIntegrationTests.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/RouteConstructionIntegrationTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/RouteConstructionIntegrationTests.java index 1edbc92c..a8405d47 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/RouteConstructionIntegrationTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/RouteConstructionIntegrationTests.java @@ -16,8 +16,6 @@ package org.springframework.cloud.gateway.test; -import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.springframework.boot.SpringBootConfiguration; @@ -27,16 +25,15 @@ import org.springframework.cloud.gateway.filter.GatewayFilter; import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory; import org.springframework.context.annotation.Bean; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + public class RouteConstructionIntegrationTests { @Test - @Ignore // FIXME: https://github.com/spring-cloud/spring-cloud-gateway/issues/1676 public void routesWithVerificationShouldFail() { - Assert.assertThrows("java.lang.AssertionError: Stop right now!", Throwable.class, - () -> { - new SpringApplicationBuilder(TestConfig.class) - .profiles("verification-route").run(); - }); + assertThatThrownBy(() -> new SpringApplicationBuilder(TestConfig.class) + .profiles("verification-route").run()) + .hasMessageContaining("Stop right now!"); } @EnableAutoConfiguration