Skip to content

Commit d84dedb

Browse files
lor6lor6
authored
Merge pull request eugenp#6566 from kivicko/BAEL-2762
Bael-2762 Fix tests in spring-boot-security module
2 parents c4e0a98 + 7bb1a28 commit d84dedb

10 files changed

Lines changed: 33 additions & 12 deletions

File tree

‎spring-boot-security/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@
6161
<artifactId>spring-security-test</artifactId>
6262
<scope>test</scope>
6363
</dependency>
64+
<dependency>
65+
<groupId>org.springframework.boot</groupId>
66+
<artifactId>spring-boot-autoconfigure</artifactId>
67+
<version>2.1.1.RELEASE</version>
68+
</dependency>
69+
6470
</dependencies>
6571

6672
<build>

‎spring-boot-security/src/main/java/com/baeldung/integrationtesting/WebSecurityConfigurer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter {
1212
protected void configure(AuthenticationManagerBuilder auth) throws Exception {
1313
auth.inMemoryAuthentication()
1414
.withUser("spring")
15-
.password("secret")
15+
.password("{noop}secret")
1616
.roles("USER");
1717
}
1818

‎spring-boot-security/src/main/java/com/baeldung/springbootsecurity/oauth2server/config/AuthorizationServerConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ public void configure(ClientDetailsServiceConfigurer clients) throws Exception {
2525
clients
2626
.inMemory()
2727
.withClient("baeldung")
28-
.secret("baeldung")
28+
.secret("{noop}baeldung")
2929
.authorizedGrantTypes("client_credentials", "password", "authorization_code")
3030
.scopes("openid", "read")
3131
.autoApprove(true)
3232
.and()
3333
.withClient("baeldung-admin")
34-
.secret("baeldung")
34+
.secret("{noop}baeldung")
3535
.authorizedGrantTypes("authorization_code", "client_credentials", "refresh_token")
3636
.scopes("read", "write")
3737
.autoApprove(true);

‎spring-boot-security/src/main/java/com/baeldung/springbootsecurity/oauth2server/config/WebSecurityConfiguration.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.baeldung.springbootsecurity.oauth2server.config;
2+
3+
import org.springframework.context.annotation.Bean;
4+
import org.springframework.context.annotation.Configuration;
5+
import org.springframework.security.authentication.AuthenticationManager;
6+
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
7+
8+
@Configuration
9+
public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
10+
11+
@Bean
12+
public AuthenticationManager customAuthenticationManager() throws Exception {
13+
return authenticationManager();
14+
}
15+
}

‎spring-boot-security/src/main/java/com/baeldung/springbootsecurity/oauth2sso/SpringBootOAuth2SsoApplication.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.baeldung.springbootsecurity.oauth2sso;
22

33
import org.springframework.boot.autoconfigure.SpringBootApplication;
4+
45
import org.springframework.boot.autoconfigure.security.oauth2.client.EnableOAuth2Sso;
56
import org.springframework.boot.builder.SpringApplicationBuilder;
67

‎spring-boot-security/src/main/java/com/baeldung/springsecuritytaglibs/config/SpringBootSecurityTagLibsConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class SpringBootSecurityTagLibsConfig extends WebSecurityConfigurerAdapte
1414
protected void configure(AuthenticationManagerBuilder auth) throws Exception {
1515
auth.inMemoryAuthentication()
1616
.withUser("testUser")
17-
.password("password")
17+
.password("{noop}password")
1818
.roles("ADMIN");
1919
}
2020

‎spring-boot-security/src/main/resources/application-authz.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
security.user.password=password
1+
spring.security.user.password=password
22
security.oauth2.client.client-id=client
33
security.oauth2.client.client-secret=secret

‎spring-boot-security/src/main/resources/application-taglibs.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#jsp config
2-
spring.mvc.view.prefix: /WEB-INF/views/
3-
spring.mvc.view.suffix: .jsp
2+
spring.mvc.view.prefix= /WEB-INF/views/
3+
spring.mvc.view.suffix= .jsp

‎spring-boot-security/src/test/java/com/baeldung/springbootsecurity/basic_auth/BasicAuthConfigurationIntegrationTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package com.baeldung.springbootsecurity.basic_auth;
22

3+
import org.junit.Assert;
34
import org.junit.Before;
45
import org.junit.Test;
56
import org.junit.runner.RunWith;
7+
import org.springframework.boot.web.server.LocalServerPort;
68
import org.springframework.boot.test.context.SpringBootTest;
79
import org.springframework.boot.test.web.client.TestRestTemplate;
8-
import org.springframework.boot.web.server.LocalServerPort;
910
import org.springframework.http.HttpStatus;
1011
import org.springframework.http.ResponseEntity;
1112
import org.springframework.test.context.junit4.SpringRunner;
@@ -48,8 +49,6 @@ public void whenUserWithWrongCredentialsRequestsHomePage_ThenUnauthorizedPage()
4849
ResponseEntity<String> response = restTemplate.getForEntity(base.toString(), String.class);
4950

5051
assertEquals(HttpStatus.UNAUTHORIZED, response.getStatusCode());
51-
assertTrue(response
52-
.getBody()
53-
.contains("Unauthorized"));
52+
Assert.assertNull(response.getBody());
5453
}
5554
}

spring-boot-security/src/test/java/com/baeldung/springsecuritytaglibs/HomeControllerIntegrationTest.java renamed to spring-boot-security/src/test/java/com/baeldung/springsecuritytaglibs/HomeControllerUnitTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
@RunWith(SpringRunner.class)
1515
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, classes = SpringBootSecurityTagLibsApplication.class)
16-
public class HomeControllerIntegrationTest {
16+
public class HomeControllerUnitTest {
1717

1818
@Autowired
1919
private TestRestTemplate restTemplate;

0 commit comments

Comments
 (0)