Merge pull request #52 from microsoftgraph/dev

Build release

Author: Caitlin Bales (MSFT)

gradle.properties

@@ -22,6 +22,14 @@ mavenRepoUrl         = https://api.bintray.com/maven/microsoftgraph/Maven/msgrap
 mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = msgraph-sdk-android
 mavenMajorVersion    = 1
-mavenMinorVersion    = 2
+mavenMinorVersion    = 3
 mavenPatchVersion    = 0
 nightliesUrl         = http://dl.bintray.com/MicrosoftGraph/Maven
+
+#These values are used to run functional tests
+#If you wish to run the functional tests, edit the gradle.properties
+#file in your user directory instead of adding them here.
+#ex: C:\Users\username\.gradle\gradle.properties
+ClientId="CLIENT_ID"
+Username="USERNAME"
+Password="PASSWORD"

graphsdk/build.gradle

@@ -19,7 +19,7 @@ def getVersionName() {
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         minSdkVersion 15
@@ -39,6 +39,14 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        buildTypes.each {
+            it.buildConfigField 'String', 'CLIENT_ID', ClientId
+            it.buildConfigField 'String', 'USERNAME', Username
+            it.buildConfigField 'String', 'PASSWORD', Password
+        }
+    }
+    dexOptions {
+        javaMaxHeapSize "4g"
     }
 }
 
@@ -112,3 +120,10 @@ artifacts {
     archives javadocJar
     archives sourcesJar
 }
+
+task copyResDirectoryToClasses(type: Copy) {
+    from "${projectDir}/src/androidTest/res"
+    into "${buildDir}/intermediates/classes/androidTest/debug/res"
+}
+
+//assembleDebug.dependsOn(copyResDirectoryToClasses)

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

