Fix tests

Author: jgrandja

Diff for: spring-security-oauth2/src/main/java/org/springframework/security/oauth2/client/http/OAuth2ErrorHandler.java

@@ -118,7 +118,7 @@ public void close() {
 				}
 
 				public int getRawStatusCode() throws IOException {
-					return response.getRawStatusCode();
+					return this.getStatusCode().value();
 				}
 			};
 

Diff for: spring-security-oauth2/src/test/java/org/springframework/security/oauth2/config/annotation/Gh808EnableAuthorizationServerTests.java

@@ -33,6 +33,8 @@
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.codec.Base64;
+import org.springframework.security.crypto.password.NoOpPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;
 import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter;
 import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
@@ -188,5 +190,10 @@ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundEx
 				}
 			};
 		}
+
+		@Bean
+		public PasswordEncoder passwordEncoder() {
+			return NoOpPasswordEncoder.getInstance();
+		}
 	}
 }

Diff for: spring-security-oauth2/src/test/java/org/springframework/security/oauth2/config/annotation/ResourceServerConfigurationTests.java

@@ -36,6 +36,8 @@
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.crypto.codec.Base64;
+import org.springframework.security.crypto.password.NoOpPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.oauth2.common.DefaultOAuth2AccessToken;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;
@@ -253,6 +255,10 @@ public void configure(ClientDetailsServiceConfigurer clients) throws Exception {
 
 		@Configuration
 		protected static class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+			@Bean
+			public PasswordEncoder passwordEncoder() {
+				return NoOpPasswordEncoder.getInstance();
+			}
 		}
 	}
 
@@ -275,6 +281,10 @@ public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws E
 		}
 		@Configuration
 		protected static class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+			@Bean
+			public PasswordEncoder passwordEncoder() {
+				return NoOpPasswordEncoder.getInstance();
+			}
 		}
 	}
 

Diff for: spring-security-oauth2/src/test/resources/org/springframework/security/oauth2/config/xml/authorization-server-client-credentials-password-invalid.xml

@@ -52,6 +52,7 @@
 
 	<authentication-manager id="usersAuthenticationManager">
 		<authentication-provider>
+			<password-encoder ref="passwordEncoder" />
 			<user-service>
 				<user name="acme" password="password" authorities="ROLE_USER" />
 			</user-service>
@@ -65,4 +66,6 @@
 		<oauth2:password authentication-manager-ref="usersAuthenticationManager"  />
 	</oauth2:authorization-server>
 
+	<b:bean id="passwordEncoder" class="org.springframework.security.crypto.password.NoOpPasswordEncoder" factory-method="getInstance" />
+
 </b:beans>

Diff for: spring-security-oauth2/src/test/resources/org/springframework/security/oauth2/config/xml/authorization-server-client-credentials-password-valid.xml

@@ -33,7 +33,9 @@
 	</b:bean>
 
 	<authentication-manager id="clientsAuthenticationManager">
-		<authentication-provider user-service-ref="clientDetailsUserDetailsService" />
+		<authentication-provider user-service-ref="clientDetailsUserDetailsService">
+			<password-encoder ref="passwordEncoder" />
+		</authentication-provider>
 	</authentication-manager>
 
 	<b:bean id="clientDetailsUserDetailsService" class="org.springframework.security.oauth2.provider.client.ClientDetailsUserDetailsService">
@@ -46,6 +48,7 @@
 
 	<authentication-manager id="usersAuthenticationManager">
 		<authentication-provider>
+			<password-encoder ref="passwordEncoder" />
 			<user-service>
 				<user name="acme" password="password" authorities="ROLE_USER" />
 			</user-service>
@@ -59,4 +62,6 @@
 		<oauth2:password authentication-manager-ref="usersAuthenticationManager"  />
 	</oauth2:authorization-server>
 
+	<b:bean id="passwordEncoder" class="org.springframework.security.crypto.password.NoOpPasswordEncoder" factory-method="getInstance" />
+
 </b:beans>