UITest fixes

Author: Redth

design/samples/Cheesesquare.UITests/Tests.cs

@@ -26,7 +26,7 @@ public void BeforeEachTest ()
         public void ClickingHamburgerShouldRevealDrawer ()
         {            
             app.Screenshot ("Launch");
-            app.Tap(t => t.Class("ImageButton"));
+            app.Tap(t => t.Marked("Navigate up"));
             app.WaitForElement(t => t.Text("Discussion"));
             app.Screenshot ("Tap Hamburger");
         }
@@ -37,7 +37,7 @@ public void ClickingFloatingActionButtonShouldDisplaySnackbar ()
             app.Screenshot ("Launch");
             app.Tap (q => q.Id ("fab"));
             app.Screenshot ("Tap Button");
-            app.WaitForElement (q => q.Id ("snackbar_text"));
+			app.WaitForElement (q => q.Id("snackbar_text"), timeout: TimeSpan.FromSeconds(10));
             app.Screenshot ("Snackbar");
         }
 

v7-appcompat/samples/AndroidSupportSample.UITests/Tests.cs

@@ -91,24 +91,20 @@ public void ActionBarTabs ()
         public void DisplayOptions ()
         {
             app.Screenshot ("Launch");
-            app.Tap(q => q.Text("Display Options"));
-            app.WaitForElement (q => q.Class ("Toolbar"));
+            app.Tap(q => q.Marked("Display Options"));
+            app.WaitForElement (q => q.Marked ("toggle_navigation"));
             app.Screenshot ("Display Options");
 
-            app.Tap (q => q.Id ("toggle_home_as_up"));
-            app.WaitForElement (q => q.Class ("ImageButton"));
+            app.Tap (q => q.Marked ("toggle_home_as_up"));
+            app.WaitForElement (q => q.Marked ("Navigate up"));
             app.Screenshot ("Toggle Home as Up");
 
-            app.Tap (q => q.Id ("toggle_show_title"));
-            app.WaitForNoElement (q => q.Text ("Display Options"));
+            app.Tap (q => q.Marked ("toggle_show_title"));
+            app.WaitForNoElement (q => q.Marked ("Display Options"));
             app.Screenshot ("Hide Title");
-            app.Tap (q => q.Id ("toggle_show_title"));
-            app.WaitForElement (q => q.Text ("Display Options"));
+            app.Tap (q => q.Marked ("toggle_show_title"));
+            app.WaitForElement (q => q.Marked ("Display Options"));
             app.Screenshot ("Show Title");
-
-            app.Tap (q => q.Id ("toggle_visibility"));
-            app.WaitForNoElement (q => q.Class ("Toolbar"));
-            app.Screenshot ("Hide Toolbar");
         }
 
         [Test]

v7-gridlayout/samples/AndroidSupportSample.UITests/Tests.cs

@@ -22,7 +22,7 @@ public void BeforeEachTest ()
                 .StartApp ();
         }
 
-//        [Test]
+        [Test]
         public void Repl ()
         {
             app.Repl ();
@@ -55,13 +55,13 @@ public void FormXml ()
         }
 
         [Test]
-        public void FormJava ()
+        public void FormCSharp ()
         {
             app.Screenshot ("Launch");
-            app.Tap (q => q.Text ("3. Form (Java)"));
-            app.Screenshot ("Tap 3. Form (Java)");
+            app.Tap (q => q.Text ("3. Form (C#)"));
+            app.Screenshot ("Tap 3. Form (C#)");
             app.WaitForElement (q => q.Class ("GridLayout"));
-            app.Screenshot ("Form Java");
+            app.Screenshot ("Form C#");
         }
     }
 }

v7-preference/samples/AndroidSupportSample.UITests/Tests.cs

@@ -22,7 +22,7 @@ public void BeforeEachTest ()
                 .StartApp ();
         }
 
-        //[Test]
+        [Test]
         public void Repl ()
         {
             app.Repl ();
@@ -32,8 +32,28 @@ public void Repl ()
         public void AppLaunches ()
         {
             app.Screenshot ("Launch");
-            app.WaitForElement (q => q.Class ("PercentFrameLayout"));
+            app.WaitForElement (q => q.Marked ("List Preference"));
         }
+
+		[Test]
+		public void ListPreference()
+		{
+			app.Screenshot("Launch");
+			app.WaitForElement(q => q.Marked("List Preference"));
+			app.Tap(q => q.Marked("List Preference"));
+			app.WaitForElement(q => q.Marked("Three"));
+			app.Screenshot("List Preference");
+		}
+
+		[Test]
+		public void EditTextPreference()
+		{
+			app.Screenshot("Launch");
+			app.WaitForElement(q => q.Marked("Edit Text Preference"));
+			app.Tap(q => q.Marked("Edit Text Preference"));
+			app.WaitForElement(q => q.Marked("Dialog Title Edit Text Preference"));
+			app.Screenshot("Edit Text Preference");
+		}
     }
 }