Skip to content

Commit c8b3eae

Browse files
author
Caitlin Bales (MSFT)
committed
Planner test cleanup
1 parent 306a5b9 commit c8b3eae

File tree

1 file changed

+75
-38
lines changed

1 file changed

+75
-38
lines changed

‎src/test/java/com/microsoft/graph/functional/PlannerTests.java‎

Lines changed: 75 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
import com.google.gson.JsonElement;
66
import com.google.gson.JsonObject;
77
import com.google.gson.JsonPrimitive;
8+
import com.microsoft.graph.requests.extensions.IOnenoteRequestBuilder;
89
import com.microsoft.graph.requests.extensions.IPlannerAssignedToTaskBoardTaskFormatRequest;
910
import com.microsoft.graph.requests.extensions.IPlannerBucketRequest;
1011
import com.microsoft.graph.requests.extensions.IPlannerPlanDetailsRequest;
12+
import com.microsoft.graph.requests.extensions.IPlannerRequestBuilder;
1113
import com.microsoft.graph.requests.extensions.IPlannerTaskDetailsRequest;
1214
import com.microsoft.graph.requests.extensions.IPlannerTaskRequest;
1315
import com.microsoft.graph.models.extensions.PlannerAssignedToTaskBoardTaskFormat;
@@ -34,31 +36,33 @@
3436
import java.util.Calendar;
3537
import java.util.UUID;
3638

