[UITest] Close Xamarin Update if opened

1 files changed, 18 insertions, 1 deletions

diff --git a/main/tests/UserInterfaceTests/UITestBase.cs b/main/tests/UserInterfaceTests/UITestBase.cs
index bf7289d1dc..3a4470b771 100644
--- a/main/tests/UserInterfaceTests/UITestBase.cs
+++ b/main/tests/UserInterfaceTests/UITestBase.cs
@@ -78,13 +78,18 @@ namespace UserInterfaceTests
 			TestService.Session.DebugObject = new UITestDebug ();
 
 			FoldersToClean.Add (mdProfile);
+
+			Session.WaitForElement (IdeQuery.DefaultWorkbench);
+			TakeScreenShot ("Application-Started");
+			CloseIfXamarinUpdateOpen ();
+			TakeScreenShot ("Application-Ready");
 		}
 
 		[TearDown]
 		public virtual void Teardown ()
 		{
 			try {
-				if (Session.Query (c => c.Marked ("Xamarin Update")).Any ()) {
+				if (Session.Query (IdeQuery.XamarinUpdate).Any ()) {
 					Assert.Inconclusive ("Xamarin Update is blocking the application focus");
 				}
 				ValidateIdeLogMessages ();
@@ -115,6 +120,18 @@ namespace UserInterfaceTests
 				"'Gtk-Critical: void gtk_container_remove' detected");
 		}
 
+		protected void CloseIfXamarinUpdateOpen ()
+		{
+			try {
+				Session.WaitForElement (IdeQuery.XamarinUpdate, 10 * 1000);
+				TakeScreenShot ("Xamarin-Update-Opened");
+				Session.ClickElement (c => IdeQuery.XamarinUpdate (c).Children ().Button ().Text ("Close"));
+			}
+			catch (TimeoutException) {
+				TestService.Session.DebugObject.Debug ("Xamarin Update did not open");
+			}
+		}
+
 		void SetupTestResultFolder ()
 		{
 			currentTestResultFolder = Path.Combine (testResultFolder, TestContext.CurrentContext.Test.FullName);