Skip to content

Commit 43cc485

Browse files
author
Nakul Sabharwal
committed
Added more assertions in testMultipartPostWithHeadersMap. Also, indented in Multipart and MultipartTests
1 parent 6ccb13a commit 43cc485

File tree

3 files changed

+25
-12
lines changed

3 files changed

+25
-12
lines changed

src/main/java/com/microsoft/graph/models/extensions/Multipart.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ else if(name != null)
112112
*/
113113
public static String createContentHeaderValue(String contentValue, Map<String, String> contentDispParameter) {
114114
String contentHeaderValue = contentValue;
115-
115+
116116
if(contentDispParameter != null) {
117117
for(Map.Entry<String,String> entry : contentDispParameter.entrySet())
118-
contentHeaderValue += ";" + entry.getKey() + "=\"" + entry.getValue() + "\"";
118+
contentHeaderValue += ";" + entry.getKey() + "=\"" + entry.getValue() + "\"";
119119
}
120120
return contentHeaderValue;
121121
}

src/test/java/com/microsoft/graph/functional/OneNoteTests.java

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,12 @@
3737
import com.microsoft.graph.requests.extensions.INotebookCollectionPage;
3838
import com.microsoft.graph.requests.extensions.INotebookGetRecentNotebooksCollectionPage;
3939
import com.microsoft.graph.requests.extensions.IOnenotePageCollectionPage;
40+
import com.microsoft.graph.requests.extensions.IOnenotePageCollectionRequest;
41+
import com.microsoft.graph.requests.extensions.IOnenotePageCollectionRequestBuilder;
4042
import com.microsoft.graph.requests.extensions.IOnenoteRequestBuilder;
4143
import com.microsoft.graph.requests.extensions.IOnenoteSectionCollectionPage;
4244
import com.microsoft.graph.requests.extensions.ISectionGroupCollectionPage;
45+
import com.microsoft.graph.requests.extensions.OnenotePageCollectionRequest;
4346

4447
/**
4548
* Tests for OneNote API functionality
@@ -476,10 +479,20 @@ public void testMultipartPostWithHeadersMap() throws Exception{
476479
options.add(multipart.header());
477480

478481
// Post the multipart content
479-
OnenotePage page = orb
482+
IOnenotePageCollectionRequestBuilder pageReq = orb
480483
.sections(testSection.id)
481-
.pages()
482-
.buildRequest(options)
484+
.pages();
485+
String expectedRequestUrl = "https://graph.microsoft.com/v1.0/me/onenote/sections/"+testSection.id+"/pages";
486+
assertEquals(expectedRequestUrl, pageReq.getRequestUrl());
487+
IOnenotePageCollectionRequest request = pageReq.buildRequest(options);
488+
assertNotNull(request);
489+
OnenotePageCollectionRequest pageCollectionReq = (OnenotePageCollectionRequest)request;
490+
List<HeaderOption> headeroption = pageCollectionReq.getHeaders();
491+
assertEquals("Content-Type", headeroption.get(0).getName());
492+
String expectedHeaderValue = "multipart/form-data; boundary=\""+multipart.getBoundary()+"\"";
493+
assertEquals(expectedHeaderValue, headeroption.get(0).getValue().toString());
494+
assertNotNull(multipart.content());
495+
OnenotePage page = pageReq.buildRequest(options)
483496
.post(multipart.content());
484497
assertNotNull(page);
485498
}

src/test/java/com/microsoft/graph/models/extensions/MultipartTests.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,49 +30,49 @@ public void testCreatePartHeaderWithNameContenttypeFilename() {
3030
public void testCreatePartHeaderWithContenttypeFilename() {
3131
String actual = multipart.createPartHeader(null, "image/jpg", "hamilton.jpg");
3232
String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data; filename=\"hamilton.jpg\"\r\nContent-Type: image/jpg\r\n\r\n";
33-
assertEquals(expected, actual);
33+
assertEquals(expected, actual);
3434
}
3535

3636
@Test
3737
public void testCreatePartHeaderWithNameContenttype() {
3838
String actual = multipart.createPartHeader("hamilton", "image/jpg", null);
3939
String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data; name=\"hamilton\"\r\nContent-Type: image/jpg\r\n\r\n";
40-
assertEquals(expected, actual);
40+
assertEquals(expected, actual);
4141
}
4242

4343
@Test
4444
public void testCreatePartHeaderWithContenttype() {
4545
String actual = multipart.createPartHeader(null, "image/jpg", null);
4646
String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data\r\nContent-Type: image/jpg\r\n\r\n";
47-
assertEquals(expected, actual);
47+
assertEquals(expected, actual);
4848
}
4949

5050
@Test
5151
public void testCreatePartHeader() {
5252
String actual = multipart.createPartHeader(null, null, null);
5353
String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data\r\n\r\n";
5454
System.out.println(actual);
55-
assertEquals(expected, actual);
55+
assertEquals(expected, actual);
5656
}
5757

5858
@Test
5959
public void testCreatePartHeaderWithNameFilename() {
6060
String actual = multipart.createPartHeader("hamilton", null, "hamilton.jpg");
6161
String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data; name=\"hamilton\"; filename=\"hamilton.jpg\"\r\n\r\n";
62-
assertEquals(expected, actual);
62+
assertEquals(expected, actual);
6363
}
6464

6565
@Test
6666
public void testCreatePartHeaderWithName() {
6767
String actual = multipart.createPartHeader("hamilton", null, null);
6868
String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data; name=\"hamilton\"\r\n\r\n";
69-
assertEquals(expected, actual);
69+
assertEquals(expected, actual);
7070
}
7171

7272
@Test
7373
public void testCreatePartHeaderWithFilename() {
7474
String actual = multipart.createPartHeader(null, null, "hamilton.jpg");
7575
String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data; filename=\"hamilton.jpg\"\r\n\r\n";
76-
assertEquals(expected, actual);
76+
assertEquals(expected, actual);
7777
}
7878
}

0 commit comments

Comments
 (0)