Implement right method signature for GetProperty in AutoTest{Client}Session

2 files changed, 12 insertions, 9 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestClientSession.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestClientSession.cs
index f82ece22e5..ed1c3c2a00 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestClientSession.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestClientSession.cs
@@ -159,13 +159,6 @@ namespace MonoDevelop.Components.AutoTest
 			session.ExecuteCommand (cmd, dataItem, source);
 		}
 
-
-		public object GetPropertyValue (string propertyName)
-		{
-			ClearEventQueue ();
-			return session.GetPropertyValue (propertyName);
-		}
-
 		/*public bool SetPropertyValue (string propertyName, object value, object[] index = null)
 		{
 			ClearEventQueue ();
@@ -383,6 +376,12 @@ namespace MonoDevelop.Components.AutoTest
 			}
 		}
 
+		public object GetProperty (Func<AppQuery, AppQuery> query, string propertyName)
+		{
+			AppResult [] results = Query (query);
+			return session.GetProperty (results[0], propertyName);
+		}
+
 		public void SetProperty (Func<AppQuery, AppQuery> query, string propertyName, object value)
 		{
 			AppResult[] results = Query (query);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestSession.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestSession.cs
index d181595741..8e1cb1ede0 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestSession.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestSession.cs
@@ -675,13 +675,17 @@ namespace MonoDevelop.Components.AutoTest
 			}
 		}
 
-		public void GetProperty (AppResult result, string propertyName)
+		public object GetProperty (AppResult result, string propertyName)
 		{
+			object objectResult = null;
 			try {
-				ExecuteOnIdle (() => result.GetProperty (propertyName), wait: true);
+				ExecuteOnIdle (() => {
+					objectResult = result.GetProperty (propertyName);
+				}, wait: true);
 			} catch (TimeoutException e) {
 				ThrowOperationTimeoutException ("GetProperty", result.SourceQuery, result, e);
 			}
+			return objectResult;
 		}
 
 		public void SetProperty (AppResult result, string name, object o)