Skip to content

Commit fc6980b

Browse files
YanehCheckYanehCheck
committed
fix(ClientServices): Fixed tests that use Updated property
1 parent a941a93 commit fc6980b

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

‎test/Arcor2.ClientSdk.ClientServices.IntegrationTests/Helpers/EventAwaiter.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ public async Task WaitForEventAsync(int timeout = 5000) {
9191
public static class Arcor2ObjectExtensions {
9292
public static EventAwaiter GetUpdatedAwaiter<T>(this Arcor2ObjectManager<T> manager) {
9393
var awaiter = new EventAwaiter();
94-
manager.Updated += awaiter.EventHandler;
94+
manager.PropertyChanged += awaiter.EventHandler;
9595
return awaiter;
9696
}
9797

9898
public static Task GetUpdatedAwaiterAndWait<T>(this Arcor2ObjectManager<T> manager) {
9999
var awaiter = new EventAwaiter();
100-
manager.Updated += awaiter.EventHandler;
100+
manager.PropertyChanged += awaiter.EventHandler;
101101
return awaiter.WaitForEventAsync();
102102
}
103103

‎test/Arcor2.ClientSdk.ClientServices.IntegrationTests/Tests/Arcor2SessionActionObjectTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public async Task SetEndEffectorPerpendicularToWorld_Dobot_Moves() {
147147
actionObject.MovingToPose += robotMoveToPoseAwaiter.EventHandler;
148148
var robotMoveToPoseTask = robotMoveToPoseAwaiter.WaitForEventAsync();
149149
var updatedAwaiter = new EventAwaiter();
150-
actionObject.Updated += updatedAwaiter.EventHandler;
150+
actionObject.PropertyChanged += updatedAwaiter.EventHandler;
151151
var updatedTask = updatedAwaiter.WaitForEventAsync();
152152

153153
// Act
@@ -175,7 +175,7 @@ public async Task MoveToPose_DobotImpossible_FailsMove() {
175175
actionObject.MovingToPose += (sender, args) => robotMoveToPoseAwaiter.EventHandler(sender, args);
176176
var robotMoveToPoseTask = robotMoveToPoseAwaiter.WaitForEventAsync();
177177
var updatedAwaiter = new EventAwaiter();
178-
actionObject.Updated += updatedAwaiter.EventHandler;
178+
actionObject.PropertyChanged += updatedAwaiter.EventHandler;
179179
var updatedTask = updatedAwaiter.WaitForEventAsync();
180180

181181
// Act
@@ -203,7 +203,7 @@ public async Task MoveToJoints_DobotSingleArm_Fails() {
203203
actionObject.MovingToJoints += robotMoveToPoseAwaiter.EventHandler;
204204
var robotMoveToPoseTask = robotMoveToPoseAwaiter.WaitForEventAsync();
205205
var updatedAwaiter = new EventAwaiter();
206-
actionObject.Updated += updatedAwaiter.EventHandler;
206+
actionObject.PropertyChanged += updatedAwaiter.EventHandler;
207207
var updatedTask = updatedAwaiter.WaitForEventAsync();
208208

209209
var modifiedJoint = actionObject.Data.Joints!.First();
@@ -236,7 +236,7 @@ public async Task MoveToActionPointJoints_Dobot_Moves() {
236236
//actionObject.MovingToActionPointJoints += robotMoveToPoseAwaiter.EventHandler;
237237
//var robotMoveToPoseTask = robotMoveToPoseAwaiter.WaitForEventAsync();
238238
var updatedAwaiter = new EventAwaiter();
239-
actionObject.Updated += updatedAwaiter.EventHandler;
239+
actionObject.PropertyChanged += updatedAwaiter.EventHandler;
240240
var updatedTask = updatedAwaiter.WaitForEventAsync();
241241

242242
// Act
@@ -266,7 +266,7 @@ public async Task MoveToActionPointOrientation_Dobot_Moves() {
266266
actionObject.MovingToActionPointOrientation += robotMoveToPoseAwaiter.EventHandler;
267267
var robotMoveToPoseTask = robotMoveToPoseAwaiter.WaitForEventAsync();
268268
var updatedAwaiter = new EventAwaiter();
269-
actionObject.Updated += updatedAwaiter.EventHandler;
269+
actionObject.PropertyChanged += updatedAwaiter.EventHandler;
270270
var updatedTask = updatedAwaiter.WaitForEventAsync();
271271

272272
// Act
@@ -294,7 +294,7 @@ public async Task StepPosition_Dobot_Move() {
294294
actionObject.MovingToPose += (sender, args) => robotMoveToPoseAwaiter.EventHandler(sender, args);
295295
var robotMoveToPoseTask = robotMoveToPoseAwaiter.WaitForEventAsync();
296296
var updatedAwaiter = new EventAwaiter();
297-
actionObject.Updated += updatedAwaiter.EventHandler;
297+
actionObject.PropertyChanged += updatedAwaiter.EventHandler;
298298
var updatedTask = updatedAwaiter.WaitForEventAsync();
299299
var oldPose = actionObject.Data.Meta.Pose.Position;
300300

‎test/Arcor2.ClientSdk.ClientServices.IntegrationTests/Tests/Arcor2SessionActionPointTests.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public async Task UpdateActionPointUsingRobot_Valid_ChangesPosition() {
8484
await project.Scene.GetStartedAwaiter().WaitForEventAsync();
8585
// Act
8686
var changedAwaiterEvent = new EventAwaiter();
87-
actionPoint.Updated += changedAwaiterEvent.EventHandler;
87+
actionPoint.PropertyChanged += changedAwaiterEvent.EventHandler;
8888
var changedAwaiter = changedAwaiterEvent.WaitForEventAsync();
8989

9090
await actionPoint.UpdateUsingRobotAsync(project.Scene.ActionObjects!.First());
@@ -113,7 +113,7 @@ public async Task UpdateActionPointPose_Valid_Updates() {
113113

114114
// Act
115115
var changedAwaiterEvent = new EventAwaiter();
116-
actionPoint.Updated += changedAwaiterEvent.EventHandler;
116+
actionPoint.PropertyChanged += changedAwaiterEvent.EventHandler;
117117
var changedAwaiter = changedAwaiterEvent.WaitForEventAsync();
118118

119119
await actionPoint.UpdatePositionAsync(newPosition);
@@ -164,7 +164,7 @@ public async Task UpdateActionPointName_Valid_Updates() {
164164

165165
// Act
166166
var changedAwaiterEvent = new EventAwaiter();
167-
actionPoint.Updated += changedAwaiterEvent.EventHandler;
167+
actionPoint.PropertyChanged += changedAwaiterEvent.EventHandler;
168168
var changedAwaiter = changedAwaiterEvent.WaitForEventAsync();
169169

170170
await actionPoint.RenameAsync(newName);
@@ -192,7 +192,7 @@ public async Task UpdateParent_Valid_Updates() {
192192

193193
// Act
194194
var changedAwaiterEvent = new EventAwaiter();
195-
actionPoint.Updated += changedAwaiterEvent.EventHandler;
195+
actionPoint.PropertyChanged += changedAwaiterEvent.EventHandler;
196196
var changedAwaiter = changedAwaiterEvent.WaitForEventAsync();
197197

198198
await actionPoint.UpdateParentAsync(parentActionPoint);
@@ -221,7 +221,7 @@ public async Task ClearParent_Valid_Clears() {
221221

222222
// Act
223223
var changedAwaiterEvent = new EventAwaiter();
224-
actionPoint.Updated += changedAwaiterEvent.EventHandler;
224+
actionPoint.PropertyChanged += changedAwaiterEvent.EventHandler;
225225
var changedAwaiter = changedAwaiterEvent.WaitForEventAsync();
226226

227227
await actionPoint.ClearParentAsync();
@@ -308,7 +308,7 @@ public async Task UpdateJoints_Valid_Updates() {
308308

309309
// Act
310310
var updatedAwaiter = new EventAwaiter();
311-
joints.Updated += updatedAwaiter.EventHandler;
311+
joints.PropertyChanged += updatedAwaiter.EventHandler;
312312
var updateTask = updatedAwaiter.WaitForEventAsync();
313313

314314
await joints.UpdateAsync(newJoints);
@@ -335,7 +335,7 @@ public async Task UpdateJointsUsingRobot_Valid_Updates() {
335335
try {
336336
// Change
337337
var updatedAwaiterC = new EventAwaiter();
338-
joints.Updated += updatedAwaiterC.EventHandler;
338+
joints.PropertyChanged += updatedAwaiterC.EventHandler;
339339
var updateTaskC = updatedAwaiterC.WaitForEventAsync();
340340

341341
var newJoints = new List<Joint>(joints.Data.Joints);
@@ -346,7 +346,7 @@ public async Task UpdateJointsUsingRobot_Valid_Updates() {
346346

347347
// Act
348348
var updatedAwaiter = new EventAwaiter();
349-
joints.Updated += updatedAwaiter.EventHandler;
349+
joints.PropertyChanged += updatedAwaiter.EventHandler;
350350
var updateTask = updatedAwaiter.WaitForEventAsync();
351351

352352
await joints.UpdateUsingRobotAsync();
@@ -374,7 +374,7 @@ public async Task RenameJoints_Valid_UpdatesName() {
374374
try {
375375
// Arrange
376376
var updatedAwaiter = new EventAwaiter();
377-
joints.Updated += updatedAwaiter.EventHandler;
377+
joints.PropertyChanged += updatedAwaiter.EventHandler;
378378
var updateTask = updatedAwaiter.WaitForEventAsync();
379379

380380
// Act
@@ -491,7 +491,7 @@ public async Task UpdateOrientation_Valid_Updates() {
491491

492492
// Act
493493
var updatedAwaiter = new EventAwaiter();
494-
orientation.Updated += updatedAwaiter.EventHandler;
494+
orientation.PropertyChanged += updatedAwaiter.EventHandler;
495495
var updateTask = updatedAwaiter.WaitForEventAsync();
496496

497497
await orientation.UpdateAsync(newOrientation);
@@ -519,7 +519,7 @@ public async Task UpdateOrientationUsingRobot_Valid_Updates() {
519519
try {
520520
// Change
521521
var updatedAwaiterC = new EventAwaiter();
522-
orientation.Updated += updatedAwaiterC.EventHandler;
522+
orientation.PropertyChanged += updatedAwaiterC.EventHandler;
523523
var updateTaskC = updatedAwaiterC.WaitForEventAsync();
524524

525525
var newOrientation = new Orientation(0.7071067811865475m, 0, 0, 0.7071067811865475m);
@@ -529,7 +529,7 @@ public async Task UpdateOrientationUsingRobot_Valid_Updates() {
529529

530530
// Act
531531
var updatedAwaiter = new EventAwaiter();
532-
orientation.Updated += updatedAwaiter.EventHandler;
532+
orientation.PropertyChanged += updatedAwaiter.EventHandler;
533533
var updateTask = updatedAwaiter.WaitForEventAsync();
534534

535535
await orientation.UpdateUsingRobotAsync(robot, "default");
@@ -557,7 +557,7 @@ public async Task RenameOrientation_Valid_UpdatesName() {
557557
try {
558558
// Arrange
559559
var updatedAwaiter = new EventAwaiter();
560-
orientation.Updated += updatedAwaiter.EventHandler;
560+
orientation.PropertyChanged += updatedAwaiter.EventHandler;
561561
var updateTask = updatedAwaiter.WaitForEventAsync();
562562

563563
// Act
@@ -645,7 +645,7 @@ public async Task RenameAction_Valid_UpdatesName() {
645645
try {
646646
// Arrange
647647
var updatedAwaiter = new EventAwaiter();
648-
action.Updated += updatedAwaiter.EventHandler;
648+
action.PropertyChanged += updatedAwaiter.EventHandler;
649649
var updateTask = updatedAwaiter.WaitForEventAsync();
650650

651651
// Act

‎test/Arcor2.ClientSdk.ClientServices.IntegrationTests/Tests/Arcor2SessionPackageTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public async Task RenamePackage_Valid_UpdatesName() {
9191
try {
9292
// Act
9393
var updatedAwaiter = new EventAwaiter();
94-
package.Updated += updatedAwaiter.EventHandler;
94+
package.PropertyChanged += updatedAwaiter.EventHandler;
9595
var updateTask = updatedAwaiter.WaitForEventAsync();
9696

9797
await package.RenameAsync(newName);

‎test/Arcor2.ClientSdk.ClientServices.IntegrationTests/Tests/Arcor2SessionProjectTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ public async Task SetHasLogic_Valid_Changes() {
257257
try {
258258
// Act
259259
var changedAwaiterEvent = new EventAwaiter();
260-
project.Updated += changedAwaiterEvent.EventHandler;
260+
project.PropertyChanged += changedAwaiterEvent.EventHandler;
261261
var changedAwaiter = changedAwaiterEvent.WaitForEventAsync();
262262

263263
await project.SetHasLogicAsync(false);
@@ -370,7 +370,7 @@ public async Task UpdateOverride_Valid_ChangesValue() {
370370
var @override = project.Overrides!.FirstOrDefault(o => o.Data.Parameter.Name == parameter.Name);
371371
// Act
372372
var changedAwaiterEvent = new EventAwaiter();
373-
@override!.Updated += changedAwaiterEvent.EventHandler;
373+
@override!.PropertyChanged += changedAwaiterEvent.EventHandler;
374374
var changedAwaiter = changedAwaiterEvent.WaitForEventAsync();
375375
await @override.UpdateAsync(new Parameter(parameter.Name, parameter.Type, "\"newer_value\""));
376376
await changedAwaiter;
@@ -453,14 +453,14 @@ public async Task UpdateParameter_Valid_ChangesNameAndValue() {
453453

454454
// Act
455455
var changedAwaiterEvent = new EventAwaiter();
456-
parameter.Updated += changedAwaiterEvent.EventHandler;
456+
parameter.PropertyChanged += changedAwaiterEvent.EventHandler;
457457
var changedAwaiter = changedAwaiterEvent.WaitForEventAsync();
458458

459459
await parameter.UpdateNameAsync("new_name");
460460

461461
await changedAwaiter;
462462
changedAwaiterEvent = new EventAwaiter();
463-
parameter.Updated += changedAwaiterEvent.EventHandler;
463+
parameter.PropertyChanged += changedAwaiterEvent.EventHandler;
464464
var changedAwaiter2 = changedAwaiterEvent.WaitForEventAsync();
465465
await parameter.UpdateValueAsync("\"new_value\"");
466466

@@ -532,7 +532,7 @@ public async Task UpdateLogicItem_Valid_Updates() {
532532
await removeAwaiter;
533533

534534
var updatedAwaiter = new EventAwaiter();
535-
secondLogicItem.Updated += updatedAwaiter.EventHandler;
535+
secondLogicItem.PropertyChanged += updatedAwaiter.EventHandler;
536536
var updateTask = updatedAwaiter.WaitForEventAsync();
537537

538538
await secondLogicItem.UpdateAsync("START", action.Id); // Like the first logic item

0 commit comments

Comments
 (0)