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

Commit a47a1a7

Browse files
author
Caitlin Bales (MSFT)
committed
Clean up tests
1 parent ed5d7a0 commit a47a1a7

File tree

9 files changed

+77
-59
lines changed

9 files changed

+77
-59
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public void testGetAdministrativeUnits() {
3333
// assertNotNull(administrativeUnits);
3434
}
3535

36+
@Test
3637
public void testCreateAdministrativeUnit() {
3738
// AdministrativeUnit adminUnit = new AdministrativeUnit();
3839
// adminUnit.displayName = "Test admin unit";

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
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.IDriveItemCollectionPage;
67
import com.microsoft.graph.extensions.IDriveItemCollectionRequestBuilder;
78
import com.microsoft.graph.extensions.IGraphServiceClient;
89

9-
public class CollectionPaginationTests extends AndroidTestCase {
10+
import org.junit.Test;
1011

12+
@Suppress
13+
public class CollectionPaginationTests extends AndroidTestCase {
1114

15+
@Test
1216
public void testNextPage() {
1317
TestBase testBase = new TestBase();
1418
IGraphServiceClient graphServiceClient = testBase.graphClient;

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

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,36 @@
11
package com.microsoft.graph.functional;
22

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

5-
//import com.microsoft.graph.extensions.IDirectoryDeletedItemsCollectionPage;
6-
import com.google.gson.JsonArray;
7-
import com.google.gson.JsonElement;
86
import com.google.gson.JsonObject;
97
import com.google.gson.JsonPrimitive;
10-
import com.microsoft.graph.extensions.DriveItem;
11-
import com.microsoft.graph.extensions.File;
12-
import com.microsoft.graph.extensions.IDirectoryObjectCollectionPage;
13-
import com.microsoft.graph.extensions.IDriveItemCollectionPage;
14-
import com.microsoft.graph.extensions.IDriveItemCollectionRequestBuilder;
15-
import com.microsoft.graph.extensions.IGraphServiceClient;
168
import com.microsoft.graph.extensions.IWorkbookNamedItemCollectionPage;
17-
import com.microsoft.graph.extensions.Workbook;
189
import com.microsoft.graph.extensions.WorkbookNamedItem;
19-
import com.microsoft.graph.extensions.WorkbookNamedItemCollectionPage;
20-
import com.microsoft.graph.extensions.WorkbookRange;
21-
import com.microsoft.graph.http.GraphServiceException;
2210

11+
import org.junit.Before;
12+
import org.junit.Test;
2313

14+
@Suppress
2415
public class ExcelTests extends AndroidTestCase {
2516

2617
private TestBase testBase;
27-
private String fileId;
18+
private String fileId = "015U5LKCVICVSIQ6DKOVELGXD3WAEHMMAI";
2819

20+
@Before
2921
public void setUp()
3022
{
3123
testBase = new TestBase();
3224
}
3325

26+
@Test
3427
public void testCreateNamedItem() {
3528
JsonObject range = new JsonObject();
3629
range.addProperty("address", "Sheet1!A1");
3730
WorkbookNamedItem item = testBase.graphClient
3831
.getMe()
3932
.getDrive()
40-
.getItems("015U5LKCVICVSIQ6DKOVELGXD3WAEHMMAI")
33+
.getItems(fileId)
4134
.getWorkbook()
4235
.getNames()
4336
.getAdd("testNamedRange", new JsonPrimitive("Sheet1!A1"), "Comment")
@@ -47,12 +40,13 @@ public void testCreateNamedItem() {
4740
assertEquals("testNamedRange", item.name);
4841
}
4942

43+
@Test
5044
public void testGetNamedItems() {
51-
// JsonObject range = new JsonObject();
52-
// range.addProperty("range", "A1");
53-
// WorkbookNamedItem item = testBase.graphClient.getMe().getDrive().getItems(fileId).getWorkbook().getNames().getAdd("named-range", range, "Comment").buildRequest().post();
54-
//
55-
// IWorkbookNamedItemCollectionPage namedItems = testBase.graphClient.getMe().getDrive().getItems(fileId).getWorkbook().getNames().buildRequest().get();
56-
// assertNotNull(namedItems);
45+
JsonObject range = new JsonObject();
46+
range.addProperty("range", "A1");
47+
WorkbookNamedItem item = testBase.graphClient.getMe().getDrive().getItems(fileId).getWorkbook().getNames().getAdd("named-range", range, "Comment").buildRequest().post();
48+
49+
IWorkbookNamedItemCollectionPage namedItems = testBase.graphClient.getMe().getDrive().getItems(fileId).getWorkbook().getNames().buildRequest().get();
50+
assertNotNull(namedItems);
5751
}
5852
}

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,43 @@
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.options.Option;
67
import com.microsoft.graph.options.QueryOption;
78

9+
import org.junit.Before;
10+
import org.junit.Test;
11+
812
import java.util.LinkedList;
913
import java.util.List;
1014

15+
@Suppress
1116
public class InsightsTests extends AndroidTestCase {
1217

18+
private TestBase testBase;
19+
20+
@Before
21+
public void setUp() {
22+
testBase = new TestBase();
23+
}
24+
25+
@Test
1326
public void testTrending() {
14-
TestBase testBase = new TestBase();
1527
//ITrendingCollectionPage trendingCollectionPage = testBase.graphClient.getMe().getInsights().getTrending().buildRequest().get();
1628
//assertNotNull(trendingCollectionPage);
1729
}
1830

31+
@Test
1932
public void testFilterType(){
20-
TestBase testBase = new TestBase();
2133
final List<Option> options = new LinkedList<Option>();
2234
options.add(new QueryOption("filter", "resourceVisualization/type eq 'Word'"));
2335
//ITrendingCollectionPage trendingCollectionPage = testBase.graphClient.getMe().getInsights().getTrending().buildRequest(options).get();
2436
//assertNotNull(trendingCollectionPage);
2537
}
2638

39+
@Test
2740
public void testFilterContentType(){
28-
TestBase testBase = new TestBase();
2941
final List<Option> options = new LinkedList<Option>();
3042
options.add(new QueryOption("filter", "resourceVisualization/contentType eq 'OneDrive'"));
3143
//ITrendingCollectionPage trendingCollectionPage = testBase.graphClient.getMe().getInsights().getTrending().buildRequest(options).get();

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

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,16 @@
33
import android.test.AndroidTestCase;
44
import android.test.suitebuilder.annotation.Suppress;
55

6-
import com.google.gson.JsonElement;
76
import com.google.gson.JsonPrimitive;
87
import com.microsoft.graph.extensions.ExtensionSchemaProperty;
9-
import com.microsoft.graph.extensions.Group;
10-
import com.microsoft.graph.extensions.GroupDeltaCollectionPage;
11-
import com.microsoft.graph.extensions.IGroupDeltaCollectionPage;
12-
import com.microsoft.graph.extensions.IGroupDeltaCollectionRequest;
13-
import com.microsoft.graph.extensions.IGroupDeltaCollectionRequestBuilder;
148
import com.microsoft.graph.extensions.Extension;
159
import com.microsoft.graph.extensions.SchemaExtension;
16-
//import com.microsoft.graph.extensions.IUserGetMailTipsCollectionPage;
17-
//import com.microsoft.graph.extensions.MailTips;
18-
//import com.microsoft.graph.extensions.MailTipsType;
19-
//import com.microsoft.graph.extensions.RecipientScopeType;
2010

2111
import org.junit.Assert;
2212
import org.junit.Before;
2313
import org.junit.Test;
2414

25-
import java.net.URL;
2615
import java.util.ArrayList;
27-
import java.util.EnumSet;
2816
import java.util.List;
2917

3018
@Suppress
@@ -38,10 +26,10 @@ public void setUp() {
3826

3927
// There's a current limitation of two extensions per user. If there's two extensions in the collection,
4028
// delete the latest one
41-
// List<Extension> extensions = testBase.graphClient.getMe().getExtensions().buildRequest().get().getCurrentPage();
42-
// if (extensions.size() >= 2) {
43-
// testBase.graphClient.getMe().getExtensions(extensions.get(1).id).buildRequest().delete();
44-
// }
29+
List<Extension> extensions = testBase.graphClient.getMe().getExtensions().buildRequest().get().getCurrentPage();
30+
if (extensions.size() >= 2) {
31+
testBase.graphClient.getMe().getExtensions(extensions.get(1).id).buildRequest().delete();
32+
}
4533
}
4634

4735
@Test
@@ -50,12 +38,10 @@ public void testOpenExtensions() {
5038

5139
extension.getAdditionalDataManager().put("theme", new JsonPrimitive("dark"));
5240
extension.getAdditionalDataManager().put("extensionName", new JsonPrimitive("Extension 1"));
41+
Extension newExtension = testBase.graphClient.getMe().getExtensions().buildRequest().post(extension);
42+
assertEquals(extension.getAdditionalDataManager().get("theme"), newExtension.getAdditionalDataManager().get("theme"));
5343

54-
// Extension newExtension = testBase.graphClient.getMe().getExtensions().buildRequest().post(extension);
55-
//
56-
// assertEquals(extension.getAdditionalDataManager().get("theme"), newExtension.getAdditionalDataManager().get("theme"));
57-
//
58-
// testBase.graphClient.getMe().getExtensions(newExtension.id).buildRequest().delete();
44+
testBase.graphClient.getMe().getExtensions(newExtension.id).buildRequest().delete();
5945
}
6046

6147
@Test

‎graphsdk/src/androidTest/java/com/microsoft/graph/functional/OutlookTests.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,26 @@
33
import android.test.AndroidTestCase;
44
import android.test.suitebuilder.annotation.Suppress;
55

6-
//import com.microsoft.graph.extensions.IDirectoryDeletedItemsCollectionPage;
76
import com.microsoft.graph.extensions.EmailAddress;
8-
import com.microsoft.graph.extensions.IDirectoryObjectCollectionPage;
9-
import com.microsoft.graph.extensions.IDriveItemCollectionPage;
10-
import com.microsoft.graph.extensions.IDriveItemCollectionRequestBuilder;
11-
import com.microsoft.graph.extensions.IGraphServiceClient;
127
import com.microsoft.graph.extensions.Message;
138
import com.microsoft.graph.extensions.Recipient;
149
import com.microsoft.graph.extensions.User;
1510

16-
import java.lang.reflect.Array;
11+
import org.junit.Test;
12+
1713
import java.util.ArrayList;
18-
import java.util.List;
1914

2015
@Suppress
2116
public class OutlookTests extends AndroidTestCase {
2217

18+
@Test
2319
public void testQueryDeletedItems() {
2420
TestBase testBase = new TestBase();
2521
//IDirectoryDeletedItemsCollectionPage deletedItems = testBase.graphClient.getDirectory().getDeletedItemsByType("microsoft.graph.group").buildRequest().get();
2622
//assertNotNull(deletedItems);
2723
}
2824

25+
@Test
2926
public void testSendMail() {
3027
TestBase testBase = new TestBase();
3128
User me = testBase.graphClient.getMe().buildRequest().get();

0 commit comments

Comments
 (0)