Skip to content

Commit 567340e

Browse files
ramsessanchezramsessanchez
committed
java level 8 for tests
1 parent 36f9366 commit 567340e

4 files changed

Lines changed: 39 additions & 29 deletions

File tree

‎build.gradle‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ sourceSets {
6969
repositories {
7070
// You can declare any Maven/Ivy/file repository here.
7171
mavenCentral()
72+
maven {
73+
url "https://plugins.gradle.org/m2/" // Added for SonarQube
74+
}
7275
}
7376

7477
apply from: "gradle/dependencies.gradle"

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

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@
1515
import org.junit.jupiter.params.aggregator.ArgumentsAccessor;
1616
import org.junit.jupiter.params.provider.CsvSource;
1717

18+
import java.io.ByteArrayOutputStream;
1819
import java.io.IOException;
1920
import java.io.InputStream;
20-
import java.net.URISyntaxException;
2121
import java.nio.charset.StandardCharsets;
22-
import java.util.ArrayList;
23-
import java.util.List;
24-
import java.util.Locale;
25-
import java.util.Objects;
22+
import java.util.*;
2623

2724
import static org.junit.jupiter.api.Assertions.*;
2825
import static org.mockito.Mockito.*;
@@ -53,9 +50,9 @@ void BatchRequestContent_InitializeWithBatchRequestSteps() {
5350
@Test
5451
void BatchRequestContent_InitializeWithInvalidDependsOnIds() {
5552
BatchRequestStep requestStep = new BatchRequestStep("1", mock(Request.class));
56-
BatchRequestStep requestStep2 = new BatchRequestStep("2", mock(Request.class), List.of("3"));
53+
BatchRequestStep requestStep2 = new BatchRequestStep("2", mock(Request.class), Arrays.asList("3"));
5754
try {
58-
new BatchRequestContent(client, List.of(requestStep, requestStep2));
55+
new BatchRequestContent(client, Arrays.asList(requestStep, requestStep2));
5956
} catch (IllegalArgumentException ex) {
6057
assertEquals(ErrorConstants.Messages.INVALID_DEPENDS_ON_REQUEST_ID, ex.getMessage());
6158
}
@@ -84,7 +81,7 @@ void BatchRequestContent_AddBatchRequestStepToBatchRequestContentWithMaxSteps()
8481
@Test
8582
void BatchRequestContent_AddBatchRequestStepWithExistingRequestStep() {
8683
BatchRequestStep batchRequestStep = new BatchRequestStep("1", mock(Request.class));
87-
BatchRequestContent batchRequestContent = new BatchRequestContent(client, List.of(batchRequestStep));
84+
BatchRequestContent batchRequestContent = new BatchRequestContent(client, Arrays.asList(batchRequestStep));
8885

8986
assertFalse(batchRequestContent.addBatchRequestStep(batchRequestStep));
9087
assertNotNull(batchRequestContent.getBatchRequestSteps());
@@ -93,7 +90,7 @@ void BatchRequestContent_AddBatchRequestStepWithExistingRequestStep() {
9390
@Test
9491
void BatchRequestContent_AddBatchRequestStepWithNullRequestStep() {
9592
BatchRequestStep batchRequestStep = new BatchRequestStep("1", mock(Request.class));
96-
BatchRequestContent batchRequestContent = new BatchRequestContent(client, List.of(batchRequestStep));
93+
BatchRequestContent batchRequestContent = new BatchRequestContent(client, Arrays.asList(batchRequestStep));
9794

9895
assertFalse(batchRequestContent.addBatchRequestStep((BatchRequestStep) null));
9996
assertNotNull(batchRequestContent.getBatchRequestSteps());
@@ -102,8 +99,8 @@ void BatchRequestContent_AddBatchRequestStepWithNullRequestStep() {
10299
@Test
103100
void BatchRequestContent_RemoveBatchRequestStepWithIdForExistingId() {
104101
BatchRequestStep batchRequestStep = new BatchRequestStep("1", mock(Request.class));
105-
BatchRequestStep batchRequestStep2 = new BatchRequestStep("2", mock(Request.class), List.of("1", "1", "1"));
106-
BatchRequestContent batchRequestContent = new BatchRequestContent(client, List.of(batchRequestStep, batchRequestStep2));
102+
BatchRequestStep batchRequestStep2 = new BatchRequestStep("2", mock(Request.class), Arrays.asList("1", "1", "1"));
103+
BatchRequestContent batchRequestContent = new BatchRequestContent(client, Arrays.asList(batchRequestStep, batchRequestStep2));
107104

108105
assertTrue(batchRequestContent.removeBatchRequestStepWithId("1"));
109106
assertEquals(1, batchRequestContent.getBatchRequestSteps().size());
@@ -112,23 +109,23 @@ void BatchRequestContent_RemoveBatchRequestStepWithIdForExistingId() {
112109
@Test
113110
void BatchRequestContent_RemoveBatchRequestStepWithIdForNonExistingId() {
114111
BatchRequestStep batchRequestStep = new BatchRequestStep("1", mock(Request.class));
115-
BatchRequestStep batchRequestStep2 = new BatchRequestStep("2", mock(Request.class), List.of("1"));
116-
BatchRequestContent batchRequestContent = new BatchRequestContent(client, List.of(batchRequestStep, batchRequestStep2));
112+
BatchRequestStep batchRequestStep2 = new BatchRequestStep("2", mock(Request.class), Arrays.asList("1"));
113+
BatchRequestContent batchRequestContent = new BatchRequestContent(client, Arrays.asList(batchRequestStep, batchRequestStep2));
117114

118115
assertFalse(batchRequestContent.removeBatchRequestStepWithId("3"));
119116
assertEquals(2, batchRequestContent.getBatchRequestSteps().size());
120117
assertEquals(Objects.requireNonNull(batchRequestStep2.getDependsOn()).get(0), Objects.requireNonNull(batchRequestContent.getBatchRequestSteps().get("2").getDependsOn()).get(0));
121118
}
122119
@Test
123-
void BatchRequestContent_GetBatchRequestContentFromStep() throws IOException, URISyntaxException {
120+
void BatchRequestContent_GetBatchRequestContentFromStep() throws Exception {
124121
Request request = new Request.Builder().url(requestUrl).build();
125122
BatchRequestStep batchRequestStep = new BatchRequestStep("1", mock(Request.class));
126-
BatchRequestStep batchRequestStep2 = new BatchRequestStep("2", request, List.of("1"));
127-
BatchRequestContent batchRequestContent = new BatchRequestContent(client, List.of(batchRequestStep, batchRequestStep2));
123+
BatchRequestStep batchRequestStep2 = new BatchRequestStep("2", request, Arrays.asList("1"));
124+
BatchRequestContent batchRequestContent = new BatchRequestContent(client, Arrays.asList(batchRequestStep, batchRequestStep2));
128125

129126
batchRequestContent.removeBatchRequestStepWithId("1");
130127
InputStream requestContent = batchRequestContent.getBatchRequestContentAsync().join();
131-
String requestContentString = new String(requestContent.readAllBytes(), StandardCharsets.UTF_8);
128+
String requestContentString = readInputStream(requestContent);
132129
requestContentString = requestContentString.replace("\n", "").replaceAll("\\s", "");
133130
String expectedContent = "{\"requests\":[{\"id\":\"2\",\"url\":\"/me\",\"method\":\"GET\"}]}";
134131

@@ -137,7 +134,7 @@ void BatchRequestContent_GetBatchRequestContentFromStep() throws IOException, UR
137134
assertEquals(expectedContent, requestContentString);
138135
}
139136
@Test
140-
void BatchRequestContent_GetBatchRequestContentFromStepAsyncDoesNotModifyDateTimes() throws IOException {
137+
void BatchRequestContent_GetBatchRequestContentFromStepAsyncDoesNotModifyDateTimes() throws Exception {
141138
String bodyString = "{\n" +
142139
" \"subject\": \"Lets go for lunch\",\n" +
143140
" \"body\": {\n \"contentType\": \"HTML\",\n" +
@@ -165,11 +162,11 @@ void BatchRequestContent_GetBatchRequestContentFromStepAsyncDoesNotModifyDateTim
165162
"}";
166163
Request eventRequest = new Request.Builder().url(requestUrl).method("POST", RequestBody.create(bodyString, MediaType.parse("application/json"))).build();
167164
BatchRequestStep batchRequestStep = new BatchRequestStep("1", new Request.Builder().url(requestUrl).build());
168-
BatchRequestStep batchRequestSte2 = new BatchRequestStep("2", eventRequest, List.of("1"));
169-
BatchRequestContent batchRequestContent = new BatchRequestContent(client, List.of(batchRequestStep, batchRequestSte2));
165+
BatchRequestStep batchRequestSte2 = new BatchRequestStep("2", eventRequest, Arrays.asList("1"));
166+
BatchRequestContent batchRequestContent = new BatchRequestContent(client, Arrays.asList(batchRequestStep, batchRequestSte2));
170167

171168
InputStream stream = batchRequestContent.getBatchRequestContentAsync().join();
172-
String requestContentString = new String(stream.readAllBytes(), StandardCharsets.UTF_8);
169+
String requestContentString = readInputStream(stream);
173170
String expectedJson = "{\n" +
174171
" \"requests\": [\n" +
175172
" {\n" +
@@ -272,7 +269,7 @@ void BatchRequestContent_AddBatchRequestStepWithBaseRequest() throws IOException
272269
assertEquals(batchRequestContent.getBatchRequestSteps().get(requestId).getRequest().method(), requestInfo.httpMethod.toString());
273270
}
274271
@Test
275-
void BatchRequestContent_AddBatchRequestStepWithBaseRequestWithHeaderOptions() throws IOException {
272+
void BatchRequestContent_AddBatchRequestStepWithBaseRequestWithHeaderOptions() throws Exception {
276273
BatchRequestContent batchRequestContent = new BatchRequestContent(client);
277274
Request request = new Request.Builder()
278275
.url(requestUrl)
@@ -286,7 +283,7 @@ void BatchRequestContent_AddBatchRequestStepWithBaseRequestWithHeaderOptions() t
286283
assertNotNull(Objects.requireNonNull(batchRequestContent.getBatchRequestSteps().get(requestId).getRequest().body()).contentType());
287284

288285
InputStream stream = batchRequestContent.getBatchRequestContentAsync().join();
289-
String requestContentString = new String(stream.readAllBytes(), StandardCharsets.UTF_8);
286+
String requestContentString = readInputStream(stream);
290287
String expectedJsonSection = " \"url\": \"/me\"," +
291288
" \"method\": \"POST\"," +
292289
" \"body\": {}," +
@@ -329,15 +326,15 @@ void BatchRequestContent_AddBatchRequestStepWithBaseRequestToBatchRequestContent
329326
"https://graph.microsoft.com/v1.0/users?$filter=identities/any(id:id/issuer%20eq%20'$74707853-18b3-411f-ad57-2ef65f6fdeb0'%20and%20id/issuerAssignedId%20eq%20'**bobbetancourt@fakeemail.com**') , /users?$filter=identities/any(id:id/issuer%20eq%20%27$74707853-18b3-411f-ad57-2ef65f6fdeb0%27%20and%20id/issuerAssignedId%20eq%20%27**bobbetancourt@fakeemail.com**%27)" ,
330327
"https://graph.microsoft.com/beta/users?$filter=identities/any(id:id/issuer%20eq%20'$74707853-18b3-411f-ad57-2ef65f6fdeb0'%20and%20id/issuerAssignedId%20eq%20'**bobbetancourt@fakeemail.com**')&$top=1 , /users?$filter=identities/any(id:id/issuer%20eq%20%27$74707853-18b3-411f-ad57-2ef65f6fdeb0%27%20and%20id/issuerAssignedId%20eq%20%27**bobbetancourt@fakeemail.com**%27)&$top=1" ,
331328
})
332-
void BatchRequestContent_AddBatchRequestStepWithBaseRequestProperlySetsVersion(ArgumentsAccessor argumentsAccessor) throws IOException {
329+
void BatchRequestContent_AddBatchRequestStepWithBaseRequestProperlySetsVersion(ArgumentsAccessor argumentsAccessor) throws Exception {
333330
Request request = new Request.Builder().url(argumentsAccessor.getString(0)).build();
334331
BatchRequestStep batchRequestStep = new BatchRequestStep("1", request);
335332
BatchRequestContent batchRequestContent = new BatchRequestContent(client);
336333
assertTrue(batchRequestContent.getBatchRequestSteps().isEmpty());
337334

338335
batchRequestContent.addBatchRequestStep(batchRequestStep);
339336
InputStream stream = batchRequestContent.getBatchRequestContentAsync().join();
340-
String requestContentString = new String(stream.readAllBytes(), StandardCharsets.UTF_8);
337+
String requestContentString = readInputStream(stream);
341338
String expectedJson = "{" +
342339
" \"requests\": [" +
343340
" {" +
@@ -352,4 +349,14 @@ void BatchRequestContent_AddBatchRequestStepWithBaseRequestProperlySetsVersion(A
352349
requestContentString = requestContentString.replaceAll("\\s", "").replace("\n", "");
353350
assertEquals(expectedJson, requestContentString);
354351
}
352+
private static String readInputStream(InputStream stream) throws Exception {
353+
ByteArrayOutputStream result = new ByteArrayOutputStream();
354+
byte[] buffer = new byte[1024];
355+
int length;
356+
while ((length = stream.read(buffer)) != -1) {
357+
result.write(buffer, 0, length);
358+
}
359+
return new String(result.toByteArray(), StandardCharsets.UTF_8);
360+
}
361+
355362
}

‎src/test/java/com/microsoft/graph/requests/BatchRequestBuilderTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import okhttp3.RequestBody;
1212
import org.junit.jupiter.api.Test;
1313

14-
import java.util.List;
14+
import java.util.Arrays;
1515

1616
import static org.junit.jupiter.api.Assertions.assertEquals;
1717

@@ -26,9 +26,9 @@ void BatchRequestBuilder_DefaultBuilderTest() {
2626
RequestBody requestBody = RequestBody.create("{}", MediaType.get(CoreConstants.MimeTypeNames.APPLICATION_JSON));
2727
Request request2 = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/onenote/notebooks").post(requestBody).build();
2828
BatchRequestStep batchRequestStep = new BatchRequestStep("1", request);
29-
BatchRequestStep batchRequestStep2 = new BatchRequestStep("2", request2, List.of("1"));
29+
BatchRequestStep batchRequestStep2 = new BatchRequestStep("2", request2, Arrays.asList("1"));
3030

31-
BatchRequestContent batchRequestContent = new BatchRequestContent(client,List.of(batchRequestStep, batchRequestStep2));
31+
BatchRequestContent batchRequestContent = new BatchRequestContent(client,Arrays.asList(batchRequestStep, batchRequestStep2));
3232
RequestInformation requestInformation = batchRequestBuilder.toPostRequestInformationAsync(batchRequestContent).join();
3333

3434
assertEquals("{+baseurl}/$batch", requestInformation.urlTemplate);

‎src/test/java/com/microsoft/graph/tasks/LargeFileUploadTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void ThrowsIllegalArgumentExceptionOnEmptyStream() throws NoSuchFieldException,
2828
session.setUploadUrl("http://localhost");
2929
session.setExpirationDateTime(OffsetDateTime.parse("2019-11-07T06:39:31.499Z"));
3030

31-
InputStream stream = InputStream.nullInputStream();
31+
InputStream stream = new ByteArrayInputStream(new byte[0]);
3232
int size = stream.available();
3333
long maxSliceSize = 200*1024;
3434

0 commit comments

Comments
 (0)