Skip to content

Commit b8c4236

Browse files
baywetbaywet
committed
- lints unit tests
1 parent 27aec57 commit b8c4236

13 files changed

+53
-52
lines changed

‎src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
public class TokenCredentialAuthProviderTest {
1717

18-
public final String testToken = "CredentialTestToken";
18+
private static final String testToken = "CredentialTestToken";
1919

2020
@Test
2121
public void providerAddsTokenOnValidHostName() throws MalformedURLException, InterruptedException,

‎src/test/java/com/microsoft/graph/content/BatchResponseContentTest.java‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
import static org.junit.jupiter.api.Assertions.assertThrows;
44
import static org.junit.jupiter.api.Assertions.assertTrue;
5+
import static org.junit.jupiter.api.Assertions.fail;
56
import static org.junit.jupiter.api.Assertions.assertEquals;
67
import static org.junit.jupiter.api.Assertions.assertNull;
78
import static org.junit.jupiter.api.Assertions.assertNotNull;
89
import static org.mockito.Mockito.mock;
910

1011
import java.io.IOException;
1112
import java.util.Iterator;
12-
import java.util.Map;
1313

1414
import com.google.gson.JsonElement;
1515
import com.microsoft.graph.http.GraphErrorResponse;
@@ -20,13 +20,6 @@
2020

2121
import org.junit.jupiter.api.Test;
2222

23-
import okhttp3.MediaType;
24-
import okhttp3.Protocol;
25-
import okhttp3.Request;
26-
import okhttp3.RequestBody;
27-
import okhttp3.Response;
28-
import okhttp3.ResponseBody;
29-
3023
public class BatchResponseContentTest {
3124
@Test
3225
public void testValidBatchResponseContent() {
@@ -102,20 +95,23 @@ public void deserializesErrorsProperly() {
10295
String responsebody = "{\"responses\":[{\"id\":\"1\",\"status\":400,\"headers\":{\"Cache-Control\":\"no-cache\",\"x-ms-resource-unit\":\"1\",\"Content-Type\":\"application/json\"},\"body\":{\"error\":{\"code\":\"Request_BadRequest\",\"message\":\"Avalueisrequiredforproperty'displayName'ofresource'User'.\",\"innerError\":{\"date\":\"2021-02-02T19:19:38\",\"request-id\":\"408b8e64-4047-4c97-95b6-46e9f212ab48\",\"client-request-id\":\"102910da-260c-3028-0fb3-7d6903a02622\"}}}}]}";
10396
ISerializer serializer = new DefaultSerializer(mock(ILogger.class));
10497
BatchResponseContent batchresponse = serializer.deserializeObject(responsebody, BatchResponseContent.class);
105-
if(batchresponse != null && batchresponse.responses != null) // this is done by the batch request in the fluent API
106-
for(final BatchResponseStep<?> step : batchresponse.responses) {
107-
step.serializer = serializer;
98+
if(batchresponse != null) {
99+
if(batchresponse.responses != null) // this is done by the batch request in the fluent API
100+
for(final BatchResponseStep<?> step : batchresponse.responses) {
101+
step.serializer = serializer;
102+
}
103+
assertThrows(GraphServiceException.class, () -> {
104+
batchresponse.getResponseById("1").getDeserializedBody(BatchRequestContent.class);
105+
});
106+
try {
107+
batchresponse.getResponseById("1").getDeserializedBody(BatchRequestContent.class);
108+
} catch(GraphServiceException ex) {
109+
final GraphErrorResponse response = ex.getError();
110+
assertNotNull(response);
111+
assertNotNull(response.error);
112+
assertNotNull(response.error.message);
108113
}
109-
assertThrows(GraphServiceException.class, () -> {
110-
final Object body = batchresponse.getResponseById("1").getDeserializedBody(BatchRequestContent.class);
111-
});
112-
try {
113-
final Object body = batchresponse.getResponseById("1").getDeserializedBody(BatchRequestContent.class);
114-
} catch(GraphServiceException ex) {
115-
final GraphErrorResponse response = ex.getError();
116-
assertNotNull(response);
117-
assertNotNull(response.error);
118-
assertNotNull(response.error.message);
119-
}
114+
} else
115+
fail("batch response was null");
120116
}
121117
}

‎src/test/java/com/microsoft/graph/core/BaseClientTests.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import okhttp3.OkHttpClient;
1616
import okhttp3.Request;
17+
import okhttp3.RequestBody;
1718
import okio.BufferedSink;
1819
import okio.Okio;
1920

@@ -97,11 +98,15 @@ public void testCustomRequest() {
9798
}
9899
private String getStringFromRequestBody(Request request) {
99100
try {
100-
ByteArrayOutputStream out = new ByteArrayOutputStream();
101-
final BufferedSink buffer = Okio.buffer(Okio.sink(out));
102-
request.body().writeTo(buffer);
103-
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
104-
return CoreHttpProvider.streamToString(in);
101+
try(final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
102+
final BufferedSink buffer = Okio.buffer(Okio.sink(out));
103+
final RequestBody body = request.body();
104+
if(body != null)
105+
body.writeTo(buffer);
106+
try(final ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray())) {
107+
return CoreHttpProvider.streamToString(in);
108+
}
109+
}
105110
} catch (Exception ex) {
106111
ex.printStackTrace();
107112
return "";

‎src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.io.InputStream;
1111
import java.util.List;
1212
import java.util.Map;
13+
import java.util.concurrent.CompletableFuture;
1314

1415
import org.junit.jupiter.api.Test;
1516

@@ -119,12 +120,12 @@ public ISerializer getSerializer() {
119120

120121
@Override
121122
public <Result, BodyType> java.util.concurrent.CompletableFuture<Result> sendAsync(IHttpRequest request, Class<Result> resultClass, BodyType serializable) {
122-
return null;
123+
return CompletableFuture.completedFuture(null);
123124
}
124125

125126
@Override
126127
public <Result, BodyType, DeserializeType> java.util.concurrent.CompletableFuture<Result> sendAsync(IHttpRequest request, Class<Result> resultClass, BodyType serializable, final IStatefulResponseHandler<Result, DeserializeType> handler) {
127-
return null;
128+
return CompletableFuture.completedFuture(null);
128129
}
129130

130131
@Override

‎src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
public class BaseCollectionPageTests {
2424

2525
private BaseRequestBuilder<String> mRequestBuilder;
26-
private static ArrayList<String> list;
26+
private ArrayList<String> list;
2727
private BaseCollectionPage<String, BaseRequestBuilder<String>> baseCollectionPage;
2828
private String requestUrl = "https://a.b.c/";
2929

‎src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void testSend() {
9393

9494
@Test
9595
public void testPost() {
96-
final ICollectionResponse<JsonObject> result = mRequest.post(null);
96+
final ICollectionResponse<JsonObject> result = mRequest.post(new JsonObject());
9797
assertNotNull(result);
9898
assertEquals("zzz", result.values().get(0).get("id").getAsString());
9999
}
@@ -156,7 +156,7 @@ public void testGetMethod() {
156156
@Test
157157
public void testPostMethod() {
158158
assertNull(mRequest.getHttpMethod());
159-
mRequest.post(null);
159+
mRequest.post(new JsonObject());
160160
assertEquals(HttpMethod.POST, mRequest.getHttpMethod());
161161
}
162162

‎src/test/java/com/microsoft/graph/http/BaseRequestBuilderTests.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
44
import static org.junit.jupiter.api.Assertions.assertNotNull;
5+
import static org.mockito.Mockito.mock;
6+
7+
import com.microsoft.graph.core.IBaseClient;
58

69
import org.junit.jupiter.api.BeforeEach;
710
import org.junit.jupiter.api.Test;
811

9-
import okhttp3.Request;
10-
1112
/**
1213
* Test cases for {@see BaseRequestBuilder}
1314
*/
@@ -18,7 +19,7 @@ public class BaseRequestBuilderTests {
1819

1920
@BeforeEach
2021
public void setUp() throws Exception {
21-
baseRequestBuilder = new BaseRequestBuilder<>(expectedRequestUrl,null,null){};
22+
baseRequestBuilder = new BaseRequestBuilder<>(expectedRequestUrl, mock(IBaseClient.class), null){};
2223
}
2324

2425
@Test

‎src/test/java/com/microsoft/graph/http/BaseRequestTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void testSendWithCallback() throws InterruptedException, ExecutionExcepti
7575
public void testFunctionParameters() {
7676
final Option fo1 = new FunctionOption("1", "one");
7777
final Option fo2 = new FunctionOption("2", null);
78-
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(fo1, fo2), null){};
78+
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(fo1, fo2), Void.class){};
7979
assertEquals("https://a.b.c/(1='one',2=null)", request.getRequestUrl().toString());
8080
request.addFunctionOption(new FunctionOption("3","two"));;
8181
assertEquals("https://a.b.c/(1='one',2=null,3='two')", request.getRequestUrl().toString());
@@ -86,7 +86,7 @@ public void testFunctionParameters() {
8686
public void testQueryParameters() {
8787
final Option q1 = new QueryOption("q1","option1 ");
8888
final Option q2 = new QueryOption("q2","option2");
89-
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(q1, q2), null){};
89+
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(q1, q2), Void.class){};
9090
assertEquals("https://a.b.c/?q1=option1%20&q2=option2", request.getRequestUrl().toString());
9191
request.addQueryOption(new QueryOption("q3","option3"));
9292
assertEquals("https://a.b.c/?q1=option1%20&q2=option2&q3=option3", request.getRequestUrl().toString());
@@ -99,14 +99,14 @@ public void testFunctionAndQueryParameters() {
9999
final Option f2 = new FunctionOption("f2", null);
100100
final Option q1 = new QueryOption("q1","option1 ");
101101
final Option q2 = new QueryOption("q2","option2");
102-
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(f1, f2, q1, q2), null){};
102+
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(f1, f2, q1, q2), Void.class){};
103103
assertEquals("https://a.b.c/(f1='fun1',f2=null)?q1=option1%20&q2=option2", request.getRequestUrl().toString());
104104
assertEquals(4, request.getOptions().size());
105105
}
106106

107107
@Test
108108
public void testHttpMethod() {
109-
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), null, null){};
109+
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), null, Void.class){};
110110
assertNull(request.getHttpMethod());
111111
request.setHttpMethod(HttpMethod.GET);
112112
assertEquals(HttpMethod.GET, request.getHttpMethod());
@@ -116,7 +116,7 @@ public void testHttpMethod() {
116116
public void testHeader() {
117117
final String expectedHeader = "header key";
118118
final String expectedValue = "header value";
119-
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), null, null){};
119+
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), null, Void.class){};
120120
assertEquals(0, request.getHeaders().size());
121121
request.addHeader(expectedHeader,expectedValue);
122122
assertEquals(1,request.getHeaders().size());
@@ -128,7 +128,7 @@ public void testProtectedProperties() {
128128
assertEquals(0, mRequest.queryOptions.size());
129129
final Option q1 = new QueryOption("q1","option1 ");
130130
final Option f1 = new FunctionOption("f1","option2");
131-
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(q1,f1), null){};
131+
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(q1,f1), Void.class){};
132132
assertEquals(1, request.functionOptions.size());
133133
assertEquals(1, request.queryOptions.size());
134134
assertEquals("q1", request.queryOptions.get(0).getName());

