Skip to content

Commit dcca751

Browse files
authored
Rename methods in Actions class to be more closer to .net rules (#12439)
* Rename methods in Actions class to be more closer to .net rules * More cleaning up
1 parent 17a2aa8 commit dcca751

File tree

5 files changed

+48
-49
lines changed

5 files changed

+48
-49
lines changed

dotnet/src/webdriver/Interactions/Actions.cs

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
using System;
2020
using System.Collections.Generic;
21-
using System.Drawing;
2221

2322
namespace OpenQA.Selenium.Interactions
2423
{
@@ -58,7 +57,7 @@ protected IActionExecutor ActionExecutor
5857
get { return this.actionExecutor; }
5958
}
6059

61-
public Actions setActivePointer(PointerKind kind, String name)
60+
public Actions SetActivePointer(PointerKind kind, String name)
6261
{
6362
IList<ActionSequence> sequences = this.actionBuilder.ToActionSequenceList();
6463

@@ -89,7 +88,7 @@ public Actions setActivePointer(PointerKind kind, String name)
8988
return this;
9089
}
9190

92-
public Actions setActiveKeyboard(String name)
91+
public Actions SetActiveKeyboard(String name)
9392
{
9493
IList<ActionSequence> sequences = this.actionBuilder.ToActionSequenceList();
9594

@@ -120,7 +119,7 @@ public Actions setActiveKeyboard(String name)
120119
return this;
121120
}
122121

123-
public Actions setActiveWheel(String name)
122+
public Actions SetActiveWheel(String name)
124123
{
125124
IList<ActionSequence> sequences = this.actionBuilder.ToActionSequenceList();
126125

@@ -152,29 +151,29 @@ public Actions setActiveWheel(String name)
152151
}
153152

154153

155-
public PointerInputDevice getActivePointer()
154+
public PointerInputDevice GetActivePointer()
156155
{
157156
if (this.activePointer == null)
158157
{
159-
setActivePointer(PointerKind.Mouse, "default mouse");
158+
SetActivePointer(PointerKind.Mouse, "default mouse");
160159
}
161160
return this.activePointer;
162161
}
163162

164-
public KeyInputDevice getActiveKeyboard()
163+
public KeyInputDevice GetActiveKeyboard()
165164
{
166165
if (this.activeKeyboard == null)
167166
{
168-
setActiveKeyboard("default keyboard");
167+
SetActiveKeyboard("default keyboard");
169168
}
170169
return this.activeKeyboard;
171170
}
172171

173-
public WheelInputDevice getActiveWheel()
172+
public WheelInputDevice GetActiveWheel()
174173
{
175174
if (this.activeWheel == null)
176175
{
177-
setActiveWheel("default wheel");
176+
SetActiveWheel("default wheel");
178177
}
179178
return this.activeWheel;
180179
}
@@ -215,13 +214,13 @@ public Actions KeyDown(IWebElement element, string theKey)
215214
ILocatable target = GetLocatableFromElement(element);
216215
if (element != null)
217216
{
218-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerMove(element, 0, 0, DefaultMouseMoveDuration));
219-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerDown(MouseButton.Left));
220-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerUp(MouseButton.Left));
217+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerMove(element, 0, 0, DefaultMouseMoveDuration));
218+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerDown(MouseButton.Left));
219+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerUp(MouseButton.Left));
221220
}
222221

223-
this.actionBuilder.AddAction(this.getActiveKeyboard().CreateKeyDown(theKey[0]));
224-
this.actionBuilder.AddAction(new PauseInteraction(this.getActiveKeyboard(), TimeSpan.FromMilliseconds(100)));
222+
this.actionBuilder.AddAction(this.GetActiveKeyboard().CreateKeyDown(theKey[0]));
223+
this.actionBuilder.AddAction(new PauseInteraction(this.GetActiveKeyboard(), TimeSpan.FromMilliseconds(100)));
225224
return this;
226225
}
227226

@@ -259,12 +258,12 @@ public Actions KeyUp(IWebElement element, string theKey)
259258
ILocatable target = GetLocatableFromElement(element);
260259
if (element != null)
261260
{
262-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerMove(element, 0, 0, DefaultMouseMoveDuration));
263-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerDown(MouseButton.Left));
264-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerUp(MouseButton.Left));
261+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerMove(element, 0, 0, DefaultMouseMoveDuration));
262+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerDown(MouseButton.Left));
263+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerUp(MouseButton.Left));
265264
}
266265

267-
this.actionBuilder.AddAction(this.getActiveKeyboard().CreateKeyUp(theKey[0]));
266+
this.actionBuilder.AddAction(this.GetActiveKeyboard().CreateKeyUp(theKey[0]));
268267
return this;
269268
}
270269