37-
//@Ignore
39+
@Ignore
3840
public class PlannerTests {
3941
private TestBase testBase;
4042
// For now, you must specify a specific plan ID since the test cannot
4143
// clean up after itself
4244
private String planId = "ebJ1qqxlQUCwR4Osxm6TzWUAGpq6";
4345
private PlannerBucket planBucket;
4446
private PlannerTask planTask;
47+
private IPlannerRequestBuilder prb;
4548

4649
@Before
4750
public void setUp() {
4851
testBase = new TestBase();
52+
prb = testBase.graphClient.planner();
4953

5054
PlannerBucket newBucket = new PlannerBucket();
5155
newBucket.name = "Test Bucket";
5256
newBucket.planId = planId;
5357

54-
planBucket = testBase.graphClient.planner().buckets().buildRequest().post(newBucket);
58+
planBucket = prb.buckets().buildRequest().post(newBucket);
5559

5660
PlannerTask newTask = new PlannerTask();
5761
newTask.title = "Test Task";
5862
newTask.planId = planId;
5963
newTask.bucketId = planBucket.id;
6064

61-
planTask = testBase.graphClient.planner().tasks().buildRequest().post(newTask);
65+
planTask = prb.tasks().buildRequest().post(newTask);
6266
}
6367

6468
@Test
@@ -68,31 +72,47 @@ public void testPostTask() {
6872
newTask.planId = planId;
6973
newTask.bucketId = planBucket.id;
7074

71-
PlannerTask task = testBase.graphClient.planner().tasks().buildRequest().post(newTask);
75+
PlannerTask task = prb.tasks().buildRequest().post(newTask);
7276
assertNotNull(task);
7377
}
7478

7579
@Test
7680
public void testBucketTaskBoardFormat() {
77-
PlannerBucketTaskBoardTaskFormat format = testBase.graphClient.planner().tasks(planTask.id).bucketTaskBoardFormat().buildRequest().get();
81+
PlannerBucketTaskBoardTaskFormat format = prb
82+
.tasks(planTask.id)
83+
.bucketTaskBoardFormat()
84+
.buildRequest()
85+
.get();
7886
assertNotNull(format);
7987
}
8088

8189
@Test
8290
public void testAssignedToTaskBoardFormat() {
83-
PlannerAssignedToTaskBoardTaskFormat format = testBase.graphClient.planner().tasks(planTask.id).assignedToTaskBoardFormat().buildRequest().get();
91+
PlannerAssignedToTaskBoardTaskFormat format = prb
92+
.tasks(planTask.id)
93+
.assignedToTaskBoardFormat()
94+
.buildRequest()
95+
.get();
8496
assertNotNull(format);
8597
}
8698

8799
@Test
88100
public void testProgressTaskBoardFormat() {
89-
PlannerProgressTaskBoardTaskFormat format = testBase.graphClient.planner().tasks(planTask.id).progressTaskBoardFormat().buildRequest().get();
101+
PlannerProgressTaskBoardTaskFormat format = prb
102+
.tasks(planTask.id)
103+
.progressTaskBoardFormat()
104+
.buildRequest()
105+
.get();
90106
assertNotNull(format);
91107
}
92108

93109
@Test
94110
public void testGetTaskDetails() {
95-
PlannerTaskDetails details = testBase.graphClient.planner().tasks(planTask.id).details().buildRequest().get();
111+
PlannerTaskDetails details = prb
112+
.tasks(planTask.id)
113+
.details()
114+
.buildRequest()
115+
.get();
96116
assertNotNull(details);
97117
}
98118

@@ -113,19 +133,18 @@ public void testUpdateTask() throws InterruptedException {
113133
a2.put(me.id, assignment);
114134
task.assignments = a2;
115135

116-
// JsonObject assignments = new JsonObject();
117-
// Gson gson = new Gson();
118-
// JsonElement assignmentJson = gson.toJsonTree(assignment);
119-
// assignments.add(me.id, assignmentJson);
120-
// dataManager.put("assignments", assignments);
121-
122-
IPlannerTaskRequest req = testBase.graphClient.planner().tasks(planTask.id).buildRequest();
136+
IPlannerTaskRequest req = prb
137+
.tasks(planTask.id)
138+
.buildRequest();
123139
req.addHeader("If-Match", getEtag(planTask.getRawObject()));
124140
req.patch(task);
125141

126142
Thread.sleep(4000);
127143

128-
PlannerTask updatedTask = testBase.graphClient.planner().tasks(planTask.id).buildRequest().get();
144+
PlannerTask updatedTask = prb
145+
.tasks(planTask.id)
146+
.buildRequest()
147+
.get();
129148
JsonElement createdAssignment = updatedTask.getRawObject().get("assignments").getAsJsonObject().get(me.id);
130149

131150
assertNotNull(createdAssignment);
@@ -166,15 +185,22 @@ public void testUpdateTaskDetailsChecklist() throws InterruptedException {
166185
details.oDataType = "#microsoft.graph.plannerTaskDetails";
167186
dataManager.put("checklist", data);
168187

169-
PlannerTaskDetails d = testBase.graphClient.planner().tasks(planTask.id).details().buildRequest().get();
170-
IPlannerTaskDetailsRequest req = testBase.graphClient.planner().tasks(planTask.id).details().buildRequest();
188+
PlannerTaskDetails d = prb
189+
.tasks(planTask.id)
190+
.details()
191+
.buildRequest()
192+
.get();
193+
IPlannerTaskDetailsRequest req = prb
194+
.tasks(planTask.id)
195+
.details()
196+
.buildRequest();
171197
req.addHeader("If-Match", getEtag(d.getRawObject()));
172198
req.addHeader("If-None-Match", getEtag(d.getRawObject()));
173199
req.patch(details);
174200

175201
Thread.sleep(4000);
176202

177-
PlannerTask updatedTask = testBase.graphClient.planner().tasks(planTask.id).buildRequest().get();
203+
PlannerTask updatedTask = prb.tasks(planTask.id).buildRequest().get();
178204
int checklistItemCount = updatedTask.getRawObject().get("checklistItemCount").getAsInt();
179205

180206
assertEquals(3, checklistItemCount);
@@ -201,16 +227,27 @@ public void testUpdateTaskDetailsReferences() {
201227
details.oDataType = "#microsoft.graph.plannerTaskDetails";
202228
dataManager.put("references", data);
203229

204-
PlannerTaskDetails d = testBase.graphClient.planner().tasks(planTask.id).details().buildRequest().get();
205-
IPlannerTaskDetailsRequest req = testBase.graphClient.planner().tasks(planTask.id).details().buildRequest();
230+
PlannerTaskDetails d = prb
231+
.tasks(planTask.id)
232+
.details()
233+
.buildRequest()
234+
.get();
235+
IPlannerTaskDetailsRequest req = prb
236+
.tasks(planTask.id)
237+
.details()
238+
.buildRequest();
206239
req.addHeader("If-Match", getEtag(d.getRawObject()));
207240
req.addHeader("If-None-Match", getEtag(d.getRawObject()));
208241
req.addHeader("Prefer", "return=representation");
209242
PlannerTaskDetails updatedTaskDetails = req.patch(details);
210243

211244
Thread.sleep(4000);
212245

213-
updatedTaskDetails = testBase.graphClient.planner().tasks(planTask.id).details().buildRequest().get();
246+
updatedTaskDetails = prb
247+
.tasks(planTask.id)
248+
.details()
249+
.buildRequest()
250+
.get();
214251
JsonElement obj = updatedTaskDetails.getRawObject().get("references");
215252
JsonArray array = new JsonArray();
216253
array.add(obj);
@@ -227,13 +264,13 @@ public void testUpdateTaskCompletion() throws InterruptedException {
227264
PlannerTask task = new PlannerTask();
228265
task.percentComplete = 50;
229266

230-
IPlannerTaskRequest req = testBase.graphClient.planner().tasks(planTask.id).buildRequest();
267+
IPlannerTaskRequest req = prb.tasks(planTask.id).buildRequest();
231268
req.addHeader("If-Match", getEtag(planTask.getRawObject()));
232269
req.patch(task);
233270

234271
Thread.sleep(4000);
235272

236-
PlannerTask updatedTask = testBase.graphClient.planner().tasks(planTask.id).buildRequest().get();
273+
PlannerTask updatedTask = prb.tasks(planTask.id).buildRequest().get();
237274

238275
assertEquals(task.percentComplete, updatedTask.percentComplete);
239276
}
@@ -243,14 +280,14 @@ public void testUpdateTaskStartDate() throws InterruptedException {
243280
PlannerTask task = new PlannerTask();
244281
task.startDateTime = Calendar.getInstance();
245282

246-
IPlannerTaskRequest req = testBase.graphClient.planner().tasks(planTask.id).buildRequest();
283+
IPlannerTaskRequest req = prb.tasks(planTask.id).buildRequest();
247284
req.addHeader("If-Match", getEtag(planTask.getRawObject()));
248285
req.patch(task);
249286

250287
Thread.sleep(2000);
251288

252-
PlannerTask updatedTask = testBase.graphClient.planner().tasks(planTask.id).buildRequest().get();
253-
updatedTask = testBase.graphClient.planner().tasks(planTask.id).buildRequest().get();
289+
PlannerTask updatedTask = prb.tasks(planTask.id).buildRequest().get();
290+
updatedTask = prb.tasks(planTask.id).buildRequest().get();
254291
assertEquals(task.startDateTime, updatedTask.startDateTime);
255292
}
256293

@@ -260,14 +297,14 @@ public void testUpdateTaskDueDate() throws InterruptedException {
260297
PlannerTask task = new PlannerTask();
261298
task.dueDateTime = Calendar.getInstance();
262299

263-
IPlannerTaskRequest req = testBase.graphClient.planner().tasks(planTask.id).buildRequest();
300+
IPlannerTaskRequest req = prb.tasks(planTask.id).buildRequest();
264301
req.addHeader("If-Match", getEtag(planTask.getRawObject()));
265302
req.patch(task);
266303

267304
Thread.sleep(6000);
268305

269-
PlannerTask updatedTask = testBase.graphClient.planner().tasks(planTask.id).buildRequest().get();
270-
updatedTask = testBase.graphClient.planner().tasks(planTask.id).buildRequest().get();
306+
PlannerTask updatedTask = prb.tasks(planTask.id).buildRequest().get();
307+
updatedTask = prb.tasks(planTask.id).buildRequest().get();
271308
assertEquals(task.dueDateTime, updatedTask.dueDateTime);
272309
}
273310

@@ -288,8 +325,8 @@ public void testUpdateTaskCategories() {
288325
task.oDataType = "#microsoft.graph.plannerTask";
289326
dataManager.put("appliedCategories", data);
290327

291-
PlannerTask newTask = testBase.graphClient.planner().tasks(planTask.id).buildRequest().get();
292-
IPlannerTaskRequest req = testBase.graphClient.planner().tasks(planTask.id).buildRequest();
328+
PlannerTask newTask = prb.tasks(planTask.id).buildRequest().get();
329+
IPlannerTaskRequest req = prb.tasks(planTask.id).buildRequest();
293330
req.addHeader("If-Match", getEtag(newTask.getRawObject()));
294331
req.addHeader("If-None-Match", getEtag(newTask.getRawObject()));
295332
req.addHeader("Prefer", "return=representation");
@@ -307,8 +344,8 @@ public void testUpdatePlanDetails() {
307344
descriptions.category2 = "Red";
308345
planDetails.categoryDescriptions = descriptions;
309346

310-
PlannerPlanDetails newDetails = testBase.graphClient.planner().plans(planId).details().buildRequest().get();
311-
IPlannerPlanDetailsRequest req = testBase.graphClient.planner().plans(planId).details().buildRequest();
347+
PlannerPlanDetails newDetails = prb.plans(planId).details().buildRequest().get();
348+
IPlannerPlanDetailsRequest req = prb.plans(planId).details().buildRequest();
312349
req.addHeader("If-Match", getEtag(newDetails.getRawObject()));
313350
req.addHeader("If-None-Match", getEtag(newDetails.getRawObject()));
314351
req.addHeader("Prefer", "return=representation");
@@ -324,7 +361,7 @@ public void testDeleteTask() {
324361
newTask.planId = planId;
325362
newTask.bucketId = planBucket.id;
326363

327-
PlannerTask task = testBase.graphClient.planner().tasks().buildRequest().post(newTask);
364+
PlannerTask task = prb.tasks().buildRequest().post(newTask);
328365

329366
IPlannerTaskRequest req = testBase.graphClient.planner().tasks(task.id).buildRequest();
330367
req.addHeader("If-Match", getEtag(task.getRawObject()));
@@ -337,7 +374,7 @@ public void testCreateBucket() {
337374
newBucket.name = "Create Bucket Test";
338375
newBucket.planId = planId;
339376

340-
PlannerBucket createdBucket = testBase.graphClient.planner().buckets().buildRequest().post(newBucket);
377+
PlannerBucket createdBucket = prb.buckets().buildRequest().post(newBucket);
341378
assertEquals(newBucket.name, createdBucket.name);
342379
}
343380

@@ -347,11 +384,11 @@ public void testUpdateBucket() {
347384
patchBucket.name = "RenamedBucket";
348385
patchBucket.oDataType = "#microsoft.graph.plannerBucket";
349386

350-
IPlannerBucketRequest req = testBase.graphClient.planner().buckets(planBucket.id).buildRequest();
387+
IPlannerBucketRequest req = prb.buckets(planBucket.id).buildRequest();
351388
req.addHeader("If-Match", getEtag(planBucket.getRawObject()));
352389

353390
req.patch(patchBucket);
354-
PlannerBucket updatedBucket = testBase.graphClient.planner().buckets(planBucket.id).buildRequest().get();
391+
PlannerBucket updatedBucket = prb.buckets(planBucket.id).buildRequest().get();
355392

356393
assertEquals(patchBucket.name, updatedBucket.name);
357394

0 commit comments

Comments
 (0)