Skip to content

Commit 0ecb41c

Browse files
deepak2016deepak2016
committed
Update variables used in Retry and Redirect handler tests.
1 parent 266331e commit 0ecb41c

File tree

2 files changed

+36
-30
lines changed

2 files changed

+36
-30
lines changed

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

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,59 +16,62 @@
1616
import org.junit.Test;
1717

1818
public class RedirectHandlerTest {
19+
20+
String testmeurl = "https://graph.microsoft.com/v1.0/me/";
21+
String testurl = "https://graph.microsoft.com/v1.0/";
1922

2023
@Test
2124
public void testIsRedirectedFailure() {
2225
RedirectHandler redirectHandler = RedirectHandler.INSTANCE;
23-
HttpGet httpget = new HttpGet("https://graph.microsoft.com/v1.0/me/");
26+
HttpGet httpget = new HttpGet(testmeurl);
2427
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_MOVED_TEMPORARILY, "Moved Temporarily");
2528
HttpClientContext localContext = HttpClientContext.create();
2629
try {
2730
boolean isRedirected = redirectHandler.isRedirected(httpget, response, localContext);
2831
assertTrue(!isRedirected);
2932
} catch (ProtocolException e) {
3033
e.printStackTrace();
31-
fail("Redirect handler isRedirect failure");
34+
fail("Redirect handler testIsRedirectedFailure failure");
3235
}
3336
}
3437

3538
@Test
3639
public void testIsRedirectedFailure1() {
3740
RedirectHandler redirectHandler = RedirectHandler.INSTANCE;
38-
HttpGet httpget = new HttpGet("https://graph.microsoft.com/v1.0/me/");
41+
HttpGet httpget = new HttpGet(testmeurl);
3942
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_BAD_REQUEST, "Bad Request");
4043
HttpClientContext localContext = HttpClientContext.create();
4144
try {
4245
boolean isRedirected = redirectHandler.isRedirected(httpget, response, localContext);
4346
assertTrue(!isRedirected);
4447
} catch (ProtocolException e) {
4548
e.printStackTrace();
46-
fail("Redirect handler isRedirect failure");
49+
fail("Redirect handler testIsRedirectedFailure1 failure");
4750
}
4851
}
4952

5053
@Test
5154
public void testIsRedirectedSuccess() {
5255
RedirectHandler redirectHandler = RedirectHandler.INSTANCE;
53-
HttpGet httpget = new HttpGet("https://graph.microsoft.com/v1.0/me/");
56+
HttpGet httpget = new HttpGet(testmeurl);
5457
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_MOVED_TEMPORARILY, "Moved Temporarily");
55-
response.setHeader("location", "https://graph.microsoft.com/v1.0/me/");
58+
response.setHeader("location", testmeurl);
5659
HttpClientContext localContext = HttpClientContext.create();
5760
try {
5861
boolean isRedirected = redirectHandler.isRedirected(httpget, response, localContext);
5962
assertTrue(isRedirected);
6063
} catch (ProtocolException e) {
6164
e.printStackTrace();
62-
fail("Redirect handler isRedirect failure");
65+
fail("Redirect handler testIsRedirectedSuccess failure");
6366
}
6467
}
6568

6669
@Test
6770
public void testGetRedirectForGetMethod() {
6871
RedirectHandler redirectHandler = RedirectHandler.INSTANCE;
69-
HttpGet httpget = new HttpGet("https://graph.microsoft.com/v1.0/");
72+
HttpGet httpget = new HttpGet(testurl);
7073
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_MOVED_TEMPORARILY, "Moved Temporarily");
71-
response.setHeader("location", "https://graph.microsoft.com/v1.0/me/");
74+
response.setHeader("location", testmeurl);
7275
HttpClientContext localContext = HttpClientContext.create();
7376
try {
7477
HttpRequest request = redirectHandler.getRedirect(httpget, response, localContext);
@@ -77,16 +80,16 @@ public void testGetRedirectForGetMethod() {
7780
assertTrue(method.equalsIgnoreCase(HttpGet.METHOD_NAME));
7881
} catch (ProtocolException e) {
7982
e.printStackTrace();
80-
fail("Redirect handler isRedirect failure");
83+
fail("Redirect handler testGetRedirectForGetMethod failure");
8184
}
8285
}
8386

8487
@Test
8588
public void testGetRedirectForHeadMethod() {
8689
RedirectHandler redirectHandler = RedirectHandler.INSTANCE;
87-
HttpHead httphead = new HttpHead("https://graph.microsoft.com/v1.0/");
90+
HttpHead httphead = new HttpHead(testurl);
8891
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_MOVED_TEMPORARILY, "Moved Temporarily");
89-
response.setHeader("location", "https://graph.microsoft.com/v1.0/me/");
92+
response.setHeader("location", testmeurl);
9093
HttpClientContext localContext = HttpClientContext.create();
9194
try {
9295
HttpRequest request = redirectHandler.getRedirect(httphead, response, localContext);
@@ -95,35 +98,34 @@ public void testGetRedirectForHeadMethod() {
9598
assertTrue(method.equalsIgnoreCase(HttpHead.METHOD_NAME));
9699
} catch (ProtocolException e) {
97100
e.printStackTrace();
98-
fail("Redirect handler isRedirect failure");
101+
fail("Redirect handler testGetRedirectForHeadMethod failure");
99102
}
100103
}
101104

