mindol1004/spring-boot-rest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrades to spring security 3.2 - testing work as well

Browse Source
This commit is contained in:
eugenp
2013-12-18 13:16:19 +02:00
parent 56240e0fce
commit f58149a0cc
14 changed files with 30 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
spring-security-rest-basic-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java
View File

@@ -13,18 +13,18 @@ import javax.net.ssl.SSLPeerUnverifiedException;
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.params.ClientPNames;
import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.conn.scheme.Scheme;
import org.apache.http.conn.scheme.SchemeRegistry;
import org.apache.http.conn.ssl.SSLSocketFactory;
import org.apache.http.conn.ssl.TrustStrategy;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.conn.PoolingClientConnectionManager;
import org.apache.http.params.CoreConnectionPNames;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
import org.junit.Ignore;
import org.junit.Test;
public class RawClientLiveTest {
@@ -33,14 +33,12 @@ public class RawClientLiveTest {
@Test
public final void whenSecuredRestApiIsConsumed_then200OK() throws ClientProtocolException, IOException {
final DefaultHttpClient httpClient = new DefaultHttpClient();
final CloseableHttpClient httpClient = HttpClientBuilder.create().build();
final int timeout = 20; // seconds
final HttpParams httpParams = httpClient.getParams();
configureViaRawApi(timeout, httpParams);
// configureViaHighLevelApi(timeout, httpParams);
final RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(timeout).setConnectTimeout(timeout).setSocketTimeout(timeout).build();
final HttpGet getMethod = new HttpGet("http://localhost:8080/spring-security-rest-basic-auth/api/bars/1");
getMethod.setConfig(requestConfig);
final int hardTimeout = 5; // seconds
final TimerTask task = new TimerTask() {
@@ -58,8 +56,9 @@ public class RawClientLiveTest {
}
@Test(expected = SSLPeerUnverifiedException.class)
@Ignore("Only for a server that has HTTPS enabled (on 8443)")
public final void whenHttpsUrlIsConsumed_thenException() throws ClientProtocolException, IOException {
final DefaultHttpClient httpClient = new DefaultHttpClient();
final CloseableHttpClient httpClient = HttpClientBuilder.create().build();
final String urlOverHttps = "https://localhost:8443/spring-security-rest-basic-auth/api/bars/1";
final HttpGet getMethod = new HttpGet(urlOverHttps);
@@ -80,7 +79,7 @@ public class RawClientLiveTest {
registry.register(new Scheme("https", 8443, sf));
final ClientConnectionManager ccm = new PoolingClientConnectionManager(registry);
final DefaultHttpClient httpClient = new DefaultHttpClient(ccm);
final CloseableHttpClient httpClient = new DefaultHttpClient(ccm);
final String urlOverHttps = "https://localhost:8443/spring-security-rest-basic-auth/api/bars/1";
final HttpGet getMethod = new HttpGet(urlOverHttps);
@@ -88,17 +87,4 @@ public class RawClientLiveTest {
assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
}
// util
final void configureViaHighLevelApi(final int timeout, final HttpParams httpParams) {
HttpConnectionParams.setConnectionTimeout(httpParams, timeout * 1000); // http.connection.timeout
HttpConnectionParams.setSoTimeout(httpParams, timeout * 1000); // http.socket.timeout
httpParams.setParameter(ClientPNames.CONN_MANAGER_TIMEOUT, new Long(timeout * 1000));
}
final void configureViaRawApi(final int timeout, final HttpParams httpParams) {
httpParams.setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, timeout * 1000);
httpParams.setParameter(CoreConnectionPNames.SO_TIMEOUT, timeout * 1000);
httpParams.setParameter(ClientPNames.CONN_MANAGER_TIMEOUT, new Long(timeout * 1000));
}
}