root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Phillip Webb 2017-07-31 20:34:56 -07:00
parent 37bef961ea
commit e1602fe59a
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
View File

@ -574,7 +574,6 @@ public class EndpointWebMvcAutoConfigurationTests {
"server.ssl.enabled=true", "server.ssl.key-store=classpath:test.jks", "server.ssl.enabled=true", "server.ssl.key-store=classpath:test.jks",
"server.ssl.key-password=password", "management.ssl.enabled=false") "server.ssl.key-password=password", "management.ssl.enabled=false")
.applyTo(this.applicationContext); .applyTo(this.applicationContext);
this.applicationContext.register(RootConfig.class, EndpointConfig.class, this.applicationContext.register(RootConfig.class, EndpointConfig.class,
DifferentPortConfig.class, BaseConfiguration.class, DifferentPortConfig.class, BaseConfiguration.class,
EndpointWebMvcAutoConfiguration.class, ErrorMvcAutoConfiguration.class); EndpointWebMvcAutoConfiguration.class, ErrorMvcAutoConfiguration.class);

7
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java
View File

@ -293,13 +293,10 @@ public class SecurityAutoConfigurationTests {
public void testDefaultUsernamePassword() throws Exception { public void testDefaultUsernamePassword() throws Exception {
this.context = new AnnotationConfigWebApplicationContext(); this.context = new AnnotationConfigWebApplicationContext();
this.context.setServletContext(new MockServletContext()); this.context.setServletContext(new MockServletContext());
this.context.register(SecurityAutoConfiguration.class); this.context.register(SecurityAutoConfiguration.class);
this.context.refresh(); this.context.refresh();
SecurityProperties security = this.context.getBean(SecurityProperties.class); SecurityProperties security = this.context.getBean(SecurityProperties.class);
AuthenticationManager manager = this.context.getBean(AuthenticationManager.class); AuthenticationManager manager = this.context.getBean(AuthenticationManager.class);
UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken( UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
security.getUser().getName(), security.getUser().getPassword()); security.getUser().getName(), security.getUser().getPassword());
assertThat(manager.authenticate(token)).isNotNull(); assertThat(manager.authenticate(token)).isNotNull();
@ -310,14 +307,11 @@ public class SecurityAutoConfigurationTests {
throws Exception { throws Exception {
this.context = new AnnotationConfigWebApplicationContext(); this.context = new AnnotationConfigWebApplicationContext();
this.context.setServletContext(new MockServletContext()); this.context.setServletContext(new MockServletContext());
this.context.register(AuthenticationManagerCustomizer.class, this.context.register(AuthenticationManagerCustomizer.class,
SecurityAutoConfiguration.class); SecurityAutoConfiguration.class);
this.context.refresh(); this.context.refresh();
SecurityProperties security = this.context.getBean(SecurityProperties.class); SecurityProperties security = this.context.getBean(SecurityProperties.class);
AuthenticationManager manager = this.context.getBean(AuthenticationManager.class); AuthenticationManager manager = this.context.getBean(AuthenticationManager.class);
UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken( UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
security.getUser().getName(), security.getUser().getPassword()); security.getUser().getName(), security.getUser().getPassword());
try { try {
@ -327,7 +321,6 @@ public class SecurityAutoConfigurationTests {
catch (AuthenticationException success) { catch (AuthenticationException success) {
// Expected // Expected
} }
token = new UsernamePasswordAuthenticationToken("foo", "bar"); token = new UsernamePasswordAuthenticationToken("foo", "bar");
assertThat(manager.authenticate(token)).isNotNull(); assertThat(manager.authenticate(token)).isNotNull();
} }