diff options
author | E.Z. Hart <hartez@gmail.com> | 2017-06-15 15:26:58 -0600 |
---|---|---|
committer | E.Z. Hart <hartez@gmail.com> | 2017-06-15 15:26:58 -0600 |
commit | 7615340cfd351e150ed9655f86ef3766df041aa1 (patch) | |
tree | bb632ac8221625dee5f1fbcab0d8077e84e97321 | |
parent | 6f5d6ce8daf280ce3f5717cb90ee2e73ae9e474b (diff) | |
download | xamarin-forms-7615340cfd351e150ed9655f86ef3766df041aa1.tar.gz xamarin-forms-7615340cfd351e150ed9655f86ef3766df041aa1.tar.bz2 xamarin-forms-7615340cfd351e150ed9655f86ef3766df041aa1.zip |
Fix test for 57317 on iOS
-rw-r--r-- | Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57317.cs | 7 | ||||
-rw-r--r-- | Xamarin.Forms.Core.UITests.Shared/Utilities/Gestures.cs | 17 |
2 files changed, 21 insertions, 3 deletions
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57317.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57317.cs index 49a3dffc..d42c6568 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57317.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57317.cs @@ -1,5 +1,4 @@ using System; - using Xamarin.Forms.CustomAttributes; using System.Collections.ObjectModel; using System.Windows.Input; @@ -9,6 +8,7 @@ using Xamarin.Forms.Internals; using Xamarin.UITest.iOS; using Xamarin.UITest; using NUnit.Framework; +using Xamarin.Forms.Core.UITests; #endif namespace Xamarin.Forms.Controls.Issues @@ -43,8 +43,9 @@ namespace Xamarin.Forms.Controls.Issues public void Bugzilla57317Test () { RunningApp.WaitForElement (c => c.Marked ("Cell")); - var cell = RunningApp.Query (c => c.Marked ("Cell")) [0]; - RunningApp.TouchAndHoldCoordinates (cell.Rect.CenterX, cell.Rect.CenterY); + + RunningApp.ActivateContextMenu("Cell"); + RunningApp.WaitForElement (c => c.Marked ("Self-Deleting item")); RunningApp.Tap (c => c.Marked ("Self-Deleting item")); } diff --git a/Xamarin.Forms.Core.UITests.Shared/Utilities/Gestures.cs b/Xamarin.Forms.Core.UITests.Shared/Utilities/Gestures.cs index f998267b..660d2ea3 100644 --- a/Xamarin.Forms.Core.UITests.Shared/Utilities/Gestures.cs +++ b/Xamarin.Forms.Core.UITests.Shared/Utilities/Gestures.cs @@ -105,5 +105,22 @@ namespace Xamarin.Forms.Core.UITests { app.DragCoordinates (drag.XStart, drag.YStart, drag.XEnd, drag.YEnd); } + + public static void ActivateContextMenu(this IApp app, string target) + { +#if __IOS__ + var element = app.WaitForElement(target); + var rect = element[0].Rect; + var appRect = app.RootViewRect(); + + app.DragCoordinates(rect.X + (0.85f * appRect.Width), + rect.CenterY, + rect.X + (0.25f * rect.Width), + rect.CenterY); +#else + app.TouchAndHold(target); +#endif + + } } }
\ No newline at end of file |