Move IronPython and IronRuby IConsole and IConsolePad interfaces into common Scripting project.

src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj

@@ -88,8 +88,6 @@
     <Compile Include="Configuration\AssemblyInfo.cs" />
     <Compile Include="Src\AddInOptions.cs" />
     <Compile Include="Src\CompilingOptionsPanel.cs" />
-    <Compile Include="Src\IPythonConsole.cs" />
-    <Compile Include="Src\IPythonConsolePad.cs" />
     <Compile Include="Src\IPythonResolver.cs" />
     <Compile Include="Src\IPythonWorkbench.cs" />
     <Compile Include="Src\MemberName.cs" />

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IPythonConsolePad.cs

@@ -1,19 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.Scripting;
-
-namespace ICSharpCode.PythonBinding
-{
-	public interface IPythonConsolePad
-	{
-		void BringToFront();
-		IScriptingConsoleTextEditor ConsoleTextEditor { get; }
-		IPythonConsole PythonConsole { get; }
-	}
-}

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IPythonWorkbench.cs

@@ -6,13 +6,14 @@
 // </file>
 
 using System;
+using ICSharpCode.Scripting;
 using ICSharpCode.SharpDevelop.Gui;
 
 namespace ICSharpCode.PythonBinding
 {
 	public interface IPythonWorkbench
 	{
-		IPythonConsolePad GetPythonConsolePad();
+		IScriptingConsolePad GetScriptingConsolePad();
 		IViewContent ActiveViewContent { get; }
 	}
 }

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsole.cs

@@ -19,7 +19,7 @@ using Microsoft.Scripting.Hosting.Shell;
 
 namespace ICSharpCode.PythonBinding
 {
-	public class PythonConsole : IConsole, IDisposable, IMemberProvider, IPythonConsole
+	public class PythonConsole : IConsole, IDisposable, IMemberProvider, IScriptingConsole
 	{
 		IScriptingConsoleTextEditor textEditor;
 		int lineReceivedEventIndex = 0; // The index into the waitHandles array where the lineReceivedEvent is stored.

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsolePad.cs

@@ -12,7 +12,7 @@ using AvalonEdit = ICSharpCode.AvalonEdit;
 
 namespace ICSharpCode.PythonBinding
 {
-	public class PythonConsolePad : AbstractPadContent, IPythonConsolePad
+	public class PythonConsolePad : AbstractPadContent, IScriptingConsolePad
 	{
 		ThreadSafeScriptingConsoleTextEditor consoleTextEditor;
 		AvalonEdit.TextEditor textEditor;
@@ -26,11 +26,11 @@ namespace ICSharpCode.PythonBinding
 			host.Run();	
 		}
 		
-		public IScriptingConsoleTextEditor ConsoleTextEditor {
+		public IScriptingConsoleTextEditor ScriptingConsoleTextEditor {
 			get { return consoleTextEditor; }
 		}
 		
-		public IPythonConsole PythonConsole {
+		public IScriptingConsole ScriptingConsole {
 			get { return host.PythonConsole; }
 		}
 		

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonWorkbench.cs

@@ -6,6 +6,7 @@
 // </file>
 
 using System;
+using ICSharpCode.Scripting;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
 
@@ -24,10 +25,10 @@ namespace ICSharpCode.PythonBinding
 			get { return workbench.ActiveViewContent; }
 		}
 		
-		public IPythonConsolePad GetPythonConsolePad()
+		public IScriptingConsolePad GetScriptingConsolePad()
 		{
 			PadDescriptor padDescriptor = workbench.GetPad(typeof(PythonConsolePad));
-			return padDescriptor.PadContent as IPythonConsolePad;
+			return padDescriptor.PadContent as IScriptingConsolePad;
 		}
 	}
 }

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/SendLineToPythonConsoleCommand.cs

@@ -7,6 +7,7 @@
 
 using System;
 using ICSharpCode.Core;
+using ICSharpCode.Scripting;
 using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Gui;
 
@@ -15,10 +16,10 @@ namespace ICSharpCode.PythonBinding
 	public class SendLineToPythonConsoleCommand : AbstractCommand
 	{
 		IPythonWorkbench workbench;
-		IPythonConsolePad consolePad;
+		IScriptingConsolePad consolePad;
 		PythonTextEditorViewContent textEditorView;
 		ITextEditor activeTextEditor;
-		IPythonConsole pythonConsole;
+		IScriptingConsole pythonConsole;
 		string lineFromActiveTextEditor;
 		
 		public SendLineToPythonConsoleCommand()
@@ -51,7 +52,7 @@ namespace ICSharpCode.PythonBinding
 		
 		void GetPythonConsolePad()
 		{
-			consolePad = workbench.GetPythonConsolePad();
+			consolePad = workbench.GetScriptingConsolePad();
 		}
 				
 		void ShowPythonConsolePad()
@@ -67,7 +68,7 @@ namespace ICSharpCode.PythonBinding
 		
 		void GetPythonConsole()
 		{
-			pythonConsole = consolePad.PythonConsole;
+			pythonConsole = consolePad.ScriptingConsole;
 		}
 	}
 }

src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/SendLineToPythonConsoleCommandTests.cs

@@ -20,7 +20,7 @@ namespace PythonBinding.Tests.Gui
 		MockConsoleTextEditor fakeConsoleTextEditor;
 		MockTextEditor fakeTextEditor;
 		MockWorkbench workbench;
-		MockPythonConsole fakeConsole;
+		MockScriptingConsole fakeConsole;
 		
 		[Test]
 		public void Run_SingleLineInTextEditor_FirstLineSentToPythonConsole()
@@ -38,8 +38,8 @@ namespace PythonBinding.Tests.Gui
 		void CreateSendLineToConsoleCommand()
 		{
 			workbench = MockWorkbench.CreateWorkbenchWithOneViewContent("test.py");
-			fakeConsoleTextEditor = workbench.MockPythonConsolePad.MockConsoleTextEditor;
+			fakeConsoleTextEditor = workbench.MockScriptingConsolePad.MockConsoleTextEditor;
-			fakeConsole = workbench.MockPythonConsolePad.MockPythonConsole;
+			fakeConsole = workbench.MockScriptingConsolePad.MockScriptingConsole;
 			fakeTextEditor = workbench.ActiveMockEditableViewContent.MockTextEditor;
 			sendLineToConsoleCommand = new SendLineToPythonConsoleCommand(workbench);
 		}
@@ -87,7 +87,7 @@ namespace PythonBinding.Tests.Gui
 			
 			sendLineToConsoleCommand.Run();
 			
-			bool broughtToFront = workbench.MockPythonConsolePad.BringToFrontCalled;
+			bool broughtToFront = workbench.MockScriptingConsolePad.BringToFrontCalled;
 			Assert.IsTrue(broughtToFront);
 		}
 	}

