summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2414.cs
diff options
context:
space:
mode:
Diffstat (limited to 'Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2414.cs')
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2414.cs19
1 files changed, 16 insertions, 3 deletions
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2414.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2414.cs
index 3b2c151a..622ed148 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2414.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2414.cs
@@ -9,7 +9,7 @@ using NUnit.Framework;
using Xamarin.UITest.iOS;
#endif
-namespace Xamarin.Forms.Controls
+namespace Xamarin.Forms.Controls.Issues
{
[Preserve (AllMembers = true)]
[Issue (IssueTracker.Github, 2414, "NullReferenceException when swiping over Context Actions", PlatformAffected.WinPhone)]
@@ -60,9 +60,11 @@ namespace Xamarin.Forms.Controls
[Test]
public void TestDoesntCrashShowingContextMenu ()
{
+ RunningApp.WaitForElement(c => c.Marked("Swipe ME"));
+
var screenBounds = RunningApp.Query (q => q.Raw ("* index:0"))[0].Rect;
- var cell = RunningApp.Query (c => c.Marked ("Swipe ME")) [0];
+ var cell = RunningApp.Query(c => c.Marked("Swipe ME")) [0];
#if __IOS__
RunningApp.DragCoordinates (screenBounds.Width - 10, cell.Rect.CenterY, 0, cell.Rect.CenterY);
//TODO: fix this when context menu bug is fixed
@@ -73,11 +75,18 @@ namespace Xamarin.Forms.Controls
#endif
RunningApp.Screenshot ("Didn't crash");
RunningApp.TapCoordinates (screenBounds.CenterX, screenBounds.CenterY);
+
+#if __ANDROID__
+ RunningApp.Tap(c => c.Marked("Text0"));
+#endif
+
}
[Test]
public void TestShowContextMenuItemsInTheRightOrder ()
{
+ RunningApp.WaitForElement(c => c.Marked("Swipe ME"));
+
var screenBounds = RunningApp.Query (q => q.Raw ("* index:0"))[0].Rect;
var cell = RunningApp.Query (c => c.Marked ("Swipe ME")) [0];
@@ -89,10 +98,14 @@ namespace Xamarin.Forms.Controls
RunningApp.WaitForElement (c => c.Marked ("Text0"));
RunningApp.Screenshot ("Are the menuitems in the right order?");
- }
+#if __ANDROID__
+ RunningApp.Tap(c => c.Marked("Text0"));
#endif
}
+#endif
+
+ }
}