Skip to content

Commit b38f977

Browse files
committed
Updating test files for middlewares and HttpClient
1 parent c86ca67 commit b38f977

File tree

4 files changed

+23
-25
lines changed

4 files changed

+23
-25
lines changed

src/main/java/com/microsoft/graph/httpcore/HttpClients.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,6 @@ public static HttpClientBuilder custom() {
1717
return HttpClientBuilder.create();
1818
}
1919

20-
/**
21-
* Creates {@link CloseableHttpClient} instance with default
22-
* configuration.
23-
*/
24-
public static CloseableHttpClient createDefault() {
25-
RequestConfig config = RequestConfig.custom().setMaxRedirects(5).build();
26-
return HttpClientBuilder.create().addInterceptorFirst(new AuthenticationHandler(null))
27-
.setRedirectStrategy(new RedirectHandler())
28-
.setServiceUnavailableRetryStrategy(new RetryHandler())
29-
.setDefaultRequestConfig(config)
30-
.build();
31-
}
32-
3320
/**
3421
* Creates {@link CloseableHttpClient} instance with default
3522
* configuration and provided authProvider

src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public static String getToken() {
2121
return "Bearer " + token;
2222
}
2323
public void authenticateRequest(HttpRequest request) {
24-
// TODO Auto-generated method stub
2524
request.addHeader("Authorization", AuthProvider.getToken());
2625
}
2726
}
@@ -38,7 +37,6 @@ public void testAuthenticationHandler() {
3837
Header header = httpget.getFirstHeader("Authorization");
3938
assertTrue(header.getValue().equals("Bearer " + token));
4039
} catch (HttpException | IOException e) {
41-
// TODO Auto-generated catch block
4240
e.printStackTrace();
4341
fail("Authentication handler failure");
4442
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.microsoft.graph.httpcore;
2+
3+
import static org.junit.Assert.assertTrue;
4+
5+
import org.apache.http.HttpRequest;
6+
import org.apache.http.impl.client.CloseableHttpClient;
7+
import org.junit.Test;
8+
9+
public class HttpClientsTest {
10+
11+
@Test
12+
public void testHttpClientCreation() {
13+
IAuthenticationProvider authprovider = new IAuthenticationProvider() {
14+
@Override
15+
public void authenticateRequest(HttpRequest request) {
16+
request.addHeader("Authorization", "TOKEN");
17+
}
18+
};
19+
CloseableHttpClient httpclient = HttpClients.createDefault(authprovider);
20+
assertTrue(httpclient != null);
21+
}
22+
23+
}

src/test/java/com/microsoft/graph/httpcore/RedirectHandlerTest.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
import org.apache.http.client.methods.HttpPost;
1414
import org.apache.http.client.protocol.HttpClientContext;
1515
import org.apache.http.message.BasicHttpResponse;
16-
import org.junit.After;
17-
import org.junit.AfterClass;
18-
import org.junit.Before;
19-
import org.junit.BeforeClass;
2016
import org.junit.Test;
2117

2218
public class RedirectHandlerTest {
@@ -31,7 +27,6 @@ public void testIsRedirectedFailure() {
3127
boolean isRedirected = redirectHandler.isRedirected(httpget, response, localContext);
3228
assertTrue(!isRedirected);
3329
} catch (ProtocolException e) {
34-
// TODO Auto-generated catch block
3530
e.printStackTrace();
3631
fail("Redirect handler isRedirect failure");
3732
}
@@ -47,7 +42,6 @@ public void testIsRedirectedFailure1() {
4742
boolean isRedirected = redirectHandler.isRedirected(httpget, response, localContext);
4843
assertTrue(!isRedirected);
4944
} catch (ProtocolException e) {
50-
// TODO Auto-generated catch block
5145
e.printStackTrace();
5246
fail("Redirect handler isRedirect failure");
5347
}
@@ -64,7 +58,6 @@ public void testIsRedirectedSuccess() {
6458
boolean isRedirected = redirectHandler.isRedirected(httpget, response, localContext);
6559
assertTrue(isRedirected);
6660
} catch (ProtocolException e) {
67-
// TODO Auto-generated catch block
6861
e.printStackTrace();
6962
fail("Redirect handler isRedirect failure");
7063
}
@@ -83,7 +76,6 @@ public void testGetRedirectForGetMethod() {
8376
final String method = request.getRequestLine().getMethod();
8477
assertTrue(method.equalsIgnoreCase(HttpGet.METHOD_NAME));
8578
} catch (ProtocolException e) {
86-
// TODO Auto-generated catch block
8779
e.printStackTrace();
8880
fail("Redirect handler isRedirect failure");
8981
}
@@ -102,7 +94,6 @@ public void testGetRedirectForHeadMethod() {
10294
final String method = request.getRequestLine().getMethod();
10395
assertTrue(method.equalsIgnoreCase(HttpHead.METHOD_NAME));
10496
} catch (ProtocolException e) {
105-
// TODO Auto-generated catch block
10697
e.printStackTrace();
10798
fail("Redirect handler isRedirect failure");
10899
}
@@ -140,7 +131,6 @@ public void testGetRedirectForPostMethod1() {
140131
final String method = request.getRequestLine().getMethod();
141132
assertTrue(method.equalsIgnoreCase(HttpGet.METHOD_NAME));
142133
} catch (ProtocolException e) {
143-
// TODO Auto-generated catch block
144134
e.printStackTrace();
145135
fail("Redirect handler isRedirect failure");
146136
}

0 commit comments

Comments
 (0)