Skip to content

Commit bb0405c

Browse files
abdelmoez-guetatabdelmoez-guetat
committed
fix tests
1 parent 3a15bcd commit bb0405c

38 files changed

+90
-123
lines changed

‎springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/AbstractSpringDocTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.springdoc.core.utils.Constants;
2828
import org.springdoc.webflux.core.configuration.SpringDocWebFluxConfiguration;
2929
import org.springdoc.webflux.ui.SwaggerConfig;
30-
3130
import org.springframework.beans.factory.annotation.Autowired;
3231
import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
3332
import org.springframework.test.context.ContextConfiguration;
@@ -44,7 +43,7 @@
4443
SwaggerConfig.class, SwaggerUiOAuthProperties.class, SpringDocUIConfiguration.class })
4544
public abstract class AbstractSpringDocTest extends AbstractCommonTest {
4645

47-
private static final String DEFAULT_SWAGGER_INITIALIZER_URL = Constants.DEFAULT_WEB_JARS_PREFIX_URL + Constants.SWAGGER_INITIALIZER_URL;
46+
private static final String DEFAULT_SWAGGER_INITIALIZER_URL = Constants.SWAGGER_INITIALIZER_URL;
4847

4948
@Autowired
5049
protected WebTestClient webTestClient;

‎springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirecFilterTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@
2020

2121
import org.hamcrest.Matchers;
2222
import org.junit.jupiter.api.Test;
23-
import test.org.springdoc.ui.AbstractSpringDocTest;
24-
2523
import org.springframework.boot.autoconfigure.SpringBootApplication;
2624
import org.springframework.test.context.TestPropertySource;
2725
import org.springframework.test.web.reactive.server.WebTestClient;
26+
import test.org.springdoc.ui.AbstractSpringDocTest;
2827

2928

3029
@TestPropertySource(properties = "springdoc.swagger-ui.filter=false")
@@ -36,7 +35,7 @@ void shouldRedirectWithConfigUrlIgnoringQueryParams() {
3635
WebTestClient.ResponseSpec responseSpec = webTestClient.get().uri("/swagger-ui.html").exchange()
3736
.expectStatus().isFound();
3837
responseSpec.expectHeader()
39-
.value("Location", Matchers.is("/webjars/swagger-ui/index.html"));
38+
.value("Location", Matchers.is("/swagger-ui/index.html"));
4039
super.checkJS("index1-filter");
4140
}
4241

‎springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectConfigUrlTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@
2020

2121
import org.hamcrest.Matchers;
2222
import org.junit.jupiter.api.Test;
23-
import test.org.springdoc.ui.AbstractSpringDocTest;
24-
2523
import org.springframework.boot.autoconfigure.SpringBootApplication;
2624
import org.springframework.test.context.TestPropertySource;
2725
import org.springframework.test.web.reactive.server.WebTestClient;
26+
import test.org.springdoc.ui.AbstractSpringDocTest;
2827

2928

3029
@TestPropertySource(properties = {
@@ -39,7 +38,7 @@ void shouldRedirectWithConfigUrlIgnoringQueryParams() {
3938
WebTestClient.ResponseSpec responseSpec = webTestClient.get().uri("/swagger-ui.html").exchange()
4039
.expectStatus().isFound();
4140
responseSpec.expectHeader()
42-
.value("Location", Matchers.is("/webjars/swagger-ui/index.html"));
41+
.value("Location", Matchers.is("/swagger-ui/index.html"));
4342

4443
super.checkJS("index1-configurl");
4544
}

‎springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectDefaultTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@
2020

2121
import org.hamcrest.Matchers;
2222
import org.junit.jupiter.api.Test;
23-
import test.org.springdoc.ui.AbstractSpringDocTest;
24-
2523
import org.springframework.boot.autoconfigure.SpringBootApplication;
2624
import org.springframework.test.web.reactive.server.WebTestClient;
25+
import test.org.springdoc.ui.AbstractSpringDocTest;
2726

2827

2928
public class SpringDocApp1RedirectDefaultTest extends AbstractSpringDocTest {
@@ -33,7 +32,7 @@ void shouldRedirectWithDefaultQueryParams() {
3332
WebTestClient.ResponseSpec responseSpec = webTestClient.get().uri("/swagger-ui.html").exchange()
3433
.expectStatus().isFound();
3534
responseSpec.expectHeader()
36-
.value("Location", Matchers.is("/webjars/swagger-ui/index.html"));
35+
.value("Location", Matchers.is("/swagger-ui/index.html"));
3736

3837
webTestClient.get().uri("/v3/api-docs/swagger-config").exchange()
3938
.expectStatus().isOk().expectBody().jsonPath("$.validatorUrl").isEqualTo("");

‎springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectLayoutTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@
2020

2121
import org.hamcrest.Matchers;
2222
import org.junit.jupiter.api.Test;
23-
import test.org.springdoc.ui.AbstractSpringDocTest;
24-
2523
import org.springframework.boot.autoconfigure.SpringBootApplication;
2624
import org.springframework.test.context.TestPropertySource;
2725
import org.springframework.test.web.reactive.server.WebTestClient;
26+
import test.org.springdoc.ui.AbstractSpringDocTest;
2827

2928

3029
@TestPropertySource(properties = "springdoc.swagger-ui.layout=BaseLayout")
@@ -36,7 +35,7 @@ void shouldRedirectWithConfigUrlIgnoringQueryParams() {
3635
WebTestClient.ResponseSpec responseSpec = webTestClient.get().uri("/swagger-ui.html").exchange()
3736
.expectStatus().isFound();
3837
responseSpec.expectHeader()
39-
.value("Location", Matchers.is("/webjars/swagger-ui/index.html"));
38+
.value("Location", Matchers.is("/swagger-ui/index.html"));
4039

4140
super.checkJS("index1-layout");
4241
}

‎springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectWithConfigTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@
2020

2121
import org.hamcrest.Matchers;
2222
import org.junit.jupiter.api.Test;
23-
import test.org.springdoc.ui.AbstractSpringDocTest;
24-
2523
import org.springframework.boot.autoconfigure.SpringBootApplication;
2624
import org.springframework.test.context.TestPropertySource;
2725
import org.springframework.test.web.reactive.server.WebTestClient;
26+
import test.org.springdoc.ui.AbstractSpringDocTest;
2827

2928
@TestPropertySource(properties = {
3029
"springdoc.swagger-ui.validatorUrl=/foo/validate",
@@ -38,7 +37,7 @@ void shouldRedirectWithConfiguredParams() {
3837
.expectStatus().isFound();
3938

4039
responseSpec.expectHeader()
41-
.value("Location", Matchers.is("/webjars/swagger-ui/index.html"));
40+
.value("Location", Matchers.is("/swagger-ui/index.html"));
4241

4342
webTestClient.get().uri("/baf/batz/swagger-config").exchange()
4443
.expectStatus().isOk().expectBody().jsonPath("$.validatorUrl").isEqualTo("/foo/validate");

‎springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app13/SpringDocApp13Test.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@
2525
package test.org.springdoc.ui.app13;
2626

2727
import org.junit.jupiter.api.Test;
28-
import reactor.core.publisher.Mono;
29-
import test.org.springdoc.ui.AbstractSpringDocActuatorTest;
30-
3128
import org.springframework.boot.autoconfigure.SpringBootApplication;
3229
import org.springframework.boot.test.context.SpringBootTest;
3330
import org.springframework.http.HttpStatus;
3431
import org.springframework.http.HttpStatusCode;
3532
import org.springframework.test.web.reactive.server.EntityExchangeResult;
33+
import reactor.core.publisher.Mono;
34+
import test.org.springdoc.ui.AbstractSpringDocActuatorTest;
3635

3736
import static org.assertj.core.api.Assertions.assertThat;
3837
import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;
@@ -47,7 +46,7 @@ class SpringDocApp13Test extends AbstractSpringDocActuatorTest {
4746

4847
@Test
4948
void testIndex() {
50-
EntityExchangeResult<byte[]> getResult = webTestClient.get().uri("/application/webjars/swagger-ui/index.html")
49+
EntityExchangeResult<byte[]> getResult = webTestClient.get().uri("/application/swagger-ui/index.html")
5150
.exchange()
5251
.expectStatus().isOk()
5352
.expectBody().returnResult();

‎springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app14/SpringDocApp14Test.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@
2525
package test.org.springdoc.ui.app14;
2626

2727
import org.junit.jupiter.api.Test;
28-
import reactor.core.publisher.Mono;
29-
import test.org.springdoc.ui.AbstractSpringDocActuatorTest;
30-
3128
import org.springframework.boot.autoconfigure.SpringBootApplication;
3229
import org.springframework.boot.test.context.SpringBootTest;
3330
import org.springframework.http.HttpStatus;
3431
import org.springframework.http.HttpStatusCode;
3532
import org.springframework.test.web.reactive.server.EntityExchangeResult;
33+
import reactor.core.publisher.Mono;
34+
import test.org.springdoc.ui.AbstractSpringDocActuatorTest;
3635

3736
import static org.assertj.core.api.Assertions.assertThat;
3837
import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;
@@ -45,7 +44,7 @@ class SpringDocApp14Test extends AbstractSpringDocActuatorTest {
4544

4645
@Test
4746
void testIndex() {
48-
EntityExchangeResult<byte[]> getResult = webTestClient.get().uri("/application/webjars/swagger-ui/index.html")
47+
EntityExchangeResult<byte[]> getResult = webTestClient.get().uri("/application/swagger-ui/index.html")
4948
.exchange()
5049
.expectStatus().isOk()
5150
.expectBody().returnResult();

‎springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app15/SpringDocApp15Test.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@
2525
package test.org.springdoc.ui.app15;
2626

2727
import org.junit.jupiter.api.Test;
28-
import reactor.core.publisher.Mono;
29-
import test.org.springdoc.ui.AbstractSpringDocActuatorTest;
30-
3128
import org.springframework.boot.autoconfigure.SpringBootApplication;
3229
import org.springframework.boot.test.context.SpringBootTest;
3330
import org.springframework.http.HttpStatus;
3431
import org.springframework.http.HttpStatusCode;
3532
import org.springframework.test.web.reactive.server.EntityExchangeResult;
33+
import reactor.core.publisher.Mono;
34+
import test.org.springdoc.ui.AbstractSpringDocActuatorTest;
3635

3736
import static org.assertj.core.api.Assertions.assertThat;
3837
import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;
@@ -48,7 +47,7 @@ class SpringDocApp15Test extends AbstractSpringDocActuatorTest {
4847

4948
@Test
5049
void testIndex() {
51-
EntityExchangeResult<byte[]> getResult = webTestClient.get().uri("/application/webjars/swagger-ui/index.html")
50+
EntityExchangeResult<byte[]> getResult = webTestClient.get().uri("/application/swagger-ui/index.html")
5251
.exchange()
5352
.expectStatus().isOk()
5453
.expectBody().returnResult();

‎springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app16/SpringDocApp16Test.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@
2525
package test.org.springdoc.ui.app16;
2626

2727
import org.junit.jupiter.api.Test;
28-
import reactor.core.publisher.Mono;
29-
import test.org.springdoc.ui.AbstractSpringDocActuatorTest;
30-
3128
import org.springframework.boot.autoconfigure.SpringBootApplication;
3229
import org.springframework.boot.test.context.SpringBootTest;
3330
import org.springframework.http.HttpStatus;
3431
import org.springframework.http.HttpStatusCode;
3532
import org.springframework.test.web.reactive.server.EntityExchangeResult;
33+
import reactor.core.publisher.Mono;
34+
import test.org.springdoc.ui.AbstractSpringDocActuatorTest;
3635

3736
import static org.assertj.core.api.Assertions.assertThat;
3837
import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;
@@ -48,7 +47,7 @@ class SpringDocApp16Test extends AbstractSpringDocActuatorTest {
4847

4948
@Test
5049
void testIndex() {
51-
EntityExchangeResult<byte[]> getResult = webTestClient.get().uri("/application/webjars/swagger-ui/index.html")
50+
EntityExchangeResult<byte[]> getResult = webTestClient.get().uri("/application/swagger-ui/index.html")
5251
.exchange()
5352
.expectStatus().isOk()
5453
.expectBody().returnResult();

0 commit comments

Comments
 (0)