src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj

@@ -434,8 +434,6 @@
     <Compile Include="Utils\DerivedPythonDesignerGenerator.cs" />
     <Compile Include="Utils\DerivedPythonDesignerLoader.cs" />
     <Compile Include="Utils\DerivedPythonFormsDesignerDisplayBinding.cs" />
-    <Compile Include="Utils\MockPythonConsole.cs" />
-    <Compile Include="Utils\MockPythonConsolePad.cs" />
     <Compile Include="Utils\MockWorkbench.cs" />
     <Compile Include="Utils\PythonMSBuildEngineHelper.cs" />
     <Compile Include="Utils\TestablePythonConsole.cs" />

src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockPythonConsole.cs

@@ -1,22 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.PythonBinding;
-
-namespace PythonBinding.Tests.Utils
-{
-	public class MockPythonConsole : IPythonConsole
-	{
-		public string TextPassedToSendLine;
-		
-		public void SendLine(string text)
-		{
-			TextPassedToSendLine = text;
-		}
-	}
-}

src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockPythonConsolePad.cs

@@ -1,35 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.PythonBinding;
-using ICSharpCode.Scripting;
-using ICSharpCode.Scripting.Tests.Utils;
-
-namespace PythonBinding.Tests.Utils
-{
-	public class MockPythonConsolePad : IPythonConsolePad
-	{
-		public MockConsoleTextEditor MockConsoleTextEditor = new MockConsoleTextEditor();
-		public MockPythonConsole MockPythonConsole = new MockPythonConsole();
-		
-		public bool BringToFrontCalled;
-		
-		public void BringToFront()
-		{
-			BringToFrontCalled = true;
-		}
-		
-		public IScriptingConsoleTextEditor ConsoleTextEditor {
-			get { return MockConsoleTextEditor; }
-		}
-		
-		public IPythonConsole PythonConsole {
-			get { return MockPythonConsole; }
-		}
-	}
-}

src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockWorkbench.cs

@@ -11,6 +11,7 @@ using System.Windows.Forms;
 
 using ICSharpCode.Core;
 using ICSharpCode.PythonBinding;
+using ICSharpCode.Scripting;
 using ICSharpCode.Scripting.Tests.Utils;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
