Revert "Merge pull request #1032 from iainx/testable-selector-view"

This reverts commit 6fc7a8a3318468fafd47d39b34e508afbb41acb8, reversing
changes made to 6ea36c695236222ff2e4d70cbfff1877e1e8cedd.

4 files changed, 1 insertions, 115 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest.Results/NSObjectResult.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest.Results/NSObjectResult.cs
index 14785d98fe..b9fa5d5b05 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest.Results/NSObjectResult.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest.Results/NSObjectResult.cs
@@ -26,15 +26,12 @@
 #if MAC
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using System.Xml;
 
 using AppKit;
 using Foundation;
 
-using MonoDevelop.Components.MainToolbar;
-
 namespace MonoDevelop.Components.AutoTest.Results
 {
 	public class NSObjectResult : AppResult
@@ -243,54 +240,6 @@ namespace MonoDevelop.Components.AutoTest.Results
 		{
 			
 		}
-
-#region MacPlatform.MacIntegration.MainToolbar.SelectorView
-		public override bool SetActiveConfiguration (string configurationName)
-		{
-			Type type = ResultObject.GetType ();
-			PropertyInfo pinfo = type.GetProperty ("ConfigurationModel");
-			if (pinfo == null) {
-				return false;
-			}
-
-			IEnumerable<IConfigurationModel> model = (IEnumerable<IConfigurationModel>)pinfo.GetValue (ResultObject, null);
-			var configuration = model.FirstOrDefault (c => c.DisplayString == configurationName);
-			if (configuration == null) {
-				return false;
-			}
-
-			pinfo = type.GetProperty ("ActiveConfiguration");
-			if (pinfo == null) {
-				return false;
-			}
-
-			pinfo.SetValue (ResultObject, configuration);
-			return true;
-		}
-
-		public override bool SetActiveRuntime (string runtimeName)
-		{
-			Type type = ResultObject.GetType ();
-			PropertyInfo pinfo = type.GetProperty ("RuntimeModel");
-			if (pinfo == null) {
-				return false;
-			}
-
-			IEnumerable<IRuntimeModel> model = (IEnumerable<IRuntimeModel>)pinfo.GetValue (ResultObject, null);
-			var runtime = model.FirstOrDefault (r => r.FullDisplayString == runtimeName);
-			if (runtime == null) {
-				return false;
-			}
-
-			pinfo = type.GetProperty ("ActiveRuntime");
-			if (pinfo == null) {
-				return false;
-			}
-
-			pinfo.SetValue (ResultObject, runtime);
-			return true;
-		}
-#endregion
 	}
 }
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AppResult.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AppResult.cs
index 20a71e2df5..925b3eead2 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AppResult.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AppResult.cs
@@ -63,21 +63,8 @@ namespace MonoDevelop.Components.AutoTest
 		public abstract bool TypeKey (string keyString, string state = "");
 		public abstract bool EnterText (string text);
 		public abstract bool Toggle (bool active);
-		public abstract void Flash ();
-
-		// More specific actions for complicated widgets
-
-		#region For MacPlatform.MacIntegration.MainToolbar.SelectorView
-		public virtual bool SetActiveConfiguration (string configurationName)
-		{
-			return false;
-		}
 
-		public virtual bool SetActiveRuntime (string runtimeName)
-		{
-			return false;
-		}
-		#endregion
+		public abstract void Flash ();
 
 		// Inspection Operations
 		public abstract ObjectProperties Properties ();
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 085c1cba86..589565869e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestClientSession.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestClientSession.cs
@@ -354,26 +354,6 @@ namespace MonoDevelop.Components.AutoTest
 			}
 		}
 
-		public bool SetActiveConfiguration (Func<AppQuery, AppQuery> query, string configuration)
-		{
-			AppResult[] results = Query (query);
-			if (results.Length == 0) {
-				return false;
-			}
-
-			return session.SetActiveConfiguration (results [0], configuration);
-		}
-
-		public bool SetActiveRuntime (Func<AppQuery, AppQuery> query, string runtime)
-		{
-			AppResult[] results = Query (query);
-			if (results.Length == 0) {
-				return false;
-			}
-
-			return session.SetActiveRuntime (results [0], runtime);
-		}
-
 		public void RunAndWaitForTimer (Action action, string counterName, int timeout = 20000)
 		{
 			AutoTestSession.TimerCounterContext context = session.CreateNewTimerContext (counterName);
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 30729b63c3..2d35b53b90 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestSession.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestSession.cs
@@ -530,36 +530,6 @@ namespace MonoDevelop.Components.AutoTest
 			}
 		}
 
-		public bool SetActiveConfiguration (AppResult result, string configuration)
-		{
-			bool success = false;
-
-			try {
-				ExecuteOnIdle (() => {
-					success = result.SetActiveConfiguration (configuration);
-				});
-			} catch (TimeoutException e) {
-				ThrowOperationTimeoutException ("SetActiveConfiguration", result.SourceQuery, result, e);
-			}
-
-			return success;
-		}
-
-		public bool SetActiveRuntime (AppResult result, string runtime)
-		{
-			bool success = false;
-
-			try {
-				ExecuteOnIdle (() => {
-					success = result.SetActiveRuntime (runtime);
-				});
-			} catch (TimeoutException e) {
-				ThrowOperationTimeoutException ("SetActiveRuntime", result.SourceQuery, result, e);
-			}
-
-			return success;
-		}
-
 		void ThrowOperationTimeoutException (string operation, string query, AppResult result, Exception innerException)
 		{
 			throw new TimeoutException (string.Format ("Timeout while executing {0}: {1}\n\ton Element: {2}", operation, query, result), innerException);