@@ -0,0 +1,73 @@
+package com.microsoft.graph.functional;
+
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.Suppress;
+
+//import com.microsoft.graph.extensions.AdministrativeUnit;
+import com.microsoft.graph.extensions.DirectoryObject;
+//import com.microsoft.graph.extensions.IAdministrativeUnitCollectionPage;
+//import com.microsoft.graph.extensions.ScopedRoleMembership;
+import com.microsoft.graph.extensions.User;
+import com.microsoft.graph.http.GraphServiceException;
+
+import org.junit.*;
+
+@Suppress
+public class AzureTests extends AndroidTestCase {
+
+    private TestBase testBase;
+    //private AdministrativeUnit testAdministrativeUnit;
+
+    @Before
+    public void setUp()
+    {
+        testBase = new TestBase();
+//        AdministrativeUnit adminUnit = new AdministrativeUnit();
+//        adminUnit.displayName = "Test admin unit";
+//        testAdministrativeUnit = testBase.graphClient.getAdministrativeUnits().buildRequest().post(adminUnit);
+    }
+
+    @Test
+    public void testGetAdministrativeUnits() {
+//        IAdministrativeUnitCollectionPage administrativeUnits = testBase.graphClient.getAdministrativeUnits().buildRequest().get();
+//        assertNotNull(administrativeUnits);
+    }
+
+    public void testCreateAdministrativeUnit() {
+//        AdministrativeUnit adminUnit = new AdministrativeUnit();
+//        adminUnit.displayName = "Test admin unit";
+//        AdministrativeUnit responseUnit = testBase.graphClient.getAdministrativeUnits().buildRequest().post(adminUnit);
+//        assertEquals(adminUnit.displayName, responseUnit.displayName);
+//
+//        testBase.graphClient.getAdministrativeUnits(responseUnit.id).buildRequest().delete();
+    }
+
+    @Test(expected=GraphServiceException.class)
+    public void testDeleteAdministrativeUnit()
+    {
+//        testBase.graphClient.getAdministrativeUnits(testAdministrativeUnit.id).buildRequest().delete();
+//
+//        try {
+//            testBase.graphClient.getAdministrativeUnits(testAdministrativeUnit.id).buildRequest().get();
+//        } catch (GraphServiceException ex) {
+//            // Querying for deleted item should return a 404 from the service
+//        }
+    }
+
+    @Test
+    public void testAddUserToAdministrativeUnit()
+    {
+//        User me = testBase.graphClient.getMe().buildRequest().get();
+//        testBase.graphClient.getAdministrativeUnits(testAdministrativeUnit.id).getMembers().references().buildRequest().post(me);
+//
+//        DirectoryObject member = testBase.graphClient.getAdministrativeUnits(testAdministrativeUnit.id).getMembers(me.id).buildRequest().get();
+//        assertNotNull(member);
+//        assertEquals(me.id, member.id);
+    }
+
+    @After
+    public void tearDown()
+    {
+        //testBase.graphClient.getAdministrativeUnits(testAdministrativeUnit.id).buildRequest().delete();
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.microsoft.graph.functional;
+
+import android.test.AndroidTestCase;
+
+import com.microsoft.graph.extensions.IDriveItemCollectionPage;
+import com.microsoft.graph.extensions.IDriveItemCollectionRequestBuilder;
+import com.microsoft.graph.extensions.IGraphServiceClient;
+
+public class CollectionPaginationTests extends AndroidTestCase {
+
+
+    public void testNextPage() {
+        TestBase testBase = new TestBase();
+        IGraphServiceClient graphServiceClient = testBase.graphClient;
+        IDriveItemCollectionPage page1 = graphServiceClient.getMe().getDrive().getRoot().getChildren().buildRequest().top(2).get();
+        IDriveItemCollectionRequestBuilder page2 = page1.getNextPage();
+        String nextLink = page1.getRawObject().get("@odata.nextLink").getAsString();
+        String compareLink = page2.getRequestUrl();
+        assertEquals(nextLink, compareLink);
+    }
+}

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

@@ -0,0 +1,68 @@
+package com.microsoft.graph.functional;
+
+import android.test.AndroidTestCase;
+
+//import com.microsoft.graph.extensions.IDirectoryDeletedItemsCollectionPage;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.microsoft.graph.extensions.DriveItem;
+import com.microsoft.graph.extensions.File;
+import com.microsoft.graph.extensions.IDirectoryObjectCollectionPage;
+import com.microsoft.graph.extensions.IDriveItemCollectionPage;
+import com.microsoft.graph.extensions.IDriveItemCollectionRequestBuilder;
+import com.microsoft.graph.extensions.IGraphServiceClient;
+import com.microsoft.graph.extensions.IWorkbookNamedItemCollectionPage;
+import com.microsoft.graph.extensions.Workbook;
+import com.microsoft.graph.extensions.WorkbookNamedItem;
+import com.microsoft.graph.extensions.WorkbookNamedItemCollectionPage;
+import com.microsoft.graph.extensions.WorkbookRange;
+import com.microsoft.graph.http.GraphServiceException;
+
+
+public class ExcelTests extends AndroidTestCase {
+
+    private TestBase testBase;
+    private String fileId;
+
+    public void setUp()
+    {
+        testBase = new TestBase();
+        fileId = createTestFile("_excelTestResourceAndroid.xlsx");
+
+    }
+
+    public String createTestFile(String fileName)
+    {
+        try {
+            DriveItem excelWorkbook = new DriveItem();
+            excelWorkbook.name = fileName;
+            excelWorkbook.file = new File();
+
+            DriveItem driveItem = testBase.graphClient.getMe().getDrive().getRoot().getChildren().buildRequest().post(excelWorkbook);
+            return driveItem.id;
+        }
+        catch (GraphServiceException ex) {
+            // File could not be created successfully
+        }
+        return null;
+    }
+
+
+    public void testCreateNamedItem() {
+//        JsonObject range = new JsonObject();
+//        range.addProperty("address", "Sheet1!A1");
+//        WorkbookNamedItem item = testBase.graphClient.getMe().getDrive().getItems("015U5LKCVICVSIQ6DKOVELGXD3WAEHMMAI").getWorkbook().getNames().getAdd("named-range", range, "Comment").buildRequest().post();
+//        assertNotNull(item);
+//        assertEquals("named-range", item.name);
+    }
+
+    public void testGetNamedItems() {
+//        JsonObject range = new JsonObject();
+//        range.addProperty("range", "A1");
+//        WorkbookNamedItem item = testBase.graphClient.getMe().getDrive().getItems(fileId).getWorkbook().getNames().getAdd("named-range", range, "Comment").buildRequest().post();
+//
+//        IWorkbookNamedItemCollectionPage namedItems = testBase.graphClient.getMe().getDrive().getItems(fileId).getWorkbook().getNames().buildRequest().get();
+//        assertNotNull(namedItems);
+    }
+}

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

@@ -0,0 +1,34 @@
+package com.microsoft.graph.functional;
+
+import android.test.AndroidTestCase;
+
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.options.QueryOption;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class InsightsTests extends AndroidTestCase {
+
+    public void testTrending() {
+        TestBase testBase = new TestBase();
+        //ITrendingCollectionPage trendingCollectionPage = testBase.graphClient.getMe().getInsights().getTrending().buildRequest().get();
+        //assertNotNull(trendingCollectionPage);
+    }
+
+    public void testFilterType(){
+        TestBase testBase = new TestBase();
+        final List<Option> options = new LinkedList<Option>();
+        options.add(new QueryOption("filter", "resourceVisualization/type eq 'Word'"));
+        //ITrendingCollectionPage trendingCollectionPage = testBase.graphClient.getMe().getInsights().getTrending().buildRequest(options).get();
+        //assertNotNull(trendingCollectionPage);
+    }
+
+    public void testFilterContentType(){
+        TestBase testBase = new TestBase();
+        final List<Option> options = new LinkedList<Option>();
+        options.add(new QueryOption("filter", "resourceVisualization/contentType eq 'OneDrive'"));
+        //ITrendingCollectionPage trendingCollectionPage = testBase.graphClient.getMe().getInsights().getTrending().buildRequest(options).get();
+        //assertNotNull(trendingCollectionPage);
+    }
+}

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

@@ -0,0 +1,105 @@
+package com.microsoft.graph.functional;
+
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.Suppress;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.microsoft.graph.extensions.Group;
+import com.microsoft.graph.extensions.GroupDeltaCollectionPage;
+import com.microsoft.graph.extensions.IGroupDeltaCollectionPage;
+import com.microsoft.graph.extensions.IGroupDeltaCollectionRequest;
+import com.microsoft.graph.extensions.IGroupDeltaCollectionRequestBuilder;
+import com.microsoft.graph.extensions.Extension;
+//import com.microsoft.graph.extensions.IUserGetMailTipsCollectionPage;
+//import com.microsoft.graph.extensions.MailTips;
+//import com.microsoft.graph.extensions.MailTipsType;
+//import com.microsoft.graph.extensions.RecipientScopeType;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.List;
+
+@Suppress
+public class ODataTests extends AndroidTestCase {
+
+    private TestBase testBase;
+
+    @Before
+    public void setUp() {
+       testBase = new TestBase();
+
+        // There's a current limitation of two extensions per user. If there's two extensions in the collection,
+        // delete the latest one
+//        List<Extension> extensions = testBase.graphClient.getMe().getExtensions().buildRequest().get().getCurrentPage();
+//        if (extensions.size() >= 2) {
+//            testBase.graphClient.getMe().getExtensions(extensions.get(1).id).buildRequest().delete();
+//        }
+    }
+
+    @Test
+    public void testOpenExtensions() {
+        Extension extension = new Extension();
+
+        extension.getAdditionalDataManager().put("theme", new JsonPrimitive("dark"));
+        extension.getAdditionalDataManager().put("extensionName", new JsonPrimitive("Extension 1"));
+
+//        Extension newExtension = testBase.graphClient.getMe().getExtensions().buildRequest().post(extension);
+//
+//        assertEquals(extension.getAdditionalDataManager().get("theme"), newExtension.getAdditionalDataManager().get("theme"));
+//
+//        testBase.graphClient.getMe().getExtensions(newExtension.id).buildRequest().delete();
+    }
+
+    @Test
+    public void testEnumFlags() {
+//        EnumSet<MailTipsType> mailTips = EnumSet.noneOf(MailTipsType.class);
+//        mailTips.add(MailTipsType.automaticReplies);
+//        mailTips.add(MailTipsType.customMailTip);
+//        mailTips.add(MailTipsType.recipientScope);
+//        List<String> emailAddresses = new ArrayList<String>();
+//        emailAddresses.add("[email protected]");
+//        emailAddresses.add("[email protected]");
+//        emailAddresses.add("[email protected]");
+//
+//        IUserGetMailTipsCollectionPage mailTipsCollection = testBase.graphClient.getMe().getGetMailTips(emailAddresses, mailTips).buildRequest().post();
+//
+//        assertNotNull(mailTipsCollection);
+//
+//        List<MailTips> mailTipsPage = mailTipsCollection.getCurrentPage();
+//        EnumSet<RecipientScopeType> recipientScopeTypes = EnumSet.allOf(RecipientScopeType.class);
+//        for (int i = 0; i< mailTipsPage.size(); i++) {
+//            if (mailTipsPage.get(i).recipientScope != null) {
+//                assertTrue(mailTipsPage.get(i).recipientScope.getClass().isInstance(mailTips));
+//            }
+//        }
+    }
+
+    @Test
+    public void testDeltaQuery() {
+//        testBase.graphClient.setServiceRoot("https://graph.microsoft.com/beta");
+//        IGroupDeltaCollectionPage deltas = testBase.graphClient.getGroups().getDelta().buildRequest().get();
+//
+//        assertNotNull(deltas.getCurrentPage());
+//        for (int i = 0; i < deltas.getCurrentPage().size(); i++) {
+//            Group group = deltas.getCurrentPage().get(i);
+//            String s = group.description;
+//        }
+//
+//        while(deltas.getNextPage() != null) {
+//            deltas = deltas.getNextPage().buildRequest().get();
+//            assertNotNull(deltas.getCurrentPage());
+//        }
+//
+//        IGroupDeltaCollectionPage deltas2 = testBase.graphClient.getGroups().getDelta(deltas.getDeltaLink()).buildRequest().get();
+//        assertNotNull(deltas2);
+    }
+
+    @Test
+    public void testDeletedItem() {
+    }
+}