@@ -19,7 +20,7 @@ namespace PythonBinding.Tests.Utils
 {
 	public class MockWorkbench : IPythonWorkbench
 	{		
-		public MockPythonConsolePad MockPythonConsolePad = new MockPythonConsolePad();
+		public MockScriptingConsolePad MockScriptingConsolePad = new MockScriptingConsolePad();
 		public MockEditableViewContent ActiveMockEditableViewContent;
 		
 		public static MockWorkbench CreateWorkbenchWithOneViewContent(string fileName)
@@ -37,9 +38,9 @@ namespace PythonBinding.Tests.Utils
 			get { return ActiveMockEditableViewContent; }
 		}		
 				
-		public IPythonConsolePad GetPythonConsolePad()
+		public IScriptingConsolePad GetScriptingConsolePad()
 		{
-			return MockPythonConsolePad;
+			return MockScriptingConsolePad;
 		}
 	}
 }

src/AddIns/BackendBindings/Ruby/RubyBinding/Project/RubyBinding.csproj

@@ -86,8 +86,6 @@
       <Link>Configuration\GlobalAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="Configuration\AssemblyInfo.cs" />
-    <Compile Include="Src\IRubyConsole.cs" />
-    <Compile Include="Src\IRubyConsolePad.cs" />
     <Compile Include="Src\IRubyWorkbench.cs" />
     <Compile Include="Src\RubyConsoleApplication.cs" />
     <Compile Include="Src\ConvertProjectToRubyProjectCommand.cs" />

src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/IRubyConsole.cs

@@ -1,16 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-
-namespace ICSharpCode.RubyBinding
-{
-	public interface IRubyConsole
-	{
-		void SendLine(string text);
-	}
-}

src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/IRubyWorkbench.cs

@@ -6,13 +6,14 @@
 // </file>
 
 using System;
+using ICSharpCode.Scripting;
 using ICSharpCode.SharpDevelop.Gui;
 
 namespace ICSharpCode.RubyBinding
 {
 	public interface IRubyWorkbench
 	{
-		IRubyConsolePad GetRubyConsolePad();
+		IScriptingConsolePad GetScriptingConsolePad();
 		IViewContent ActiveViewContent { get; }
 	}
 }

src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsole.cs

