Spring/spring-integration-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Mockito-2.10.0 and appropriate fixes

Browse Source
This commit is contained in:
Artem Bilan
2017-09-21 15:46:21 -04:00
parent e8fc589c5d
commit 6ce495e427
66 changed files with 213 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java
View File

@@ -20,6 +20,7 @@ import static org.junit.Assert.assertTrue;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.StringWriter;
import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
@@ -40,7 +41,6 @@ import org.springframework.http.ResponseEntity;
import org.springframework.http.client.ClientHttpRequest;
import org.springframework.integration.samples.rest.domain.EmployeeList;
import org.springframework.oxm.jaxb.Jaxb2Marshaller;
import org.springframework.security.crypto.codec.Base64;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.web.client.HttpMessageConverterExtractor;
@@ -141,7 +141,7 @@ public class RestHttpClientTest {
String password = "spring";
String combinedUsernamePassword = username+":"+password;
byte[] base64Token = Base64.encode(combinedUsernamePassword.getBytes());
byte[] base64Token = Base64.getEncoder().encode(combinedUsernamePassword.getBytes());
String base64EncodedToken = new String (base64Token);
//adding Authorization header for HTTP Basic authentication
headers.add("Authorization","Basic "+base64EncodedToken);