@@ -294,15 +293,15 @@ public Actions SendKeys(IWebElement element, string keysToSend)
294293
ILocatable target = GetLocatableFromElement(element);
295294
if (element != null)
296295
{
297-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerMove(element, 0, 0, DefaultMouseMoveDuration));
298-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerDown(MouseButton.Left));
299-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerUp(MouseButton.Left));
296+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerMove(element, 0, 0, DefaultMouseMoveDuration));
297+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerDown(MouseButton.Left));
298+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerUp(MouseButton.Left));
300299
}
301300

302301
foreach (char key in keysToSend)
303302
{
304-
this.actionBuilder.AddAction(this.getActiveKeyboard().CreateKeyDown(key));
305-
this.actionBuilder.AddAction(this.getActiveKeyboard().CreateKeyUp(key));
303+
this.actionBuilder.AddAction(this.GetActiveKeyboard().CreateKeyDown(key));
304+
this.actionBuilder.AddAction(this.GetActiveKeyboard().CreateKeyUp(key));
306305
}
307306

308307
return this;
@@ -325,7 +324,7 @@ public Actions ClickAndHold(IWebElement onElement)
325324
/// <returns>A self-reference to this <see cref="Actions"/>.</returns>
326325
public Actions ClickAndHold()
327326
{
328-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerDown(MouseButton.Left));
327+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerDown(MouseButton.Left));
329328
return this;
330329
}
331330

@@ -346,7 +345,7 @@ public Actions Release(IWebElement onElement)
346345
/// <returns>A self-reference to this <see cref="Actions"/>.</returns>
347346
public Actions Release()
348347
{
349-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerUp(MouseButton.Left));
348+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerUp(MouseButton.Left));
350349
return this;
351350
}
352351

@@ -367,8 +366,8 @@ public Actions Click(IWebElement onElement)
367366
/// <returns>A self-reference to this <see cref="Actions"/>.</returns>
368367
public Actions Click()
369368
{
370-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerDown(MouseButton.Left));
371-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerUp(MouseButton.Left));
369+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerDown(MouseButton.Left));
370+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerUp(MouseButton.Left));
372371
return this;
373372
}
374373

@@ -389,10 +388,10 @@ public Actions DoubleClick(IWebElement onElement)
389388
/// <returns>A self-reference to this <see cref="Actions"/>.</returns>
390389
public Actions DoubleClick()
391390
{
392-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerDown(MouseButton.Left));
393-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerUp(MouseButton.Left));
394-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerDown(MouseButton.Left));
395-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerUp(MouseButton.Left));
391+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerDown(MouseButton.Left));
392+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerUp(MouseButton.Left));
393+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerDown(MouseButton.Left));
394+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerUp(MouseButton.Left));
396395
return this;
397396
}
398397

@@ -421,7 +420,7 @@ public Actions MoveToElement(IWebElement toElement)
421420
/// <returns>A self-reference to this <see cref="Actions"/>.</returns>
422421
public Actions MoveToElement(IWebElement toElement, int offsetX, int offsetY)
423422
{
424-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerMove(toElement, offsetX, offsetY, DefaultMouseMoveDuration));
423+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerMove(toElement, offsetX, offsetY, DefaultMouseMoveDuration));
425424
return this;
426425
}
427426

@@ -433,7 +432,7 @@ public Actions MoveToElement(IWebElement toElement, int offsetX, int offsetY)
433432
/// <returns>A self-reference to this <see cref="Actions"/>.</returns>
434433
public Actions MoveByOffset(int offsetX, int offsetY)
435434
{
436-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerMove(CoordinateOrigin.Pointer, offsetX, offsetY, DefaultMouseMoveDuration));
435+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerMove(CoordinateOrigin.Pointer, offsetX, offsetY, DefaultMouseMoveDuration));
437436
return this;
438437
}
439438

@@ -445,7 +444,7 @@ public Actions MoveByOffset(int offsetX, int offsetY)
445444
/// <returns>A self-reference to this <see cref="Actions"/>.</returns>
446445
public Actions MoveToLocation(int offsetX, int offsetY)
447446
{
448-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerMove(CoordinateOrigin.Viewport, offsetX, offsetY, DefaultMouseMoveDuration));
447+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerMove(CoordinateOrigin.Viewport, offsetX, offsetY, DefaultMouseMoveDuration));
449448
return this;
450449
}
451450

@@ -466,8 +465,8 @@ public Actions ContextClick(IWebElement onElement)
466465
/// <returns>A self-reference to this <see cref="Actions"/>.</returns>
467466
public Actions ContextClick()
468467
{
469-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerDown(MouseButton.Right));
470-
this.actionBuilder.AddAction(this.getActivePointer().CreatePointerUp(MouseButton.Right));
468+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerDown(MouseButton.Right));
469+
this.actionBuilder.AddAction(this.GetActivePointer().CreatePointerUp(MouseButton.Right));
471470
return this;
472471
}
473472