@@ -17,7 +17,7 @@ using Microsoft.Scripting.Hosting.Shell;
 
 namespace ICSharpCode.RubyBinding
 {
-	public class RubyConsole : IConsole, IDisposable, IMemberProvider, IRubyConsole
+	public class RubyConsole : IConsole, IDisposable, IMemberProvider, IScriptingConsole
 	{
 		IScriptingConsoleTextEditor textEditor;
 		int lineReceivedEventIndex = 0; // The index into the waitHandles array where the lineReceivedEvent is stored.

src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsolePad.cs

@@ -12,7 +12,7 @@ using AvalonEdit = ICSharpCode.AvalonEdit;
 
 namespace ICSharpCode.RubyBinding
 {
-	public class RubyConsolePad : AbstractPadContent, IRubyConsolePad
+	public class RubyConsolePad : AbstractPadContent, IScriptingConsolePad
 	{
 		ThreadSafeScriptingConsoleTextEditor consoleTextEditor;
 		AvalonEdit.TextEditor textEditor;
@@ -26,11 +26,11 @@ namespace ICSharpCode.RubyBinding
 			host.Run();
 		}
 		
-		public IScriptingConsoleTextEditor ConsoleTextEditor {
+		public IScriptingConsoleTextEditor ScriptingConsoleTextEditor {
 			get { return consoleTextEditor; }
 		}
 		
-		public IRubyConsole RubyConsole {
+		public IScriptingConsole ScriptingConsole {
 			get { return host.RubyConsole; }
  		}
  		

src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyWorkbench.cs

@@ -6,6 +6,7 @@
 // </file>
 
 using System;
+using ICSharpCode.Scripting;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
 
@@ -24,10 +25,10 @@ namespace ICSharpCode.RubyBinding
 			get { return workbench.ActiveViewContent; }
 		}
 		
-		public IRubyConsolePad GetRubyConsolePad()
+		public IScriptingConsolePad GetScriptingConsolePad()
 		{
 			PadDescriptor padDescriptor = workbench.GetPad(typeof(RubyConsolePad));
-			return padDescriptor.PadContent as IRubyConsolePad;
+			return padDescriptor.PadContent as IScriptingConsolePad;
 		}
 	}
 }

src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/SendLineToRubyConsoleCommand.cs

@@ -7,6 +7,7 @@
 
 using System;
 using ICSharpCode.Core;
+using ICSharpCode.Scripting;
 using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Gui;
 
@@ -15,10 +16,10 @@ namespace ICSharpCode.RubyBinding
 	public class SendLineToRubyConsoleCommand : AbstractCommand
 	{
 		IRubyWorkbench workbench;
-		IRubyConsolePad consolePad;
+		IScriptingConsolePad consolePad;
 		RubyTextEditorViewContent textEditorView;
 		ITextEditor activeTextEditor;
-		IRubyConsole RubyConsole;
+		IScriptingConsole RubyConsole;
 		string lineFromActiveTextEditor;
 		
 		public SendLineToRubyConsoleCommand()
@@ -51,7 +52,7 @@ namespace ICSharpCode.RubyBinding
 		
 		void GetRubyConsolePad()
 		{
-			consolePad = workbench.GetRubyConsolePad();
+			consolePad = workbench.GetScriptingConsolePad();
 		}
 				
 		void ShowRubyConsolePad()
@@ -67,7 +68,7 @@ namespace ICSharpCode.RubyBinding
 		
 		void GetRubyConsole()
 		{
-			RubyConsole = consolePad.RubyConsole;
+			RubyConsole = consolePad.ScriptingConsole;
 		}
 	}
 }

src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/SendLineToRubyConsoleCommandTests.cs

@@ -20,7 +20,7 @@ namespace RubyBinding.Tests.Gui
 		MockConsoleTextEditor fakeConsoleTextEditor;
 		MockTextEditor fakeTextEditor;
 		MockWorkbench workbench;
-		MockRubyConsole fakeConsole;
+		MockScriptingConsole fakeConsole;
 		
 		[Test]
 		public void Run_SingleLineInTextEditor_FirstLineSentToRubyConsole()
@@ -38,8 +38,8 @@ namespace RubyBinding.Tests.Gui
 		void CreateSendLineToConsoleCommand()
 		{
 			workbench = MockWorkbench.CreateWorkbenchWithOneViewContent("test.rb");
-			fakeConsoleTextEditor = workbench.MockRubyConsolePad.MockConsoleTextEditor;
+			fakeConsoleTextEditor = workbench.MockScriptingConsolePad.MockConsoleTextEditor;
-			fakeConsole = workbench.MockRubyConsolePad.MockRubyConsole;
+			fakeConsole = workbench.MockScriptingConsolePad.MockScriptingConsole;
 			fakeTextEditor = workbench.ActiveMockEditableViewContent.MockTextEditor;
 			sendLineToConsoleCommand = new SendLineToRubyConsoleCommand(workbench);
 		}
@@ -87,7 +87,7 @@ namespace RubyBinding.Tests.Gui
 			
 			sendLineToConsoleCommand.Run();
 			
-			bool broughtToFront = workbench.MockRubyConsolePad.BringToFrontCalled;
+			bool broughtToFront = workbench.MockScriptingConsolePad.BringToFrontCalled;
 			Assert.IsTrue(broughtToFront);
 		}
 	}

src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyBinding.Tests.csproj

@@ -328,8 +328,6 @@
     <Compile Include="Utils\DerivedRubyDesignerGenerator.cs" />
     <Compile Include="Utils\DerivedRubyDesignerLoader.cs" />
     <Compile Include="Utils\DerivedRubyFormsDesignerDisplayBinding.cs" />
-    <Compile Include="Utils\MockRubyConsole.cs" />
-    <Compile Include="Utils\MockRubyConsolePad.cs" />
     <Compile Include="Utils\MockWorkbench.cs" />
     <Compile Include="Utils\RubyBindingAddInFile.cs" />
     <Compile Include="Utils\RubyMSBuildEngineHelper.cs" />

src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockWorkbench.cs

@@ -11,6 +11,7 @@ using System.Windows.Forms;
 
 using ICSharpCode.Core;
 using ICSharpCode.RubyBinding;
+using ICSharpCode.Scripting;
 using ICSharpCode.Scripting.Tests.Utils;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
@@ -19,7 +20,7 @@ namespace RubyBinding.Tests.Utils
 {
 	public class MockWorkbench : IRubyWorkbench
 	{		
-		public MockRubyConsolePad MockRubyConsolePad = new MockRubyConsolePad();
+		public MockScriptingConsolePad MockScriptingConsolePad = new MockScriptingConsolePad();
 		public MockEditableViewContent ActiveMockEditableViewContent;
 		
 		public static MockWorkbench CreateWorkbenchWithOneViewContent(string fileName)
@@ -37,9 +38,9 @@ namespace RubyBinding.Tests.Utils
 			get { return ActiveMockEditableViewContent; }
 		}		
 				
-		public IRubyConsolePad GetRubyConsolePad()
+		public IScriptingConsolePad GetScriptingConsolePad()
 		{
-			return MockRubyConsolePad;
+			return MockScriptingConsolePad;
 		}
 	}
 }

