Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-07-06 18:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Polish CorsSpecTests

Browse Source 
Use concrete ApplicationContext to simplify future maintenance.

Issue gh-4832
This commit is contained in:
Tran Ngoc Nhan 2024-09-19 01:17:13 +07:00 committed by Josh Cummings
parent 68d814e042
commit 9dda65a5e3
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/src/test/java/org/springframework/security/config/web/server/CorsSpecTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -29,7 +29,7 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.core.ResolvableType; import org.springframework.context.support.GenericApplicationContext;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.security.test.web.reactive.server.WebTestClientBuilder; import org.springframework.security.test.web.reactive.server.WebTestClientBuilder;
import org.springframework.test.web.reactive.server.FluxExchangeResult; import org.springframework.test.web.reactive.server.FluxExchangeResult;
@ -51,7 +51,6 @@ public class CorsSpecTests {
@Mock @Mock
private CorsConfigurationSource source; private CorsConfigurationSource source;
@Mock
private ApplicationContext context; private ApplicationContext context;
ServerHttpSecurity http; ServerHttpSecurity http;
@ -62,6 +61,8 @@ public class CorsSpecTests {
@BeforeEach @BeforeEach
public void setup() { public void setup() {
this.context = new GenericApplicationContext();
((GenericApplicationContext) this.context).refresh();
this.http = new TestingServerHttpSecurity().applicationContext(this.context); this.http = new TestingServerHttpSecurity().applicationContext(this.context);
} }
@ -92,9 +93,7 @@ public class CorsSpecTests {
@Test @Test
public void corsWhenCorsConfigurationSourceBeanThenAccessControlAllowOriginAndSecurityHeaders() { public void corsWhenCorsConfigurationSourceBeanThenAccessControlAllowOriginAndSecurityHeaders() {
givenGetCorsConfigurationWillReturnWildcard(); givenGetCorsConfigurationWillReturnWildcard();
given(this.context.getBeanNamesForType(any(ResolvableType.class))).willReturn(new String[] { "source" }, ((GenericApplicationContext) this.context).registerBean(CorsConfigurationSource.class, () -> this.source);
new String[0]);
given(this.context.getBean("source")).willReturn(this.source);
this.expectedHeaders.set("Access-Control-Allow-Origin", "*"); this.expectedHeaders.set("Access-Control-Allow-Origin", "*");
this.expectedHeaders.set("X-Frame-Options", "DENY"); this.expectedHeaders.set("X-Frame-Options", "DENY");
assertHeaders(); assertHeaders();
@ -102,7 +101,6 @@ public class CorsSpecTests {
@Test @Test
public void corsWhenNoConfigurationSourceThenNoCorsHeaders() { public void corsWhenNoConfigurationSourceThenNoCorsHeaders() {
given(this.context.getBeanNamesForType(any(ResolvableType.class))).willReturn(new String[0]);
this.headerNamesNotPresent.add("Access-Control-Allow-Origin"); this.headerNamesNotPresent.add("Access-Control-Allow-Origin");
assertHeaders(); assertHeaders();
} }