@@ -503,7 +502,7 @@ public Actions DragAndDropToOffset(IWebElement source, int offsetX, int offsetY)
503502
/// <returns>A self-reference to this <see cref="Actions"/>.</returns>
504503
public Actions ScrollToElement(IWebElement element)
505504
{
506-
this.actionBuilder.AddAction(this.getActiveWheel().CreateWheelScroll(element, 0, 0, 0, 0, DefaultScrollDuration));
505+
this.actionBuilder.AddAction(this.GetActiveWheel().CreateWheelScroll(element, 0, 0, 0, 0, DefaultScrollDuration));
507506

508507
return this;
509508
}
@@ -516,7 +515,7 @@ public Actions ScrollToElement(IWebElement element)
516515
/// <returns>A self-reference to this <see cref="Actions"/>.</returns>
517516
public Actions ScrollByAmount(int deltaX, int deltaY)
518517
{
519-
this.actionBuilder.AddAction(this.getActiveWheel().CreateWheelScroll(deltaX, deltaY, DefaultScrollDuration));
518+
this.actionBuilder.AddAction(this.GetActiveWheel().CreateWheelScroll(deltaX, deltaY, DefaultScrollDuration));
520519

521520
return this;
522521
}
@@ -543,12 +542,12 @@ public Actions ScrollFromOrigin(WheelInputDevice.ScrollOrigin scrollOrigin, int
543542

544543
if (scrollOrigin.Viewport)
545544
{
546-
this.actionBuilder.AddAction(this.getActiveWheel().CreateWheelScroll(CoordinateOrigin.Viewport,
545+
this.actionBuilder.AddAction(this.GetActiveWheel().CreateWheelScroll(CoordinateOrigin.Viewport,
547546
scrollOrigin.XOffset, scrollOrigin.YOffset, deltaX, deltaY, DefaultScrollDuration));
548547
}
549548
else
550549
{
551-
this.actionBuilder.AddAction(this.getActiveWheel().CreateWheelScroll(scrollOrigin.Element,
550+
this.actionBuilder.AddAction(this.GetActiveWheel().CreateWheelScroll(scrollOrigin.Element,
552551
scrollOrigin.XOffset, scrollOrigin.YOffset, deltaX, deltaY, DefaultScrollDuration));
553552
}
554553

@@ -562,7 +561,7 @@ public Actions ScrollFromOrigin(WheelInputDevice.ScrollOrigin scrollOrigin, int
562561
/// <returns>A self-reference to this <see cref="Actions"/>.</returns>
563562
public Actions Pause(TimeSpan duration)
564563
{
565-
this.actionBuilder.AddAction(new PauseInteraction(this.getActivePointer(), duration));
564+
this.actionBuilder.AddAction(new PauseInteraction(this.GetActivePointer(), duration));
566565
return this;
567566
}
568567

dotnet/test/common/Interactions/BasicKeyboardInterfaceTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public void ReleaseModifierKeys()
3535
public void ShouldSetActiveKeyboard()
3636
{
3737
Actions actionProvider = new Actions(driver);
38-
actionProvider.setActiveKeyboard("test keyboard");
38+
actionProvider.SetActiveKeyboard("test keyboard");
3939

40-
KeyInputDevice device = actionProvider.getActiveKeyboard();
40+
KeyInputDevice device = actionProvider.GetActiveKeyboard();
4141

4242
Assert.AreEqual("test keyboard", device.DeviceName);
4343
}

dotnet/test/common/Interactions/BasicMouseInterfaceTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ public void SetupTest()
2424
public void ShouldSetActivePointer()
2525
{
2626
Actions actionProvider = new Actions(driver);
27-
actionProvider.setActivePointer(PointerKind.Mouse, "test mouse");
27+
actionProvider.SetActivePointer(PointerKind.Mouse, "test mouse");
2828

29-
PointerInputDevice device = actionProvider.getActivePointer();
29+
PointerInputDevice device = actionProvider.GetActivePointer();
3030

3131
Assert.AreEqual("test mouse", device.DeviceName);
3232
}

dotnet/test/common/Interactions/BasicWheelInterfaceTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ public void SetupTest()
2323
public void ShouldSetActiveWheel()
2424
{
2525
Actions actionProvider = new Actions(driver);
26-
actionProvider.setActiveWheel("test wheel");
26+
actionProvider.SetActiveWheel("test wheel");
2727

28-
WheelInputDevice device = actionProvider.getActiveWheel();
28+
WheelInputDevice device = actionProvider.GetActiveWheel();
2929

3030
Assert.AreEqual("test wheel", device.DeviceName);
3131
}

dotnet/test/common/Interactions/CombinedInputActionsTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void ShouldAllowSettingActivePointerWithKeyBoardActions()
6868
IAction loginAction = actionProvider
6969
.SendKeys(username, "username")
7070
.SendKeys(password, "password")
71-
.setActivePointer(PointerKind.Mouse, "test")
71+
.SetActivePointer(PointerKind.Mouse, "test")
7272
.MoveToElement(login)
7373
.Click()
7474
.Build();

0 commit comments

Comments
 (0)