src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj

@@ -69,6 +69,8 @@
     <Compile Include="Src\IControlDispatcher.cs" />
     <Compile Include="Src\ILock.cs" />
     <Compile Include="Src\IMemberProvider.cs" />
+    <Compile Include="Src\IScriptingConsole.cs" />
+    <Compile Include="Src\IScriptingConsolePad.cs" />
     <Compile Include="Src\IScriptingConsoleTextEditor.cs" />
     <Compile Include="Src\IScriptingDesignerGenerator.cs" />
     <Compile Include="Src\IScriptingFileService.cs" />

src/AddIns/BackendBindings/Scripting/Project/Src/IScriptingConsole.cs

@@ -7,9 +7,9 @@
 
 using System;
 
-namespace ICSharpCode.PythonBinding
+namespace ICSharpCode.Scripting
 {
-	public interface IPythonConsole
+	public interface IScriptingConsole
 	{
 		void SendLine(string text);
 	}

src/AddIns/BackendBindings/Scripting/Project/Src/IScriptingConsolePad.cs

@@ -6,14 +6,13 @@
 // </file>
 
 using System;
-using ICSharpCode.Scripting;
 
-namespace ICSharpCode.RubyBinding
+namespace ICSharpCode.Scripting
 {
-	public interface IRubyConsolePad
+	public interface IScriptingConsolePad
 	{
 		void BringToFront();
-		IScriptingConsoleTextEditor ConsoleTextEditor { get; }
+		IScriptingConsoleTextEditor ScriptingConsoleTextEditor { get; }
-		IRubyConsole RubyConsole { get; }
+		IScriptingConsole ScriptingConsole { get; }
 	}
 }

src/AddIns/BackendBindings/Scripting/Test/ICSharpCode.Scripting.Tests.csproj

@@ -114,6 +114,8 @@
     <Compile Include="Utils\MockResourceReader.cs" />
     <Compile Include="Utils\MockResourceService.cs" />
     <Compile Include="Utils\MockResourceWriter.cs" />
+    <Compile Include="Utils\MockScriptingConsole.cs" />
+    <Compile Include="Utils\MockScriptingConsolePad.cs" />
     <Compile Include="Utils\MockScriptingFileService.cs" />
     <Compile Include="Utils\MockSite.cs" />
     <Compile Include="Utils\MockTextEditor.cs" />

src/AddIns/BackendBindings/Scripting/Test/Utils/MockScriptingConsole.cs

@@ -6,11 +6,11 @@
 // </file>
 
 using System;
-using ICSharpCode.RubyBinding;
+using ICSharpCode.Scripting;
 
-namespace RubyBinding.Tests.Utils
+namespace ICSharpCode.Scripting.Tests.Utils
 {
-	public class MockRubyConsole : IRubyConsole
+	public class MockScriptingConsole : IScriptingConsole
 	{
 		public string TextPassedToSendLine;
 		

src/AddIns/BackendBindings/Scripting/Test/Utils/MockScriptingConsolePad.cs

@@ -6,16 +6,14 @@
 // </file>
 
 using System;
-using ICSharpCode.RubyBinding;
 using ICSharpCode.Scripting;
-using ICSharpCode.Scripting.Tests.Utils;
 
-namespace RubyBinding.Tests.Utils
+namespace ICSharpCode.Scripting.Tests.Utils
 {
-	public class MockRubyConsolePad : IRubyConsolePad
+	public class MockScriptingConsolePad : IScriptingConsolePad
 	{
 		public MockConsoleTextEditor MockConsoleTextEditor = new MockConsoleTextEditor();
-		public MockRubyConsole MockRubyConsole = new MockRubyConsole();
+		public MockScriptingConsole MockScriptingConsole = new MockScriptingConsole();
 		
 		public bool BringToFrontCalled;
 		
@@ -24,12 +22,12 @@ namespace RubyBinding.Tests.Utils
 			BringToFrontCalled = true;
 		}
 		
-		public IScriptingConsoleTextEditor ConsoleTextEditor {
+		public IScriptingConsoleTextEditor ScriptingConsoleTextEditor {
 			get { return MockConsoleTextEditor; }
 		}
 		
-		public IRubyConsole RubyConsole {
+		public IScriptingConsole ScriptingConsole {
-			get { return MockRubyConsole; }
+			get { return MockScriptingConsole; }
 		}
 	}
 }