Skip to content
This repository was archived by the owner on Sep 4, 2020. It is now read-only.

Commit bce7105

Browse files
author
Caitlin Bales (MSFT)
committed
Update models and add new v1 features
1 parent 5dd8839 commit bce7105

397 files changed

Lines changed: 3215 additions & 773 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ mavenRepoUrl = https://api.bintray.com/maven/microsoftgraph/Maven/msgrap
2222
mavenGroupId = com.microsoft.graph
2323
mavenArtifactId = msgraph-sdk-android
2424
mavenMajorVersion = 1
25-
mavenMinorVersion = 2
25+
mavenMinorVersion = 3
2626
mavenPatchVersion = 0
2727
nightliesUrl = http://dl.bintray.com/MicrosoftGraph/Maven
2828

graphsdk/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def getVersionName() {
1919

2020
android {
2121
compileSdkVersion 23
22-
buildToolsVersion "23.0.1"
22+
buildToolsVersion '25.0.0'
2323

2424
defaultConfig {
2525
minSdkVersion 15
@@ -126,4 +126,4 @@ task copyResDirectoryToClasses(type: Copy) {
126126
into "${buildDir}/intermediates/classes/androidTest/debug/res"
127127
}
128128

129-
assembleDebug.dependsOn(copyResDirectoryToClasses)
129+
//assembleDebug.dependsOn(copyResDirectoryToClasses)

graphsdk/src/androidTest/java/com/microsoft/graph/functional/ODataTests.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
import com.google.gson.JsonElement;
77
import com.google.gson.JsonPrimitive;
8-
//import com.microsoft.graph.extensions.Group;
9-
//import com.microsoft.graph.extensions.GroupDeltaCollectionPage;
10-
//import com.microsoft.graph.extensions.IGroupDeltaCollectionPage;
11-
//import com.microsoft.graph.extensions.IGroupDeltaCollectionRequest;
12-
//import com.microsoft.graph.extensions.IGroupDeltaCollectionRequestBuilder;
13-
//import com.microsoft.graph.extensions.Extension;
8+
import com.microsoft.graph.extensions.Group;
9+
import com.microsoft.graph.extensions.GroupDeltaCollectionPage;
10+
import com.microsoft.graph.extensions.IGroupDeltaCollectionPage;
11+
import com.microsoft.graph.extensions.IGroupDeltaCollectionRequest;
12+
import com.microsoft.graph.extensions.IGroupDeltaCollectionRequestBuilder;
13+
import com.microsoft.graph.extensions.Extension;
1414
//import com.microsoft.graph.extensions.IUserGetMailTipsCollectionPage;
1515
//import com.microsoft.graph.extensions.MailTips;
1616
//import com.microsoft.graph.extensions.MailTipsType;
@@ -32,9 +32,9 @@ public class ODataTests extends AndroidTestCase {
3232
@Before
3333
public void setUp() {
3434
testBase = new TestBase();
35-
//
36-
// // There's a current limitation of two extensions per user. If there's two extensions in the collection,
37-
// // delete the latest one
35+
36+
// There's a current limitation of two extensions per user. If there's two extensions in the collection,
37+
// delete the latest one
3838
// List<Extension> extensions = testBase.graphClient.getMe().getExtensions().buildRequest().get().getCurrentPage();
3939
// if (extensions.size() >= 2) {
4040
// testBase.graphClient.getMe().getExtensions(extensions.get(1).id).buildRequest().delete();
@@ -43,11 +43,11 @@ public void setUp() {
4343

4444
@Test
4545
public void testOpenExtensions() {
46-
// Extension extension = new Extension();
47-
//
48-
// extension.getAdditionalDataManager().put("theme", new JsonPrimitive("dark"));
49-
// extension.getAdditionalDataManager().put("extensionName", new JsonPrimitive("Extension 1"));
50-
//
46+
Extension extension = new Extension();
47+
48+
extension.getAdditionalDataManager().put("theme", new JsonPrimitive("dark"));
49+
extension.getAdditionalDataManager().put("extensionName", new JsonPrimitive("Extension 1"));
50+
5151
// Extension newExtension = testBase.graphClient.getMe().getExtensions().buildRequest().post(extension);
5252
//
5353
// assertEquals(extension.getAdditionalDataManager().get("theme"), newExtension.getAdditionalDataManager().get("theme"));
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,44 @@
11
package com.microsoft.graph.functional;
22

33
import android.test.AndroidTestCase;
4+
import android.test.suitebuilder.annotation.Suppress;
45

56
//import com.microsoft.graph.extensions.IDirectoryDeletedItemsCollectionPage;
7+
import com.microsoft.graph.extensions.EmailAddress;
68
import com.microsoft.graph.extensions.IDirectoryObjectCollectionPage;
79
import com.microsoft.graph.extensions.IDriveItemCollectionPage;
810
import com.microsoft.graph.extensions.IDriveItemCollectionRequestBuilder;
911
import com.microsoft.graph.extensions.IGraphServiceClient;
12+
import com.microsoft.graph.extensions.Message;
13+
import com.microsoft.graph.extensions.Recipient;
14+
import com.microsoft.graph.extensions.User;
1015

16+
import java.lang.reflect.Array;
17+
import java.util.ArrayList;
18+
import java.util.List;
19+
20+
@Suppress
1121
public class OutlookTests extends AndroidTestCase {
1222

1323
public void testQueryDeletedItems() {
1424
TestBase testBase = new TestBase();
1525
//IDirectoryDeletedItemsCollectionPage deletedItems = testBase.graphClient.getDirectory().getDeletedItemsByType("microsoft.graph.group").buildRequest().get();
1626
//assertNotNull(deletedItems);
1727
}
28+
29+
public void testSendMail() {
30+
TestBase testBase = new TestBase();
31+
User me = testBase.graphClient.getMe().buildRequest().get();
32+
Recipient r = new Recipient();
33+
EmailAddress address = new EmailAddress();
34+
address.address = me.mail;
35+
r.emailAddress = address;
36+
Message message = new Message();
37+
message.subject = "Test E-Mail";
38+
message.from = r;
39+
ArrayList<Recipient> recipients = new ArrayList<Recipient>();
40+
recipients.add(r);
41+
message.toRecipients = recipients;
42+
testBase.graphClient.getMe().getSendMail(message, true).buildRequest().post();
43+
}
1844
}

0 commit comments

Comments
 (0)