[UITest] Extend WaitForPackageUpdate and fix TestLocalCopyPreservedUpdate

1 files changed, 23 insertions, 11 deletions

diff --git a/main/tests/UserInterfaceTests/Ide.cs b/main/tests/UserInterfaceTests/Ide.cs
index 4c4bd5d97a..6c78efc494 100644
--- a/main/tests/UserInterfaceTests/Ide.cs
+++ b/main/tests/UserInterfaceTests/Ide.cs
@@ -101,18 +101,24 @@ namespace UserInterfaceTests
 
 		public readonly static Action EmptyAction = delegate { };
 
+		static string[] waitForNuGetMessages = {
+			"Package updates are available.",
+			"Packages are up to date.",
+			"No updates found but warnings were reported.",
+			"Packages successfully added.",
+			"Packages successfully updated.",
+			"Packages added with warnings.",
+			"Packages updated with warnings."};
 		public readonly static Action WaitForPackageUpdate = delegate {
-			WaitForStatusMessage (new [] {
-				"Package updates are available.",
-				"Packages are up to date.",
-				"No updates found but warnings were reported.",
-				"Packages successfully added.",
-				"Packages successfully updated.",
-				"Packages added with warnings.",
-				"Packages updated with warnings."},
-				timeoutInSecs: 180, pollStepInSecs: 5);
+			WaitForStatusMessage (waitForNuGetMessages, timeoutInSecs: 180, pollStepInSecs: 5);
 		};
 
+		public static void WaitForPackageUpdateExtra (List<string> otherMessages)
+		{
+			otherMessages.AddRange (waitForNuGetMessages);
+			WaitForStatusMessage (otherMessages.ToArray (), timeoutInSecs: 180, pollStepInSecs: 5);
+		}
+
 		public readonly static Action WaitForSolutionCheckedOut = delegate {
 			WaitForStatusMessage (new [] {"Solution checked out", "Solution Loaded."}, timeoutInSecs: 360, pollStepInSecs: 5);
 		};
@@ -138,8 +144,14 @@ namespace UserInterfaceTests
 		static void PollStatusMessage (string[] statusMessage, int timeoutInSecs, int pollStepInSecs, bool waitForMessage = true)
 		{
 			Ide.WaitUntil (() => {
-				var actualStatusMessage = Workbench.GetStatusMessage ();
-				return waitForMessage == (statusMessage.Contains (actualStatusMessage, StringComparer.OrdinalIgnoreCase));
+				try {
+					var actualStatusMessage = Workbench.GetStatusMessage ();
+					return waitForMessage == (statusMessage.Contains (actualStatusMessage, StringComparer.OrdinalIgnoreCase));
+				} catch (TimeoutException e) {
+					throw new TimeoutException (
+						string.Format ("Timed out. Found status message '{0}'\nand expected one of these:\n\t",
+						string.Join ("\n\t", statusMessage)), e);
+				}
 			}, pollStep: pollStepInSecs * 1000, timeout: timeoutInSecs * 1000);
 		}
 	}