102105
@Test
103106
public void testGetRedirectForPostMethod() {
104107
RedirectHandler redirectHandler = RedirectHandler.INSTANCE;
105-
HttpPost httppost = new HttpPost("https://graph.microsoft.com/v1.0/");
108+
HttpPost httppost = new HttpPost(testurl);
106109
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_MOVED_TEMPORARILY, "Moved Temporarily");
107-
response.setHeader("location", "https://graph.microsoft.com/v1.0/me/");
110+
response.setHeader("location", testmeurl);
108111
HttpClientContext localContext = HttpClientContext.create();
109112
try {
110113
HttpRequest request = redirectHandler.getRedirect(httppost, response, localContext);
111114
assertTrue(request != null);
112115
final String method = request.getRequestLine().getMethod();
113116
assertTrue(method.equalsIgnoreCase(HttpPost.METHOD_NAME));
114117
} catch (ProtocolException e) {
115-
// TODO Auto-generated catch block
116118
e.printStackTrace();
117-
fail("Redirect handler isRedirect failure");
119+
fail("Redirect handler testGetRedirectForPostMethod failure");
118120
}
119121
}
120122

121123
@Test
122124
public void testGetRedirectForPostMethod1() {
123125
RedirectHandler redirectHandler = RedirectHandler.INSTANCE;
124-
HttpPost httppost = new HttpPost("https://graph.microsoft.com/v1.0/");
126+
HttpPost httppost = new HttpPost(testurl);
125127
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_SEE_OTHER, "See Other");
126-
response.setHeader("location", "https://graph.microsoft.com/v1.0/me/");
128+
response.setHeader("location", testmeurl);
127129
HttpClientContext localContext = HttpClientContext.create();
128130
try {
129131
HttpRequest request = redirectHandler.getRedirect(httppost, response, localContext);
@@ -132,7 +134,7 @@ public void testGetRedirectForPostMethod1() {
132134
assertTrue(method.equalsIgnoreCase(HttpGet.METHOD_NAME));
133135
} catch (ProtocolException e) {
134136
e.printStackTrace();
135-
fail("Redirect handler isRedirect failure");
137+
fail("Redirect handler testGetRedirectForPostMethod1 failure");
136138
}
137139
}
138140

‎src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,39 @@
1818
import org.junit.Test;
1919

2020
public class RetryHandlerTest {
21+
22+
int maxRetries = 2;
23+
int retryInterval = 2000;
24+
String testurl = "https://graph.microsoft.com/v1.0/";
2125

2226
@Test
2327
public void testRetryHandlerCreation() {
24-
RetryHandler retryhandler = new RetryHandler(2, 2000);
25-
assertTrue(retryhandler.getRetryInterval() == 2000);
28+
RetryHandler retryhandler = new RetryHandler(maxRetries, retryInterval);
29+
assertTrue(retryhandler.getRetryInterval() == retryInterval);
2630
}
2731

2832
@Test
2933
public void testRetryRequestWithMaxRetryAttempts() {
30-
RetryHandler retryhandler = new RetryHandler(2, 2000);
34+
RetryHandler retryhandler = new RetryHandler(maxRetries, retryInterval);
3135
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_GATEWAY_TIMEOUT, "Gateway Timeout");
3236
HttpClientContext localContext = HttpClientContext.create();
3337
assertFalse(retryhandler.retryRequest(response, 3, localContext));
3438
}
3539

3640
@Test
3741
public void testRetryRequestForStatusCode() {
38-
RetryHandler retryhandler = new RetryHandler(2, 2000);
42+
RetryHandler retryhandler = new RetryHandler(maxRetries, retryInterval);
3943
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_INTERNAL_SERVER_ERROR, "Internal Server Error");
4044
HttpClientContext localContext = HttpClientContext.create();
4145
assertFalse(retryhandler.retryRequest(response, 1, localContext));
4246
}
4347

4448
@Test
4549
public void testRetryRequestWithTransferEncoding() {
46-
RetryHandler retryhandler = new RetryHandler(2, 2000);
50+
RetryHandler retryhandler = new RetryHandler(maxRetries, retryInterval);
4751
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_GATEWAY_TIMEOUT, "Internal Server Error");
4852
response.setHeader("Transfer-Encoding", "chunked");
49-
HttpPost httppost = new HttpPost("https://graph.microsoft.com/v1.0/");
53+
HttpPost httppost = new HttpPost(testurl);
5054

5155
try {
5256
HttpEntity entity = new StringEntity("TEST");
@@ -63,9 +67,9 @@ public void testRetryRequestWithTransferEncoding() {
6367

6468
@Test
6569
public void testRetryRequestWithExponentialBackOff() {
66-
RetryHandler retryhandler = new RetryHandler(2, 2000);
70+
RetryHandler retryhandler = new RetryHandler(maxRetries, retryInterval);
6771
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_GATEWAY_TIMEOUT, "Internal Server Error");
68-
HttpPost httppost = new HttpPost("https://graph.microsoft.com/v1.0/");
72+
HttpPost httppost = new HttpPost(testurl);
6973

7074
try {
7175
HttpEntity entity = new StringEntity("TEST");
@@ -83,10 +87,10 @@ public void testRetryRequestWithExponentialBackOff() {
8387

8488
@Test
8589
public void testRetryHandlerRetryRequestWithRetryAfterHeader() {
86-
RetryHandler retryhandler = new RetryHandler(2, 2000);
90+
RetryHandler retryhandler = new RetryHandler(maxRetries, retryInterval);
8791
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_GATEWAY_TIMEOUT, "Internal Server Error");
8892
response.setHeader("Retry-After", "100");
89-
HttpPost httppost = new HttpPost("https://graph.microsoft.com/v1.0/");
93+
HttpPost httppost = new HttpPost(testurl);
9094

9195
try {
9296
HttpEntity entity = new StringEntity("TEST");

0 commit comments

Comments
 (0)