Merge pull request #6566 from kivicko/BAEL-2762

Bael-2762 Fix tests in spring-boot-security module

spring-boot-security/pom.xml

@@ -61,6 +61,12 @@
             <artifactId>spring-security-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+            <version>2.1.1.RELEASE</version>
+        </dependency>
+
     </dependencies>
 
     <build>

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

@@ -12,7 +12,7 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter {
     protected void configure(AuthenticationManagerBuilder auth) throws Exception {
         auth.inMemoryAuthentication()
             .withUser("spring")
-            .password("secret")
+            .password("{noop}secret")
             .roles("USER");
     }
 

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

@@ -25,13 +25,13 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap
         clients
           .inMemory()
           .withClient("baeldung")
-          .secret("baeldung")
+          .secret("{noop}baeldung")
           .authorizedGrantTypes("client_credentials", "password", "authorization_code")
           .scopes("openid", "read")
           .autoApprove(true)
           .and()
           .withClient("baeldung-admin")
-          .secret("baeldung")
+          .secret("{noop}baeldung")
           .authorizedGrantTypes("authorization_code", "client_credentials", "refresh_token")
           .scopes("read", "write")
           .autoApprove(true);

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

@@ -0,0 +1,15 @@
+package com.baeldung.springbootsecurity.oauth2server.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+@Configuration
+public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
+
+    @Bean
+    public AuthenticationManager customAuthenticationManager() throws Exception {
+        return authenticationManager();
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.baeldung.springbootsecurity.oauth2sso;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+
 import org.springframework.boot.autoconfigure.security.oauth2.client.EnableOAuth2Sso;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 

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

@@ -14,7 +14,7 @@ public class SpringBootSecurityTagLibsConfig extends WebSecurityConfigurerAdapte
     protected void configure(AuthenticationManagerBuilder auth) throws Exception {
         auth.inMemoryAuthentication()
             .withUser("testUser")
-            .password("password")
+            .password("{noop}password")
             .roles("ADMIN");
     }
 

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

@@ -1,3 +1,3 @@
-security.user.password=password
+spring.security.user.password=password
 security.oauth2.client.client-id=client
 security.oauth2.client.client-secret=secret

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

@@ -1,3 +1,3 @@
 #jsp config
-spring.mvc.view.prefix: /WEB-INF/views/
+spring.mvc.view.prefix= /WEB-INF/views/
-spring.mvc.view.suffix: .jsp
+spring.mvc.view.suffix= .jsp

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

@@ -1,11 +1,12 @@
 package com.baeldung.springbootsecurity.basic_auth;
 
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -48,8 +49,6 @@ public class BasicAuthConfigurationIntegrationTest {
         ResponseEntity<String> response = restTemplate.getForEntity(base.toString(), String.class);
 
         assertEquals(HttpStatus.UNAUTHORIZED, response.getStatusCode());
-        assertTrue(response
+        Assert.assertNull(response.getBody());
-          .getBody()
-          .contains("Unauthorized"));
     }
 }

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

@@ -13,7 +13,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, classes = SpringBootSecurityTagLibsApplication.class)
-public class HomeControllerIntegrationTest {
+public class HomeControllerUnitTest {
 
     @Autowired
     private TestRestTemplate restTemplate;