‎src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void testSend() throws IOException {
6060
mock(ILogger.class),
6161
mockClient);
6262
when(mBaseClient.getHttpProvider()).thenReturn(mProvider);
63-
final BaseStreamRequest<String> request = new BaseStreamRequest<>("https://a.b.c/", mBaseClient,null, null){};
63+
final BaseStreamRequest<String> request = new BaseStreamRequest<>("https://a.b.c/", mBaseClient,null, String.class){};
6464
request.send();
6565
}
6666

‎src/test/java/com/microsoft/graph/http/GraphFatalServiceExceptionTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ public class GraphFatalServiceExceptionTests {
1010

1111
@Test
1212
public void testGraphFatalServiceException() {
13-
GraphFatalServiceException exception = new GraphFatalServiceException(null,null,new ArrayList<String>(),null,401,"Unauthenticated",new ArrayList<String>(),null, false);
13+
GraphFatalServiceException exception = new GraphFatalServiceException("GET", "https://graph.microsoft.com/v1.0/me",new ArrayList<String>(),null,401,"Unauthenticated",new ArrayList<String>(),null, false);
1414
String expectedMessage = "Unexpected exception returned from the service." +
15-
"null null\n" +
15+
"GET https://graph.microsoft.com/v1.0/me\n" +
1616
"\n" +
1717
"\n" +
1818
"401 : Unauthenticated\n" +

0 commit comments

Comments
 (0)