diff --git a/src/AddIns/BackendBindings/Python/PythonBinding.sln b/src/AddIns/BackendBindings/Python/PythonBinding.sln index 5aa732937d..be01461ac4 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding.sln +++ b/src/AddIns/BackendBindings/Python/PythonBinding.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -# SharpDevelop 4.0.0.6500 +# SharpDevelop 4.0.0.6511 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding.Tests", "PythonBinding\Test\PythonBinding.Tests.csproj", "{23B517C9-1ECC-4419-A13F-0B7136D085CB}" @@ -34,12 +34,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "..\..\Analys EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting.Tests", "..\..\Analysis\UnitTesting\Test\UnitTesting.Tests.csproj", "{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Scripting", "..\Scripting\Project\ICSharpCode.Scripting.csproj", "{7048AE18-EB93-4A84-82D0-DD60EB58ADBD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Scripting.Tests", "..\Scripting\Test\ICSharpCode.Scripting.Tests.csproj", "{85C09AD8-183B-403A-869A-7226646218A9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {8D732610-8FC6-43BA-94C9-7126FD7FE361}.Debug|Any CPU.Build.0 = Debug|Any CPU @@ -106,5 +112,21 @@ Global {44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}.Release|Any CPU.Build.0 = Release|Any CPU {44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Debug|Any CPU.Build.0 = Debug|x86 + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Debug|Any CPU.ActiveCfg = Debug|x86 + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Release|Any CPU.Build.0 = Release|x86 + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Release|Any CPU.ActiveCfg = Release|x86 + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Debug|x86.Build.0 = Debug|x86 + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Debug|x86.ActiveCfg = Debug|x86 + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Release|x86.Build.0 = Release|x86 + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Release|x86.ActiveCfg = Release|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Debug|Any CPU.Build.0 = Debug|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Debug|Any CPU.ActiveCfg = Debug|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Debug|x86.Build.0 = Debug|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Debug|x86.ActiveCfg = Debug|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Release|Any CPU.Build.0 = Release|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Release|Any CPU.ActiveCfg = Release|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Release|x86.Build.0 = Release|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Release|x86.ActiveCfg = Release|x86 EndGlobalSection EndGlobal diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj index 00eb2214ab..5843738f48 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj @@ -81,24 +81,18 @@ Configuration\GlobalAssemblyInfo.cs - - - - - - @@ -134,10 +128,7 @@ - - - @@ -278,5 +269,10 @@ FormsDesigner False + + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD} + ICSharpCode.Scripting + False + \ No newline at end of file diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/ConsoleTextEditorKeyEventArgs.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/ConsoleTextEditorKeyEventArgs.cs deleted file mode 100644 index 1e57c3931b..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/ConsoleTextEditorKeyEventArgs.cs +++ /dev/null @@ -1,32 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Windows.Input; - -namespace ICSharpCode.PythonBinding -{ - public delegate void ConsoleTextEditorKeyEventHandler(object source, ConsoleTextEditorKeyEventArgs e); - - public abstract class ConsoleTextEditorKeyEventArgs : EventArgs - { - Key key; - - public ConsoleTextEditorKeyEventArgs(Key key) - { - this.key = key; - } - - public Key Key { - get { return key; } - } - - public abstract bool Handled { - get; set; - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/ControlDispatcher.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/ControlDispatcher.cs deleted file mode 100644 index 96eff41acc..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/ControlDispatcher.cs +++ /dev/null @@ -1,33 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Windows; -using System.Windows.Threading; - -namespace ICSharpCode.PythonBinding -{ - public class ControlDispatcher : IControlDispatcher - { - Dispatcher dispatcher; - - public ControlDispatcher(UIElement uiElement) - { - dispatcher = uiElement.Dispatcher; - } - - public bool CheckAccess() - { - return dispatcher.CheckAccess(); - } - - public object Invoke(Delegate method, params object[] args) - { - return dispatcher.Invoke(method, args); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/CreateTextWriterInfo.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/CreateTextWriterInfo.cs deleted file mode 100644 index 264fe024d5..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/CreateTextWriterInfo.cs +++ /dev/null @@ -1,65 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.IO; -using System.Text; - -namespace ICSharpCode.PythonBinding -{ - public class CreateTextWriterInfo - { - string fileName; - Encoding encoding; - bool append; - - public CreateTextWriterInfo(string fileName, Encoding encoding, bool append) - { - this.fileName = fileName; - this.encoding = encoding; - this.append = append; - } - - public string FileName { - get { return fileName; } - } - - public Encoding Encoding { - get { return encoding; } - } - - public bool Append { - get { return append; } - } - - public override bool Equals(object obj) - { - CreateTextWriterInfo rhs = obj as CreateTextWriterInfo; - if (rhs != null) { - return Equals(rhs); - } - return false; - } - - bool Equals(CreateTextWriterInfo rhs) - { - return (fileName == rhs.fileName) && - (encoding == rhs.encoding) && - (append == rhs.append); - } - - public override int GetHashCode() - { - return base.GetHashCode(); - } - - public TextWriter CreateTextWriter() - { - return new StreamWriter(fileName, append, encoding); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IConsoleTextEditor.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IConsoleTextEditor.cs index 554f3ebf56..79f6461623 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IConsoleTextEditor.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IConsoleTextEditor.cs @@ -8,6 +8,7 @@ using System; using System.Drawing; using System.Windows.Input; +using ICSharpCode.Scripting; namespace ICSharpCode.PythonBinding { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IControlDispatcher.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IControlDispatcher.cs deleted file mode 100644 index f9212512b3..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IControlDispatcher.cs +++ /dev/null @@ -1,17 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; - -namespace ICSharpCode.PythonBinding -{ - public interface IControlDispatcher - { - bool CheckAccess(); - object Invoke(Delegate method, params object[] args); - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/ILock.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/ILock.cs deleted file mode 100644 index 1b31579160..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/ILock.cs +++ /dev/null @@ -1,16 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections.Generic; - -namespace ICSharpCode.PythonBinding -{ - public interface ILock : IDisposable - { - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IPythonFileService.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IPythonFileService.cs index 1b8e39d8d7..f801e55a8a 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IPythonFileService.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IPythonFileService.cs @@ -8,6 +8,8 @@ using System; using System.IO; using System.Text; + +using ICSharpCode.Scripting; using ICSharpCode.UnitTesting; namespace ICSharpCode.PythonBinding diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonCodeDeserializer.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonCodeDeserializer.cs index 5b019deef6..d71e0b0f11 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonCodeDeserializer.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonCodeDeserializer.cs @@ -10,6 +10,8 @@ using System.Collections.Generic; using System.ComponentModel.Design; using System.Drawing; using System.Reflection; + +using ICSharpCode.Scripting; using IronPython.Compiler; using IronPython.Compiler.Ast; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonComponentWalker.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonComponentWalker.cs index 2999218049..11dfa9a3cd 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonComponentWalker.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonComponentWalker.cs @@ -5,7 +5,6 @@ // $Revision$ // -using ICSharpCode.SharpDevelop; using System; using System.Collections.Generic; using System.ComponentModel; @@ -16,7 +15,10 @@ using System.Reflection; using System.Resources; using System.Text; using System.Windows.Forms; + using ICSharpCode.Core; +using ICSharpCode.Scripting; +using ICSharpCode.SharpDevelop; using IronPython.Compiler.Ast; namespace ICSharpCode.PythonBinding diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsole.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsole.cs index 2686e32042..82866a54ab 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsole.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsole.cs @@ -13,6 +13,7 @@ using System.Text; using System.Threading; using System.Windows.Input; using ICSharpCode.AvalonEdit.CodeCompletion; +using ICSharpCode.Scripting; using IronPython.Hosting; using Microsoft.Scripting.Hosting.Shell; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsoleCompletionDataProvider.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsoleCompletionDataProvider.cs index 267b272ade..6b0268ad7b 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsoleCompletionDataProvider.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsoleCompletionDataProvider.cs @@ -7,9 +7,9 @@ using System; using System.Collections.Generic; - using ICSharpCode.AvalonEdit.CodeCompletion; using ICSharpCode.Core; +using ICSharpCode.Scripting; using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Editor.CodeCompletion; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsoleTextEditor.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsoleTextEditor.cs index dad67d0609..ec75301370 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsoleTextEditor.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsoleTextEditor.cs @@ -13,6 +13,7 @@ using System.Windows.Threading; using ICSharpCode.AvalonEdit; using ICSharpCode.AvalonEdit.CodeCompletion; using ICSharpCode.AvalonEdit.Document; +using ICSharpCode.Scripting; using ICSharpCode.SharpDevelop.Gui; namespace ICSharpCode.PythonBinding diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsoleTextEditorKeyEventArgs.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsoleTextEditorKeyEventArgs.cs index 4186c813e0..656dec92b9 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsoleTextEditorKeyEventArgs.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsoleTextEditorKeyEventArgs.cs @@ -7,6 +7,7 @@ using System; using System.Windows.Input; +using ICSharpCode.Scripting; namespace ICSharpCode.PythonBinding { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonControlFieldExpression.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonControlFieldExpression.cs index b4bac01d19..e444870d28 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonControlFieldExpression.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonControlFieldExpression.cs @@ -11,6 +11,8 @@ using System.ComponentModel; using System.Reflection; using System.Text; using System.Windows.Forms; + +using ICSharpCode.Scripting; using IronPython.Compiler.Ast; namespace ICSharpCode.PythonBinding diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonDesignerLoader.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonDesignerLoader.cs index d25b2a3ce2..38dcd9c563 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonDesignerLoader.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonDesignerLoader.cs @@ -18,6 +18,7 @@ using System.Security.Permissions; using ICSharpCode.FormsDesigner; using ICSharpCode.FormsDesigner.Services; +using ICSharpCode.Scripting; namespace ICSharpCode.PythonBinding { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonFileService.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonFileService.cs index c1da704647..ca18f90e70 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonFileService.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonFileService.cs @@ -9,6 +9,8 @@ using System; using System.IO; using System.Text; +using ICSharpCode.Scripting; + namespace ICSharpCode.PythonBinding { public class PythonFileService : IPythonFileService diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonTestRunnerApplication.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonTestRunnerApplication.cs index 0c35eb054c..5824532a81 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonTestRunnerApplication.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonTestRunnerApplication.cs @@ -9,7 +9,9 @@ using System; using System.Diagnostics; using System.IO; using System.Text; + using ICSharpCode.Core; +using ICSharpCode.Scripting; using ICSharpCode.UnitTesting; namespace ICSharpCode.PythonBinding diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/StringListLock.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/StringListLock.cs deleted file mode 100644 index 680594fdfc..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/StringListLock.cs +++ /dev/null @@ -1,39 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections.Generic; -using System.Threading; - -namespace ICSharpCode.PythonBinding -{ - public class StringListLock : ILock - { - List lines; - - public StringListLock(List lines) - { - this.lines = lines; - Lock(); - } - - void Lock() - { - Monitor.Enter(lines); - } - - public void Dispose() - { - Unlock(); - } - - void Unlock() - { - Monitor.Exit(lines); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/ThreadSafePythonConsoleTextEditor.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/ThreadSafePythonConsoleTextEditor.cs index 0cb8f95a83..2801aaf606 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/ThreadSafePythonConsoleTextEditor.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/ThreadSafePythonConsoleTextEditor.cs @@ -7,6 +7,7 @@ using System; using ICSharpCode.AvalonEdit; +using ICSharpCode.Scripting; namespace ICSharpCode.PythonBinding { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Completion/CodeCompletionBindingFromImportCompletionTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Completion/CodeCompletionBindingFromImportCompletionTestFixture.cs index 33b7c30163..9ad5fa8db2 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Completion/CodeCompletionBindingFromImportCompletionTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Completion/CodeCompletionBindingFromImportCompletionTestFixture.cs @@ -13,7 +13,7 @@ using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using PythonBinding.Tests.Utils; -namespace PythonBinding.Tests +namespace PythonBinding.Tests.Completion { /// /// Tests that the From keyword is correctly identified as a diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/BuiltinCodeCompletionTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/BuiltinCodeCompletionTestFixture.cs index 67c5b9cf93..cdbd280eb1 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/BuiltinCodeCompletionTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/BuiltinCodeCompletionTestFixture.cs @@ -7,11 +7,11 @@ using System; using System.Collections.Generic; -using Microsoft.Scripting.Hosting; - using ICSharpCode.AvalonEdit; using ICSharpCode.AvalonEdit.CodeCompletion; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Console; +using Microsoft.Scripting.Hosting; using NUnit.Framework; namespace PythonBinding.Tests.Console diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/CodeCompletionTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/CodeCompletionTests.cs index c826b1104d..62c35b828b 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/CodeCompletionTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/CodeCompletionTests.cs @@ -6,9 +6,9 @@ // using System; - using ICSharpCode.AvalonEdit.CodeCompletion; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Console; using ICSharpCode.SharpDevelop; using NUnit.Framework; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/ThreadSafePythonConsoleTextEditorTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/ThreadSafePythonConsoleTextEditorTests.cs index b4006539ed..b1a3e26cb1 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/ThreadSafePythonConsoleTextEditorTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/ThreadSafePythonConsoleTextEditorTests.cs @@ -9,9 +9,13 @@ using System; using System.Collections.Generic; using System.Threading; using System.Windows.Input; + using ICSharpCode.AvalonEdit; using ICSharpCode.AvalonEdit.Editing; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting; +using ICSharpCode.Scripting.Tests.Utils; +using ICSharpCode.Scripting.Tests.Utils.Tests; using NUnit.Framework; using PythonBinding.Tests.Utils; using PythonBinding.Tests.Utils.Tests; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ConvertCSharpToPythonMenuCommandTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ConvertCSharpToPythonMenuCommandTestFixture.cs index acbfc25bd9..05a7b32ad8 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ConvertCSharpToPythonMenuCommandTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ConvertCSharpToPythonMenuCommandTestFixture.cs @@ -7,6 +7,7 @@ using System; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ConvertToPythonProjectCommandTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ConvertToPythonProjectCommandTestFixture.cs index 49b5fee70f..e5f565cc96 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ConvertToPythonProjectCommandTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ConvertToPythonProjectCommandTestFixture.cs @@ -12,6 +12,7 @@ using System.Text; using ICSharpCode.Core; using ICSharpCode.NRefactory; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Project; using NUnit.Framework; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ConvertVBNetToPythonMenuCommandTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ConvertVBNetToPythonMenuCommandTestFixture.cs index 57337e2241..18d89b811c 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ConvertVBNetToPythonMenuCommandTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ConvertVBNetToPythonMenuCommandTestFixture.cs @@ -7,6 +7,7 @@ using System; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ProjectHasStartupObjectTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ProjectHasStartupObjectTestFixture.cs index 8148f249e0..3e56b441f9 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ProjectHasStartupObjectTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ProjectHasStartupObjectTestFixture.cs @@ -5,15 +5,17 @@ // $Revision$ // -using ICSharpCode.SharpDevelop.Internal.Templates; using System; using System.Collections.Generic; using System.IO; using System.Text; + using ICSharpCode.Core; using ICSharpCode.NRefactory; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop; +using ICSharpCode.SharpDevelop.Internal.Templates; using ICSharpCode.SharpDevelop.Project; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/AppendNullPropertyValueTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/AppendNullPropertyValueTestFixture.cs index b435c75197..fbee0f0c76 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/AppendNullPropertyValueTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/AppendNullPropertyValueTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; @@ -54,7 +56,7 @@ namespace PythonBinding.Tests.Designer [Test] public void GeneratedCode() { - string expectedCode = "self._userControl1 = PythonBinding.Tests.Utils.NullPropertyUserControl()\r\n" + + string expectedCode = "self._userControl1 = ICSharpCode.Scripting.Tests.Utils.NullPropertyUserControl()\r\n" + "self.SuspendLayout()\r\n" + "# \r\n" + "# userControl1\r\n" + diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/CallBeginInitOnLoadTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/CallBeginInitOnLoadTestFixture.cs index 4b650eb79e..7fac0e9328 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/CallBeginInitOnLoadTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/CallBeginInitOnLoadTestFixture.cs @@ -8,7 +8,9 @@ using System; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/DeserializeAssignmentTestFixtureBase.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/DeserializeAssignmentTestFixtureBase.cs index e77529458b..06ac7e062e 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/DeserializeAssignmentTestFixtureBase.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/DeserializeAssignmentTestFixtureBase.cs @@ -10,7 +10,9 @@ using System.ComponentModel; using System.ComponentModel.Design; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using IronPython.Compiler.Ast; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/DeserializeLocalVariableTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/DeserializeLocalVariableTestFixture.cs index 15b3115dfd..b3fba4bf79 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/DeserializeLocalVariableTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/DeserializeLocalVariableTestFixture.cs @@ -10,7 +10,9 @@ using System.ComponentModel; using System.ComponentModel.Design; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using IronPython.Compiler.Ast; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/DeserializeMethodParametersTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/DeserializeMethodParametersTestFixture.cs index b7c502acfe..15d0e4b521 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/DeserializeMethodParametersTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/DeserializeMethodParametersTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel; using System.ComponentModel.Design; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using IronPython.Compiler.Ast; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/DeserializerConstructorStringArrayTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/DeserializerConstructorStringArrayTestFixture.cs index 88d16fb554..bcb2a4cd2b 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/DeserializerConstructorStringArrayTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/DeserializerConstructorStringArrayTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel; using System.ComponentModel.Design; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using IronPython.Compiler.Ast; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/EventHandlerAlreadyExistsTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/EventHandlerAlreadyExistsTestFixture.cs index b322f3bb8e..983e0975fe 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/EventHandlerAlreadyExistsTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/EventHandlerAlreadyExistsTestFixture.cs @@ -6,8 +6,9 @@ // using System; -using ICSharpCode.PythonBinding; using ICSharpCode.FormsDesigner; +using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/EventHandlerExistsWithIncorrectParameterCountTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/EventHandlerExistsWithIncorrectParameterCountTestFixture.cs index 6e629a0179..684362c0b8 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/EventHandlerExistsWithIncorrectParameterCountTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/EventHandlerExistsWithIncorrectParameterCountTestFixture.cs @@ -6,8 +6,9 @@ // using System; -using ICSharpCode.PythonBinding; using ICSharpCode.FormsDesigner; +using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateAcceptButtonFormTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateAcceptButtonFormTestFixture.cs index 76a532863a..d0b60c8fec 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateAcceptButtonFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateAcceptButtonFormTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateAccessibleRoleFormTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateAccessibleRoleFormTestFixture.cs index 8528c95a1e..57e0efd559 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateAccessibleRoleFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateAccessibleRoleFormTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateAutoScrollFormTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateAutoScrollFormTestFixture.cs index 0283642aeb..c496a145db 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateAutoScrollFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateAutoScrollFormTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateButtonFlatAppearanceTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateButtonFlatAppearanceTestFixture.cs index 21d9c917ad..0a09cc3b0b 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateButtonFlatAppearanceTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateButtonFlatAppearanceTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateComboBoxItemsTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateComboBoxItemsTestFixture.cs index 51895557cd..8acbab3ca2 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateComboBoxItemsTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateComboBoxItemsTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateContextMenuStripTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateContextMenuStripTestFixture.cs index 67e679fbc5..c3b3d79a06 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateContextMenuStripTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateContextMenuStripTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateCursorFormTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateCursorFormTestFixture.cs index bf682f375d..05dc6b7cfd 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateCursorFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateCursorFormTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateCustomCollectionItemsTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateCustomCollectionItemsTestFixture.cs index 85b4d5c2bb..2958539581 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateCustomCollectionItemsTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateCustomCollectionItemsTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; @@ -69,18 +71,18 @@ namespace PythonBinding.Tests.Designer [Test] public void GeneratedCode() { - string expectedCode = " fooItem1 = PythonBinding.Tests.Utils.FooItem()\r\n" + - " fooItem2 = PythonBinding.Tests.Utils.FooItem()\r\n" + - " barItem1 = PythonBinding.Tests.Utils.BarItem()\r\n" + - " barItem2 = PythonBinding.Tests.Utils.BarItem()\r\n" + - " self._userControl1 = PythonBinding.Tests.Utils.CustomUserControl()\r\n" + + string expectedCode = " fooItem1 = ICSharpCode.Scripting.Tests.Utils.FooItem()\r\n" + + " fooItem2 = ICSharpCode.Scripting.Tests.Utils.FooItem()\r\n" + + " barItem1 = ICSharpCode.Scripting.Tests.Utils.BarItem()\r\n" + + " barItem2 = ICSharpCode.Scripting.Tests.Utils.BarItem()\r\n" + + " self._userControl1 = ICSharpCode.Scripting.Tests.Utils.CustomUserControl()\r\n" + " self.SuspendLayout()\r\n" + " # \r\n" + " # userControl1\r\n" + " # \r\n" + " fooItem1.Text = \"aa\"\r\n" + " fooItem2.Text = \"bb\"\r\n" + - " self._userControl1.FooItems.AddRange(System.Array[PythonBinding.Tests.Utils.FooItem](\r\n" + + " self._userControl1.FooItems.AddRange(System.Array[ICSharpCode.Scripting.Tests.Utils.FooItem](\r\n" + " [fooItem1,\r\n" + " fooItem2]))\r\n" + " self._userControl1.Location = System.Drawing.Point(0, 0)\r\n" + @@ -90,7 +92,7 @@ namespace PythonBinding.Tests.Designer " # \r\n" + " barItem1.Text = \"cc\"\r\n" + " barItem2.Text = \"dd\"\r\n" + - " self._userControl1.ParentComponent.ParentBarItems.AddRange(System.Array[PythonBinding.Tests.Utils.BarItem](\r\n" + + " self._userControl1.ParentComponent.ParentBarItems.AddRange(System.Array[ICSharpCode.Scripting.Tests.Utils.BarItem](\r\n" + " [barItem1,\r\n" + " barItem2]))\r\n" + " self._userControl1.Size = System.Drawing.Size(200, 100)\r\n" + diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateDataSetTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateDataSetTestFixture.cs index 89116a045f..fa192fb644 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateDataSetTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateDataSetTestFixture.cs @@ -13,7 +13,9 @@ using System.ComponentModel.Design.Serialization; using System.Data; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateEventHandlerFormTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateEventHandlerFormTestFixture.cs index 75e071ab05..29b50dd320 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateEventHandlerFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateEventHandlerFormTestFixture.cs @@ -14,7 +14,9 @@ using System.Drawing; using System.Globalization; using System.Reflection; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFolderBrowserDialogRootFolderTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFolderBrowserDialogRootFolderTestFixture.cs index a03388f8c9..07aad280e0 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFolderBrowserDialogRootFolderTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFolderBrowserDialogRootFolderTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFormColorTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFormColorTestFixture.cs index a1c7087a2c..40a5470264 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFormColorTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFormColorTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFormLocationTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFormLocationTestFixture.cs index 13c5484f5a..990d13b034 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFormLocationTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFormLocationTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFormPaddingTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFormPaddingTestFixture.cs index 7e603e0c8c..5a0c2b2dad 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFormPaddingTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFormPaddingTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFormResourcesTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFormResourcesTestFixture.cs index 9da81cb1f0..9233c89948 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFormResourcesTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateFormResourcesTestFixture.cs @@ -13,7 +13,9 @@ using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Globalization; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateImageListResourcesTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateImageListResourcesTestFixture.cs index 4e267ff1f9..d9a5e7ed36 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateImageListResourcesTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateImageListResourcesTestFixture.cs @@ -13,7 +13,9 @@ using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Globalization; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateInheritedToolTipTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateInheritedToolTipTestFixture.cs index a982ae41d6..2d38574ec7 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateInheritedToolTipTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateInheritedToolTipTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewGroupsTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewGroupsTestFixture.cs index c31ec2f663..a6bf7e4496 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewGroupsTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewGroupsTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewItemTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewItemTestFixture.cs index c882ca0b49..a27a9b2820 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewItemTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewItemTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewSubItemsTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewSubItemsTestFixture.cs index 50078b13a7..3dcd6aee4d 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewSubItemsTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewSubItemsTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewWithImageListTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewWithImageListTestFixture.cs index 2bd384fe90..6872047790 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewWithImageListTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateListViewWithImageListTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateLocalImageResourceTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateLocalImageResourceTestFixture.cs index fb169b01b7..735a959de5 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateLocalImageResourceTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateLocalImageResourceTestFixture.cs @@ -13,7 +13,9 @@ using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Globalization; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateMenuStripFormTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateMenuStripFormTestFixture.cs index e0780c4b6c..95e8f3d012 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateMenuStripFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateMenuStripFormTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateMenuStripItemsTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateMenuStripItemsTestFixture.cs index 217da7d1db..5292b20a3e 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateMenuStripItemsTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateMenuStripItemsTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateMonthCalendarTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateMonthCalendarTestFixture.cs index 74a09e56b4..c0a59a127b 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateMonthCalendarTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateMonthCalendarTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GeneratePanelFormTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GeneratePanelFormTestFixture.cs index 7b870c177a..d1c7654f91 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GeneratePanelFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GeneratePanelFormTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateTableLayoutPanelTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateTableLayoutPanelTestFixture.cs index b6abfa5a95..aa63f6a2a6 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateTableLayoutPanelTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateTableLayoutPanelTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateToolTipFormTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateToolTipFormTestFixture.cs index 5f0970db24..b9cc30b1ef 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateToolTipFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateToolTipFormTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateTreeViewTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateTreeViewTestFixture.cs index fe40c04361..093b9a522e 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateTreeViewTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateTreeViewTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GeneratorMergeFindsInitializeComponentsTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GeneratorMergeFindsInitializeComponentsTestFixture.cs index d638428349..6307a29cc4 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GeneratorMergeFindsInitializeComponentsTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GeneratorMergeFindsInitializeComponentsTestFixture.cs @@ -15,8 +15,9 @@ using System.Drawing; using System.IO; using System.Windows.Forms; -using ICSharpCode.PythonBinding; using ICSharpCode.FormsDesigner; +using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GetComponentFromDesignerLoaderTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GetComponentFromDesignerLoaderTestFixture.cs index 93f1ed6e54..6c52396115 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GetComponentFromDesignerLoaderTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GetComponentFromDesignerLoaderTestFixture.cs @@ -9,7 +9,9 @@ using System; using System.ComponentModel; using System.ComponentModel.Design.Serialization; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GetInstanceFromDesignerLoaderTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GetInstanceFromDesignerLoaderTestFixture.cs index 67c38f6eb3..084dc7c411 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GetInstanceFromDesignerLoaderTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GetInstanceFromDesignerLoaderTestFixture.cs @@ -9,7 +9,9 @@ using System; using System.ComponentModel; using System.ComponentModel.Design.Serialization; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GetResourcesFromDesignerLoaderTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GetResourcesFromDesignerLoaderTestFixture.cs index 2e8777f520..cedc1b18e5 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GetResourcesFromDesignerLoaderTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GetResourcesFromDesignerLoaderTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design.Serialization; using System.Globalization; using System.Resources; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/InsertEventHandlerTestFixtureBase.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/InsertEventHandlerTestFixtureBase.cs index 83f21c4d65..f0d19355f4 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/InsertEventHandlerTestFixtureBase.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/InsertEventHandlerTestFixtureBase.cs @@ -6,8 +6,9 @@ // using System; -using ICSharpCode.PythonBinding; using ICSharpCode.FormsDesigner; +using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/InsertEventHandlerWithSpaceIndentTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/InsertEventHandlerWithSpaceIndentTestFixture.cs index 0c685b0c81..5603402daa 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/InsertEventHandlerWithSpaceIndentTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/InsertEventHandlerWithSpaceIndentTestFixture.cs @@ -6,8 +6,9 @@ // using System; -using ICSharpCode.PythonBinding; using ICSharpCode.FormsDesigner; +using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/InsertNewEventHandlerTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/InsertNewEventHandlerTestFixture.cs index 64e27e364f..fd8f361166 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/InsertNewEventHandlerTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/InsertNewEventHandlerTestFixture.cs @@ -6,8 +6,9 @@ // using System; -using ICSharpCode.PythonBinding; using ICSharpCode.FormsDesigner; +using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/InsertSecondEventHandlerTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/InsertSecondEventHandlerTestFixture.cs index 87d68ad304..94c68a797f 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/InsertSecondEventHandlerTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/InsertSecondEventHandlerTestFixture.cs @@ -6,8 +6,9 @@ // using System; -using ICSharpCode.PythonBinding; using ICSharpCode.FormsDesigner; +using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadBindingNavigatorTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadBindingNavigatorTestFixture.cs index 7fbb01d678..615dd91c95 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadBindingNavigatorTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadBindingNavigatorTestFixture.cs @@ -16,6 +16,7 @@ using System.Resources; using System.Windows.Forms; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadControlEventHandlerTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadControlEventHandlerTestFixture.cs index 1b5aaab722..c5b4e698b0 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadControlEventHandlerTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadControlEventHandlerTestFixture.cs @@ -14,6 +14,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadEventHandlerTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadEventHandlerTestFixture.cs index 352e9d63ab..2bd53a5567 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadEventHandlerTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadEventHandlerTestFixture.cs @@ -14,6 +14,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadFileSystemWatcherTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadFileSystemWatcherTestFixture.cs index bd99ebb297..979a13134e 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadFileSystemWatcherTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadFileSystemWatcherTestFixture.cs @@ -12,6 +12,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadFormTestFixtureBase.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadFormTestFixtureBase.cs index 74223894c4..c02d91a181 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadFormTestFixtureBase.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadFormTestFixtureBase.cs @@ -11,6 +11,7 @@ using System.Reflection; using System.Windows.Forms; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadFormWithSysPathAppendStatementTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadFormWithSysPathAppendStatementTestFixture.cs index 01ac3013ac..01565f1fc1 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadFormWithSysPathAppendStatementTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadFormWithSysPathAppendStatementTestFixture.cs @@ -13,6 +13,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadLocalImageResourceTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadLocalImageResourceTestFixture.cs index fb56c512c7..35ca896f69 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadLocalImageResourceTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadLocalImageResourceTestFixture.cs @@ -16,6 +16,7 @@ using System.Resources; using System.Windows.Forms; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadLocalVariablePropertyAssignmentTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadLocalVariablePropertyAssignmentTestFixture.cs index 9264d8454c..5cdcd5f887 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadLocalVariablePropertyAssignmentTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadLocalVariablePropertyAssignmentTestFixture.cs @@ -12,6 +12,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadSimpleFormTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadSimpleFormTestFixture.cs index d50ca01005..540ee55592 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadSimpleFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadSimpleFormTestFixture.cs @@ -12,6 +12,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadSimpleUserControlTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadSimpleUserControlTestFixture.cs index 1780a2821a..b6772b594f 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadSimpleUserControlTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadSimpleUserControlTestFixture.cs @@ -12,6 +12,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadTextBoxTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadTextBoxTestFixture.cs index 656040c8b1..bca60ce22d 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadTextBoxTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadTextBoxTestFixture.cs @@ -13,6 +13,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadTimerTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadTimerTestFixture.cs index 54edcf90f1..38aa9bd05a 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadTimerTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadTimerTestFixture.cs @@ -12,6 +12,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadTreeViewTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadTreeViewTestFixture.cs index ce3bc58dd2..36c86e1131 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadTreeViewTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadTreeViewTestFixture.cs @@ -13,6 +13,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadUserControlWithDoublePropertyTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadUserControlWithDoublePropertyTestFixture.cs index b0685e5875..e79c04cbb9 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadUserControlWithDoublePropertyTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadUserControlWithDoublePropertyTestFixture.cs @@ -12,6 +12,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; @@ -30,7 +31,7 @@ namespace PythonBinding.Tests.Designer componentCreator.AddType(type.FullName, type); return "class MainForm(System.Windows.Forms.Form):\r\n" + " def InitializeComponent(self):\r\n" + - " self._userControl = PythonBinding.Tests.Utils.DoublePropertyUserControl()\r\n" + + " self._userControl = ICSharpCode.Scripting.Tests.Utils.DoublePropertyUserControl()\r\n" + " self.SuspendLayout()\r\n" + " # \r\n" + " # userControl1\r\n" + @@ -48,7 +49,7 @@ namespace PythonBinding.Tests.Designer [TestFixtureSetUp] public void SetUpFixture() - { + { PythonComponentWalker walker = new PythonComponentWalker(componentCreator); form = walker.CreateComponent(PythonCode) as Form; userControl = form.Controls[0] as DoublePropertyUserControl; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/MergeFormTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/MergeFormTestFixture.cs index 44407a87d0..51f402696c 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/MergeFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/MergeFormTestFixture.cs @@ -5,7 +5,6 @@ // $Revision$ // -using ICSharpCode.SharpDevelop.Refactoring; using System; using System.CodeDom; using System.ComponentModel; @@ -14,13 +13,16 @@ using System.ComponentModel.Design.Serialization; using System.Drawing; using System.IO; using System.Windows.Forms; -using AvalonEdit = ICSharpCode.AvalonEdit; + using ICSharpCode.AvalonEdit.Document; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Editor.AvalonEdit; +using ICSharpCode.SharpDevelop.Refactoring; using NUnit.Framework; using PythonBinding.Tests.Utils; +using AvalonEdit = ICSharpCode.AvalonEdit; namespace PythonBinding.Tests.Designer { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/MissingInitializeComponentMethodTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/MissingInitializeComponentMethodTestFixture.cs index bf4b29ffcf..8eafa86b55 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/MissingInitializeComponentMethodTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/MissingInitializeComponentMethodTestFixture.cs @@ -16,6 +16,7 @@ using System.Resources; using System.Windows.Forms; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting; using IronPython.Compiler.Ast; using Microsoft.Scripting; using NUnit.Framework; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/NameCreationServiceTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/NameCreationServiceTestFixture.cs index 268dd8d9ef..3f6698e7ca 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/NameCreationServiceTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/NameCreationServiceTestFixture.cs @@ -8,7 +8,9 @@ using System; using System.ComponentModel.Design.Serialization; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/NoNewLineAfterInitializeComponentTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/NoNewLineAfterInitializeComponentTestFixture.cs index 5cfba513bf..9a90f65571 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/NoNewLineAfterInitializeComponentTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/NoNewLineAfterInitializeComponentTestFixture.cs @@ -13,15 +13,17 @@ using System.ComponentModel.Design.Serialization; using System.Drawing; using System.IO; using System.Windows.Forms; -using AvalonEdit = ICSharpCode.AvalonEdit; + using ICSharpCode.AvalonEdit.Document; +using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Editor.AvalonEdit; using ICSharpCode.SharpDevelop.Refactoring; -using ICSharpCode.PythonBinding; using NUnit.Framework; using PythonBinding.Tests.Utils; +using AvalonEdit = ICSharpCode.AvalonEdit; namespace PythonBinding.Tests.Designer { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/OneCompatibleMethodTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/OneCompatibleMethodTestFixture.cs index 3eff8238bb..f1216587ee 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/OneCompatibleMethodTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/OneCompatibleMethodTestFixture.cs @@ -10,7 +10,9 @@ using System.CodeDom; using System.CodeDom.Compiler; using System.Collections; using System.IO; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/ProjectRootNamespacePassedToMergeTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/ProjectRootNamespacePassedToMergeTestFixture.cs index a212cd1c40..e1f203d0ee 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/ProjectRootNamespacePassedToMergeTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/ProjectRootNamespacePassedToMergeTestFixture.cs @@ -13,15 +13,17 @@ using System.ComponentModel.Design.Serialization; using System.Drawing; using System.IO; using System.Windows.Forms; -using AvalonEdit = ICSharpCode.AvalonEdit; + using ICSharpCode.AvalonEdit.Document; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Editor.AvalonEdit; using ICSharpCode.SharpDevelop.Refactoring; using NUnit.Framework; using PythonBinding.Tests.Utils; +using AvalonEdit = ICSharpCode.AvalonEdit; namespace PythonBinding.Tests.Designer { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/PythonCodeDeserializerTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/PythonCodeDeserializerTests.cs index 6cfcfe5bfe..9c529e5ccd 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/PythonCodeDeserializerTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/PythonCodeDeserializerTests.cs @@ -11,6 +11,7 @@ using System.Drawing; using System.Windows.Forms; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using IronPython.Compiler.Ast; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/PythonControlFieldExpressionTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/PythonControlFieldExpressionTests.cs index 6e3e5a2aac..04ba61d85f 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/PythonControlFieldExpressionTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/PythonControlFieldExpressionTests.cs @@ -8,7 +8,9 @@ using System; using System.ComponentModel; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using IronPython.Compiler.Ast; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/PythonDesignerLoaderTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/PythonDesignerLoaderTestFixture.cs index 1069cfa467..1943c04f03 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/PythonDesignerLoaderTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/PythonDesignerLoaderTestFixture.cs @@ -18,6 +18,7 @@ using System.Windows.Forms; using ICSharpCode.FormsDesigner; using ICSharpCode.FormsDesigner.Services; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/RemoveMainMenuStripFromFormTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/RemoveMainMenuStripFromFormTestFixture.cs index 2560e32a10..43680c328f 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/RemoveMainMenuStripFromFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/RemoveMainMenuStripFromFormTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/TextBoxNotAddedToFormTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/TextBoxNotAddedToFormTestFixture.cs index c84a994eea..b7963e2be1 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/TextBoxNotAddedToFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/TextBoxNotAddedToFormTestFixture.cs @@ -13,6 +13,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/TextEditorIndentPassedToGeneratorTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/TextEditorIndentPassedToGeneratorTestFixture.cs index c837e8e27b..961e0deaf7 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/TextEditorIndentPassedToGeneratorTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/TextEditorIndentPassedToGeneratorTestFixture.cs @@ -14,6 +14,7 @@ using System.Windows.Forms; using ICSharpCode.FormsDesigner; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Editor; using NUnit.Framework; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/UnknownTypeTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/UnknownTypeTestFixture.cs index c606534880..17072c4941 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/UnknownTypeTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/UnknownTypeTestFixture.cs @@ -14,6 +14,7 @@ using System.Windows.Forms; using ICSharpCode.Core; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using IronPython.Compiler.Ast; using Microsoft.Scripting; using NUnit.Framework; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/DebugPythonCommandTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/DebugPythonCommandTestFixture.cs index 68ce425c90..10364c09b0 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/DebugPythonCommandTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/DebugPythonCommandTestFixture.cs @@ -8,10 +8,11 @@ using System; using System.Diagnostics; using ICSharpCode.Core; -using ICSharpCode.SharpDevelop.Debugging; using ICSharpCode.PythonBinding; -using PythonBinding.Tests.Utils; +using ICSharpCode.Scripting.Tests.Utils; +using ICSharpCode.SharpDevelop.Debugging; using NUnit.Framework; +using PythonBinding.Tests.Utils; namespace PythonBinding.Tests.Gui { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/FormsDesignerDisplayBindingTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/FormsDesignerDisplayBindingTestFixture.cs index 1144e5aec5..528464ff09 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/FormsDesignerDisplayBindingTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/FormsDesignerDisplayBindingTestFixture.cs @@ -6,9 +6,10 @@ // using System; +using ICSharpCode.Core; using ICSharpCode.FormsDesigner; using ICSharpCode.PythonBinding; -using ICSharpCode.Core; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Gui; using NUnit.Framework; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/PythonIndentationTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/PythonIndentationTests.cs index 8c15ac09b7..26f8b9adb4 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/PythonIndentationTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/PythonIndentationTests.cs @@ -8,13 +8,14 @@ using System; using ICSharpCode.AvalonEdit; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Editor.AvalonEdit; using NUnit.Framework; using PythonBinding.Tests.Utils; -namespace PythonBinding.Tests +namespace PythonBinding.Tests.Gui { /// /// Tests that the PythonFormattingStrategy indents the new line added after pressing the ':' character. diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/RunPythonCommandTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/RunPythonCommandTests.cs index b3ca5ca6d9..5b87b59084 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/RunPythonCommandTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/RunPythonCommandTests.cs @@ -8,6 +8,7 @@ using System; using ICSharpCode.Core; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Gui; using NUnit.Framework; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/SendLineToPythonConsoleCommandTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/SendLineToPythonConsoleCommandTests.cs index e625cf994e..5be956ef34 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/SendLineToPythonConsoleCommandTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/SendLineToPythonConsoleCommandTests.cs @@ -7,6 +7,7 @@ using System; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using PythonBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParserTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParserTestFixture.cs index 69246ece1f..01c3bf0853 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParserTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParserTestFixture.cs @@ -8,6 +8,7 @@ using System; using System.IO; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Internal.Templates; using ICSharpCode.SharpDevelop.Project; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj index 584fdffd6d..8e95f81cf5 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj @@ -107,14 +107,10 @@ - - - - @@ -423,8 +419,6 @@ - - @@ -435,59 +429,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -497,15 +456,10 @@ - - - - - @@ -559,6 +513,14 @@ {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} FormsDesigner + + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD} + ICSharpCode.Scripting + + + {85C09AD8-183B-403A-869A-7226646218A9} + ICSharpCode.Scripting.Tests + {8D732610-8FC6-43BA-94C9-7126FD7FE361} PythonBinding diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/CreateNewPythonProjectTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/CreateNewPythonProjectTestFixture.cs index 615d77d517..5c26429f3d 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/CreateNewPythonProjectTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/CreateNewPythonProjectTestFixture.cs @@ -17,7 +17,7 @@ using ICSharpCode.SharpDevelop.Project; using NUnit.Framework; using PythonBinding.Tests.Utils; -namespace PythonBinding.Tests +namespace PythonBinding.Tests.PythonLanguage { /// /// Tests the initial properties set in a newly created PythonProject. diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/ProjectBindingTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/ProjectBindingTestFixture.cs index d262857506..8b3b1bd4dd 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/ProjectBindingTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/ProjectBindingTestFixture.cs @@ -11,7 +11,7 @@ using ICSharpCode.SharpDevelop.Project; using ICSharpCode.SharpDevelop.Internal.Templates; using NUnit.Framework; -namespace PythonBinding.Tests +namespace PythonBinding.Tests.PythonLanguage { /// /// Tests the PythonProjectBinding class. diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/PythonLanguagePropertiesTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/PythonLanguagePropertiesTests.cs index 00a1cc198e..95b69e324d 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/PythonLanguagePropertiesTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/PythonLanguagePropertiesTests.cs @@ -10,7 +10,7 @@ using ICSharpCode.PythonBinding; using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; -namespace PythonBinding.Tests +namespace PythonBinding.Tests.PythonLanguage { [TestFixture] public class PythonLanguagePropertiesTests diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/PythonTestFrameworkIsTestProjectTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/PythonTestFrameworkIsTestProjectTests.cs index f6a0a979ae..7b5b0f64be 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/PythonTestFrameworkIsTestProjectTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/PythonTestFrameworkIsTestProjectTests.cs @@ -7,6 +7,7 @@ using System; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Internal.Templates; using ICSharpCode.SharpDevelop.Project; using NUnit.Framework; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/AddedComponent.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/AddedComponent.cs deleted file mode 100644 index ac24d7ba5d..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/AddedComponent.cs +++ /dev/null @@ -1,54 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.ComponentModel; - -namespace PythonBinding.Tests.Utils -{ - /// - /// Component passed to the IComponentCreator.Add method. - /// - public class AddedComponent - { - public AddedComponent(IComponent component, string name) - { - Component = component; - Name = name; - } - - public string Name { get; set; } - public IComponent Component { get; set; } - - public override bool Equals(object obj) - { - AddedComponent rhs = obj as AddedComponent; - if (rhs != null) { - return Name == rhs.Name && Component == rhs.Component; - } - return base.Equals(obj); - } - - public override int GetHashCode() - { - return Component.GetHashCode() ^ Name.GetHashCode(); - } - - public override string ToString() - { - return "AddedComponent [Component=" + GetComponentTypeName() + "Name=" + Name + "]"; - } - - string GetComponentTypeName() - { - if (Component != null) { - return Component.GetType().Name; - } - return ""; - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedConvertProjectToPythonProjectCommand.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedConvertProjectToPythonProjectCommand.cs index af3e6788fd..7b64358d1d 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedConvertProjectToPythonProjectCommand.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedConvertProjectToPythonProjectCommand.cs @@ -8,8 +8,10 @@ using System; using System.Collections.Generic; using System.Text; + using ICSharpCode.Core; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Project; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedPythonDesignerGenerator.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedPythonDesignerGenerator.cs index bb6e33d468..2ecf31a044 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedPythonDesignerGenerator.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedPythonDesignerGenerator.cs @@ -14,6 +14,7 @@ using System.Reflection; using ICSharpCode.FormsDesigner; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Gui; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DoublePropertyUserControl.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DoublePropertyUserControl.cs deleted file mode 100644 index 47aae4d9b7..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DoublePropertyUserControl.cs +++ /dev/null @@ -1,26 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Windows.Forms; - -namespace PythonBinding.Tests.Utils -{ - public class DoublePropertyUserControl : UserControl - { - double doubleValue = -1.1; - - public DoublePropertyUserControl() - { - } - - public double DoubleValue { - get { return doubleValue; } - set { doubleValue = value; } - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/FakeDocument.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/FakeDocument.cs deleted file mode 100644 index c38224c131..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/FakeDocument.cs +++ /dev/null @@ -1,139 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.IO; -using System.Text; -using ICSharpCode.NRefactory; -using ICSharpCode.SharpDevelop; -using ICSharpCode.SharpDevelop.Editor; - -namespace PythonBinding.Tests.Utils -{ - public class FakeDocument : IDocument - { - #pragma warning disable 0067 - public event EventHandler Changing; - public event EventHandler Changed; - public event EventHandler TextChanged; - #pragma warning restore 0067 - - public FakeDocumentLine DocumentLineToReturnFromGetLine; - public int LineNumberPassedToGetLine; - - public string Text { get; set; } - - public int TotalNumberOfLines { - get { - throw new NotImplementedException(); - } - } - - public ITextBufferVersion Version { - get { - throw new NotImplementedException(); - } - } - - public int TextLength { - get { - throw new NotImplementedException(); - } - } - - public IDocumentLine GetLine(int lineNumber) - { - LineNumberPassedToGetLine = lineNumber; - return DocumentLineToReturnFromGetLine; - } - - public IDocumentLine GetLineForOffset(int offset) - { - throw new NotImplementedException(); - } - - public int PositionToOffset(int line, int column) - { - throw new NotImplementedException(); - } - - public Location OffsetToPosition(int offset) - { - throw new NotImplementedException(); - } - - public void Insert(int offset, string text) - { - throw new NotImplementedException(); - } - - public void Remove(int offset, int length) - { - throw new NotImplementedException(); - } - - public void Replace(int offset, int length, string newText) - { - throw new NotImplementedException(); - } - - public void StartUndoableAction() - { - throw new NotImplementedException(); - } - - public void EndUndoableAction() - { - throw new NotImplementedException(); - } - - public IDisposable OpenUndoGroup() - { - throw new NotImplementedException(); - } - - public ITextAnchor CreateAnchor(int offset) - { - throw new NotImplementedException(); - } - - public ITextBuffer CreateSnapshot() - { - throw new NotImplementedException(); - } - - public ITextBuffer CreateSnapshot(int offset, int length) - { - throw new NotImplementedException(); - } - - public TextReader CreateReader() - { - throw new NotImplementedException(); - } - - public TextReader CreateReader(int offset, int length) - { - throw new NotImplementedException(); - } - - public char GetCharAt(int offset) - { - throw new NotImplementedException(); - } - - public string GetText(int offset, int length) - { - throw new NotImplementedException(); - } - - public object GetService(Type serviceType) - { - throw new NotImplementedException(); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockConsoleTextEditor.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockConsoleTextEditor.cs index 0a941e0792..390cfa1cc3 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockConsoleTextEditor.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockConsoleTextEditor.cs @@ -13,6 +13,8 @@ using System.Windows.Input; using ICSharpCode.NRefactory; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting; +using ICSharpCode.Scripting.Tests.Utils; namespace PythonBinding.Tests.Utils { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockConsoleTextEditorKeyEventArgs.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockConsoleTextEditorKeyEventArgs.cs deleted file mode 100644 index 4bac021e59..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockConsoleTextEditorKeyEventArgs.cs +++ /dev/null @@ -1,28 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Windows.Input; -using ICSharpCode.PythonBinding; - -namespace PythonBinding.Tests.Utils -{ - public class MockConsoleTextEditorKeyEventArgs : ConsoleTextEditorKeyEventArgs - { - bool handled; - - public MockConsoleTextEditorKeyEventArgs(Key key) - : base(key) - { - } - - public override bool Handled { - get { return handled; } - set { handled = value; } - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockControlDispatcher.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockControlDispatcher.cs deleted file mode 100644 index 73dacad0f2..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockControlDispatcher.cs +++ /dev/null @@ -1,50 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using ICSharpCode.PythonBinding; - -namespace PythonBinding.Tests.Utils.Tests -{ - public class MockControlDispatcher : IControlDispatcher - { - Delegate methodInvoked; - object[] methodInvokedArgs; - bool checkAccessReturnValue; - - public MockControlDispatcher() - { - } - - public bool CheckAccess() - { - return checkAccessReturnValue; - } - - public bool CheckAccessReturnValue { - get { return checkAccessReturnValue; } - set { checkAccessReturnValue = value; } - } - - public object Invoke(Delegate method, params object[] args) - { - methodInvoked = method; - methodInvokedArgs = args; - return null; - } - - public Delegate MethodInvoked { - get { return methodInvoked; } - set { methodInvoked = null; } - } - - public object[] MethodInvokedArgs { - get { return methodInvokedArgs; } - set { methodInvokedArgs = value; } - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockEventDescriptor.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockEventDescriptor.cs deleted file mode 100644 index 83007c12f0..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockEventDescriptor.cs +++ /dev/null @@ -1,50 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.ComponentModel; - -namespace PythonBinding.Tests.Utils -{ - /// - /// Mock EventDescriptor class. - /// - public class MockEventDescriptor : EventDescriptor - { - public MockEventDescriptor(string name) : base(name, new Attribute[0]) - { - } - - public override Type ComponentType { - get { - throw new NotImplementedException(); - } - } - - public override Type EventType { - get { - throw new NotImplementedException(); - } - } - - public override bool IsMulticast { - get { - throw new NotImplementedException(); - } - } - - public override void AddEventHandler(object component, Delegate value) - { - throw new NotImplementedException(); - } - - public override void RemoveEventHandler(object component, Delegate value) - { - throw new NotImplementedException(); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockExtenderProviderService.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockExtenderProviderService.cs deleted file mode 100644 index d774c82904..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockExtenderProviderService.cs +++ /dev/null @@ -1,41 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.ComponentModel; -using System.ComponentModel.Design; -using System.ComponentModel.Design.Serialization; - -namespace PythonBinding.Tests.Utils -{ - /// - /// Description of MockExtenderProviderService. - /// - public class MockExtenderProviderService : IExtenderProviderService - { - bool languageExtendersAdded; - - public MockExtenderProviderService() - { - } - - public bool IsLanguageExtendersAdded { - get { return languageExtendersAdded; } - } - - public void AddExtenderProvider(IExtenderProvider provider) - { - if (provider.GetType().Name == "LanguageExtenders") { - languageExtendersAdded = true; - } - } - - public void RemoveExtenderProvider(IExtenderProvider provider) - { - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockProject.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockProject.cs deleted file mode 100644 index 2eda8dc834..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockProject.cs +++ /dev/null @@ -1,306 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using ICSharpCode.Core; -using ICSharpCode.SharpDevelop; -using ICSharpCode.SharpDevelop.Internal.Templates; -using ICSharpCode.SharpDevelop.Project; - -namespace PythonBinding.Tests.Utils -{ - /// - /// MockProject. - /// - public class MockProject : IProject - { - readonly object syncRoot = new object(); - string directory = String.Empty; - string rootNamespace = String.Empty; - - public MockProject() - { - } - - #region IProject - public event EventHandler DirtyChanged; - - protected virtual void OnDirtyChanged(EventArgs e) - { - if (DirtyChanged != null) { - DirtyChanged(this, e); - } - } - - public ReadOnlyCollection Items { - get { - throw new NotImplementedException(); - } - } - - public bool ReadOnly { - get { return false; } - } - - public ICollection AvailableFileItemTypes { - get { - throw new NotImplementedException(); - } - } - - public System.Collections.Generic.List ProjectSections { - get { - throw new NotImplementedException(); - } - } - - public ICSharpCode.SharpDevelop.Dom.LanguageProperties LanguageProperties { - get { - throw new NotImplementedException(); - } - } - - public ICSharpCode.SharpDevelop.Dom.IAmbience GetAmbience() - { - throw new NotImplementedException(); - } - - public string FileName { - get { - throw new NotImplementedException(); - } - set { - throw new NotImplementedException(); - } - } - - public string Directory { - get { return directory; } - set { directory = value; } - } - - public string AssemblyName { - get { - throw new NotImplementedException(); - } - set { - throw new NotImplementedException(); - } - } - - public string RootNamespace { - get { return rootNamespace; } - set { rootNamespace = value; } - } - - public string OutputAssemblyFullPath { - get { - throw new NotImplementedException(); - } - } - - string language = String.Empty; - - public string Language { - get { - return language; - } - set { - language = value; - } - } - - public string AppDesignerFolder { - get { - throw new NotImplementedException(); - } - } - - public string ActiveConfiguration { - get { - throw new NotImplementedException(); - } - set { - throw new NotImplementedException(); - } - } - - public string ActivePlatform { - get { - throw new NotImplementedException(); - } - set { - throw new NotImplementedException(); - } - } - - public event EventHandler ActiveConfigurationChanged { add {} remove {} } - - public event EventHandler ActivePlatformChanged { add {} remove {} } - - public ICollection ConfigurationNames { - get { - throw new NotImplementedException(); - } - } - - public ICollection PlatformNames { - get { - throw new NotImplementedException(); - } - } - - public bool IsStartable { - get { - throw new NotImplementedException(); - } - } - - public object SyncRoot { - get { return syncRoot; } - } - - public ISolutionFolderContainer Parent { - get { - throw new NotImplementedException(); - } - set { - throw new NotImplementedException(); - } - } - - public Solution ParentSolution { - get { return new Solution(); } - } - - public string TypeGuid { - get { - throw new NotImplementedException(); - } - set { - throw new NotImplementedException(); - } - } - - public string IdGuid { - get { - throw new NotImplementedException(); - } - set { - throw new NotImplementedException(); - } - } - - public string Location { - get { - throw new NotImplementedException(); - } - set { - throw new NotImplementedException(); - } - } - - public string Name { - get { return String.Empty; } - set { - } - } - - public bool IsDirty { - get { - throw new NotImplementedException(); - } - set { - throw new NotImplementedException(); - } - } - - public IEnumerable GetItemsOfType(ItemType type) - { - throw new NotImplementedException(); - } - - public ItemType GetDefaultItemType(string fileName) - { - throw new NotImplementedException(); - } - - public void Save() - { - throw new NotImplementedException(); - } - - public bool IsFileInProject(string fileName) - { - throw new NotImplementedException(); - } - - public FileProjectItem FindFile(string fileName) - { - throw new NotImplementedException(); - } - - public void Start(bool withDebugging) - { - throw new NotImplementedException(); - } - - public ParseProjectContent CreateProjectContent() - { - throw new NotImplementedException(); - } - - public ProjectItem CreateProjectItem(IProjectItemBackendStore item) - { - throw new NotImplementedException(); - } - - public void Dispose() - { - throw new NotImplementedException(); - } - - public Properties CreateMemento() - { - throw new NotImplementedException(); - } - - public void SetMemento(ICSharpCode.Core.Properties memento) - { - throw new NotImplementedException(); - } - - public int MinimumSolutionVersion { - get { - throw new NotImplementedException(); - } - } - - public void ResolveAssemblyReferences() - { - throw new NotImplementedException(); - } - - public ICollection GetBuildDependencies(ProjectBuildOptions buildOptions) - { - throw new NotImplementedException(); - } - - public void StartBuild(ProjectBuildOptions buildOptions, IBuildFeedbackSink feedbackSink) - { - throw new NotImplementedException(); - } - - public ProjectBuildOptions CreateProjectBuildOptions(BuildOptions options, bool isRootBuildable) - { - throw new NotImplementedException(); - } - #endregion - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockPythonFileService.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockPythonFileService.cs index 528158cdbd..e1f7363efa 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockPythonFileService.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockPythonFileService.cs @@ -8,7 +8,9 @@ using System; using System.IO; using System.Text; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting; namespace PythonBinding.Tests.Utils { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockTextEditor.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockTextEditor.cs deleted file mode 100644 index fa7be87507..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockTextEditor.cs +++ /dev/null @@ -1,132 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Windows.Input; -using ICSharpCode.SharpDevelop.Editor; - -namespace PythonBinding.Tests.Utils -{ - public class MockTextEditor : ITextEditor - { - public MockTextEditorOptions MockTextEditorOptions = new MockTextEditorOptions(); - - public FakeDocument FakeDocument = new FakeDocument(); - public FakeCaret FakeCaret = new FakeCaret(); - - public event EventHandler SelectionChanged; - - protected virtual void OnSelectionChanged(EventArgs e) - { - if (SelectionChanged != null) { - SelectionChanged(this, e); - } - } - - public event KeyEventHandler KeyPress; - - protected virtual void OnKeyPress(KeyEventArgs e) - { - if (KeyPress != null) { - KeyPress(this, e); - } - } - - public ITextEditor PrimaryView { - get { - throw new NotImplementedException(); - } - } - - public IDocument Document { - get { return FakeDocument; } - } - - public ITextEditorCaret Caret { - get { return FakeCaret; } - } - - public ITextEditorOptions Options { - get { return MockTextEditorOptions; } - } - - public ICSharpCode.SharpDevelop.ILanguageBinding Language { - get { - throw new NotImplementedException(); - } - } - - public int SelectionStart { - get { - throw new NotImplementedException(); - } - } - - public int SelectionLength { - get { - throw new NotImplementedException(); - } - } - - public string SelectedText { - get { - throw new NotImplementedException(); - } - set { - throw new NotImplementedException(); - } - } - - public ICSharpCode.Core.FileName FileName { - get { - throw new NotImplementedException(); - } - } - - public ICSharpCode.SharpDevelop.Editor.CodeCompletion.ICompletionListWindow ActiveCompletionWindow { - get { - throw new NotImplementedException(); - } - } - - public ICSharpCode.SharpDevelop.Editor.CodeCompletion.IInsightWindow ActiveInsightWindow { - get { - throw new NotImplementedException(); - } - } - - public void Select(int selectionStart, int selectionLength) - { - throw new NotImplementedException(); - } - - public void JumpTo(int line, int column) - { - throw new NotImplementedException(); - } - - public ICSharpCode.SharpDevelop.Editor.CodeCompletion.ICompletionListWindow ShowCompletionWindow(ICSharpCode.SharpDevelop.Editor.CodeCompletion.ICompletionItemList data) - { - throw new NotImplementedException(); - } - - public ICSharpCode.SharpDevelop.Editor.CodeCompletion.IInsightWindow ShowInsightWindow(System.Collections.Generic.IEnumerable items) - { - throw new NotImplementedException(); - } - - public System.Collections.Generic.IEnumerable GetSnippets() - { - throw new NotImplementedException(); - } - - public object GetService(Type serviceType) - { - return null; - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockTextEditorOptions.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockTextEditorOptions.cs deleted file mode 100644 index d999666c7f..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockTextEditorOptions.cs +++ /dev/null @@ -1,38 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using ICSharpCode.AvalonEdit; -using ICSharpCode.SharpDevelop.Editor; - -namespace PythonBinding.Tests.Utils -{ - public class MockTextEditorOptions : TextEditorOptions, ITextEditorOptions - { - public MockTextEditorOptions() - { - } - - public bool AutoInsertBlockEnd { - get { - throw new NotImplementedException(); - } - } - - public int VerticalRulerColumn { - get { - throw new NotImplementedException(); - } - } - - public bool UnderlineErrors { - get { - throw new NotImplementedException(); - } - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockTextEditorViewContent.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockTextEditorViewContent.cs deleted file mode 100644 index 063e9f3908..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockTextEditorViewContent.cs +++ /dev/null @@ -1,38 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using ICSharpCode.AvalonEdit; -using ICSharpCode.SharpDevelop; -using ICSharpCode.SharpDevelop.Editor; -using ICSharpCode.SharpDevelop.Editor.AvalonEdit; - -namespace PythonBinding.Tests.Utils -{ - /// - /// A mock IViewContent implementation that also implements the - /// ITextEditorControlProvider interface. - /// - public class MockTextEditorViewContent : MockViewContent, ITextEditorProvider - { - ITextEditor textEditor; - - public MockTextEditorViewContent() - { - textEditor = new AvalonEditTextEditorAdapter(new TextEditor()); - } - - public ITextEditor TextEditor { - get { return textEditor; } - } - - public IDocument GetDocumentForFile(OpenedFile file) - { - throw new NotImplementedException(); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockWorkbench.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockWorkbench.cs index e4e17bed0e..d587dc8be3 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockWorkbench.cs +++ b/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.Tests.Utils; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Gui; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/SupportInitCustomControl.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/SupportInitCustomControl.cs deleted file mode 100644 index f3038f002c..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/SupportInitCustomControl.cs +++ /dev/null @@ -1,48 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.ComponentModel; -using System.Windows.Forms; - -namespace PythonBinding.Tests.Utils -{ - public class SupportInitCustomControl : UserControl, ISupportInitialize - { - bool beginInitCalled; - bool endInitCalled; - - public SupportInitCustomControl() - { - } - - [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - [Browsable(false)] - public bool IsBeginInitCalled { - get { return beginInitCalled; } - } - - [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - [Browsable(false)] - public bool IsEndInitCalled { - get { return endInitCalled; } - } - - /// - /// Deliberately making the interface explicit for the BeginInit method but not the EndInit method. - /// - void ISupportInitialize.BeginInit() - { - beginInitCalled = true; - } - - public void EndInit() - { - endInitCalled = true; - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/TestablePythonConsole.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/TestablePythonConsole.cs index 9cc62cf3e8..54cd40f7d4 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/TestablePythonConsole.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/TestablePythonConsole.cs @@ -8,6 +8,8 @@ using System; using System.Collections.Generic; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting; +using ICSharpCode.Scripting.Tests.Utils; using IronPython.Hosting; namespace PythonBinding.Tests.Utils diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/Tests/MockConsoleTextEditorTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/Tests/MockConsoleTextEditorTestFixture.cs index beb98844e0..bb07279266 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/Tests/MockConsoleTextEditorTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/Tests/MockConsoleTextEditorTestFixture.cs @@ -8,8 +8,8 @@ using System; using System.Windows.Input; using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting; using NUnit.Framework; -using PythonBinding.Tests.Console; using PythonBinding.Tests.Utils; namespace PythonBinding.Tests.Utils.Tests diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/Tests/MockControlDispatcherTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/Tests/MockControlDispatcherTestFixture.cs deleted file mode 100644 index f35781500b..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/Tests/MockControlDispatcherTestFixture.cs +++ /dev/null @@ -1,59 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using ICSharpCode.PythonBinding; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Utils.Tests -{ - [TestFixture] - public class MockControlDispatcherTestFixture - { - MockControlDispatcher dispatcher; - - [SetUp] - public void Init() - { - dispatcher = new MockControlDispatcher(); - } - - [Test] - public void CheckAccessReturnsFalseWhenCheckAccessReturnValueSetToFalse() - { - dispatcher.CheckAccessReturnValue = false; - Assert.IsFalse(dispatcher.CheckAccess()); - } - - [Test] - public void CheckAccessReturnsTrueWhenCheckAccessReturnValueSetToTrue() - { - dispatcher.CheckAccessReturnValue = true; - Assert.IsTrue(dispatcher.CheckAccess()); - } - - [Test] - public void MethodInvokedReturnsDelegatePassedToInvokeMethod() - { - Action expectedDelegate = MethodInvokedReturnsDelegatePassedToInvokeMethod; - dispatcher.MethodInvoked = null; - dispatcher.Invoke(expectedDelegate); - Assert.AreEqual(expectedDelegate, dispatcher.MethodInvoked); - } - - [Test] - public void MethodInvokedArgsReturnsArgumentsPassedToInvokeMethod() - { - dispatcher.MethodInvokedArgs = null; - dispatcher.Invoke(null, "a", "b"); - - object[] expectedArgs = new object [] { "a", "b" }; - Assert.AreEqual(expectedArgs, dispatcher.MethodInvokedArgs); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/Tests/MockPythonFileServiceTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/Tests/MockPythonFileServiceTestFixture.cs index 0b068bd50a..7457fd2e87 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/Tests/MockPythonFileServiceTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/Tests/MockPythonFileServiceTestFixture.cs @@ -8,7 +8,9 @@ using System; using System.IO; using System.Text; + using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting; using NUnit.Framework; namespace PythonBinding.Tests.Utils.Tests diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding.sln b/src/AddIns/BackendBindings/Ruby/RubyBinding.sln index c99709c242..1d6ead6566 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding.sln +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -# SharpDevelop 4.0.0.6500 +# SharpDevelop 4.0.0.6511 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RubyBinding", "RubyBinding\Project\RubyBinding.csproj", "{C896FFFF-5B6C-4B0E-B6DF-049865F501B4}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RubyBinding.Tests", "RubyBinding\Test\RubyBinding.Tests.csproj", "{01DF0475-0CB2-4E81-971B-BADC60CDE3A5}" @@ -24,12 +24,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "..\..\Analys EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting.Tests", "..\..\Analysis\UnitTesting\Test\UnitTesting.Tests.csproj", "{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Scripting", "..\Scripting\Project\ICSharpCode.Scripting.csproj", "{7048AE18-EB93-4A84-82D0-DD60EB58ADBD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Scripting.Tests", "..\Scripting\Test\ICSharpCode.Scripting.Tests.csproj", "{85C09AD8-183B-403A-869A-7226646218A9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {C896FFFF-5B6C-4B0E-B6DF-049865F501B4}.Debug|Any CPU.Build.0 = Debug|Any CPU @@ -76,5 +82,21 @@ Global {44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}.Release|Any CPU.Build.0 = Release|Any CPU {44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Debug|Any CPU.Build.0 = Debug|x86 + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Debug|Any CPU.ActiveCfg = Debug|x86 + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Release|Any CPU.Build.0 = Release|x86 + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Release|Any CPU.ActiveCfg = Release|x86 + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Debug|x86.Build.0 = Debug|x86 + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Debug|x86.ActiveCfg = Debug|x86 + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Release|x86.Build.0 = Release|x86 + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Release|x86.ActiveCfg = Release|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Debug|Any CPU.Build.0 = Debug|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Debug|Any CPU.ActiveCfg = Debug|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Debug|x86.Build.0 = Debug|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Debug|x86.ActiveCfg = Debug|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Release|Any CPU.Build.0 = Release|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Release|Any CPU.ActiveCfg = Release|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Release|x86.Build.0 = Release|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Release|x86.ActiveCfg = Release|x86 EndGlobalSection EndGlobal diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/RubyBinding.csproj b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/RubyBinding.csproj index 61e284a029..1e97622665 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/RubyBinding.csproj +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/RubyBinding.csproj @@ -86,12 +86,6 @@ Configuration\GlobalAssemblyInfo.cs - - - - - - @@ -100,8 +94,6 @@ - - @@ -147,7 +139,6 @@ - @@ -252,5 +243,10 @@ FormsDesigner False + + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD} + ICSharpCode.Scripting + False + \ No newline at end of file diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/CommandLineHistory.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/CommandLineHistory.cs deleted file mode 100644 index ef4a4891be..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/CommandLineHistory.cs +++ /dev/null @@ -1,83 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections.Generic; - -namespace ICSharpCode.RubyBinding -{ - /// - /// Stores the command line history for the RubyConsole. - /// - public class CommandLineHistory - { - List lines = new List(); - int position; - - public CommandLineHistory() - { - } - - /// - /// Adds the command line to the history. - /// - public void Add(string line) - { - if (!String.IsNullOrEmpty(line)) { - int index = lines.Count - 1; - if (index >= 0) { - if (lines[index] != line) { - lines.Add(line); - } - } else { - lines.Add(line); - } - } - position = lines.Count; - } - - /// - /// Gets the current command line. By default this will be the last command line entered. - /// - public string Current { - get { - if ((position >= 0) && (position < lines.Count)) { - return lines[position]; - } - return null; - } - } - - /// - /// Moves to the next command line. - /// - /// False if the current position is at the end of the command line history. - public bool MoveNext() - { - int nextPosition = position + 1; - if (nextPosition < lines.Count) { - ++position; - } - return nextPosition < lines.Count; - } - - /// - /// Moves to the previous command line. - /// - /// False if the current position is at the start of the command line history. - public bool MovePrevious() - { - if (position >= 0) { - if (position == 0) { - return false; - } - --position; - } - return position >= 0; - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/IComponentCreator.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/IComponentCreator.cs deleted file mode 100644 index 6d879e3a4e..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/IComponentCreator.cs +++ /dev/null @@ -1,76 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections; -using System.ComponentModel; -using System.ComponentModel.Design; -using System.Globalization; -using System.Resources; - -namespace ICSharpCode.RubyBinding -{ - /// - /// Interface that can: - /// - /// 1) Create an IComponent given a type. - /// 2) Create a new object given its type name. - /// - /// Used by the RubyFormVisitor class so it can be wired up to an - /// IDesignerHost and an IDesignerSerializationManager. - /// - public interface IComponentCreator : IResourceService - { - /// - /// Creates a named component of the specified type. - /// - /// The type of the component to be created. - /// The component name. - IComponent CreateComponent(Type componentClass, string name); - - /// - /// Adds a component to the component creator. - /// - void Add(IComponent component, string name); - - /// - /// Gets a component that have been added via the Add method. - /// - /// The component name. - /// Null if the component cannot be found. - IComponent GetComponent(string name); - - /// - /// Gets the RootComponent. - /// - IComponent RootComponent { get; } - - /// - /// Creates a new instance of the object given its type. - /// - /// Arguments passed to the type's constructor. - /// Name of the object. - /// If set to true then the is added to the design container. - object CreateInstance(Type type, ICollection arguments, string name, bool addToContainer); - - /// - /// Gets the created instance. - /// - /// Instance name. - object GetInstance(string name); - - /// - /// Gets the type given its name. - /// - Type GetType(string typeName); - - /// - /// Gets the property descriptor associated with the event. - /// - PropertyDescriptor GetEventProperty(EventDescriptor e); - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/IConsoleTextEditor.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/IConsoleTextEditor.cs index 6b4582e3bc..28a048dee5 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/IConsoleTextEditor.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/IConsoleTextEditor.cs @@ -6,6 +6,7 @@ // using System; +using ICSharpCode.Scripting; namespace ICSharpCode.RubyBinding { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/IMemberProvider.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/IMemberProvider.cs deleted file mode 100644 index 8ba46e17fc..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/IMemberProvider.cs +++ /dev/null @@ -1,22 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections.Generic; - -namespace ICSharpCode.RubyBinding -{ - /// - /// Returns member names or global names for the ruby console command line. - /// - public interface IMemberProvider - { - IList GetMemberNames(string name); - - IList GetGlobals(string name); - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/IRubyFileService.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/IRubyFileService.cs index 02bd95f7fb..62cd2a3b0a 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/IRubyFileService.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/IRubyFileService.cs @@ -8,6 +8,8 @@ using System; using System.IO; using System.Text; + +using ICSharpCode.Scripting; using ICSharpCode.UnitTesting; namespace ICSharpCode.RubyBinding diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyCodeDeserializer.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyCodeDeserializer.cs index ec4fe9ee73..a6b72f2d4e 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyCodeDeserializer.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyCodeDeserializer.cs @@ -10,6 +10,8 @@ using System.Collections.Generic; using System.ComponentModel; using System.Reflection; using System.Text; + +using ICSharpCode.Scripting; using IronRuby.Builtins; using IronRuby.Compiler; using IronRuby.Compiler.Ast; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyComponentWalker.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyComponentWalker.cs index a5b656891d..cd6f64f1e3 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyComponentWalker.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyComponentWalker.cs @@ -17,10 +17,11 @@ using System.Text; using System.Windows.Forms; using ICSharpCode.Core; +using ICSharpCode.Scripting; using ICSharpCode.SharpDevelop; -using IronRuby.Hosting; using IronRuby.Compiler; using IronRuby.Compiler.Ast; +using IronRuby.Hosting; using IronRuby.Runtime; namespace ICSharpCode.RubyBinding diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsole.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsole.cs index 24cfbffe48..3d353ac97e 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsole.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsole.cs @@ -11,6 +11,7 @@ using System.IO; using System.Threading; using System.Windows.Input; using ICSharpCode.AvalonEdit.CodeCompletion; +using ICSharpCode.Scripting; using Microsoft.Scripting.Hosting; using Microsoft.Scripting.Hosting.Shell; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsoleCompletionDataProvider.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsoleCompletionDataProvider.cs index 7fe4df8239..4f9fdf5d1c 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsoleCompletionDataProvider.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsoleCompletionDataProvider.cs @@ -7,9 +7,9 @@ using System; using System.Collections.Generic; - using ICSharpCode.AvalonEdit.CodeCompletion; using ICSharpCode.Core; +using ICSharpCode.Scripting; using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Editor.CodeCompletion; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsoleTextEditor.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsoleTextEditor.cs index 250f68e72d..bb57be1202 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsoleTextEditor.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsoleTextEditor.cs @@ -10,9 +10,11 @@ using System.Drawing; using System.Windows; using System.Windows.Input; using System.Windows.Threading; + using ICSharpCode.AvalonEdit; using ICSharpCode.AvalonEdit.CodeCompletion; using ICSharpCode.AvalonEdit.Document; +using ICSharpCode.Scripting; using ICSharpCode.SharpDevelop.Gui; namespace ICSharpCode.RubyBinding diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsoleTextEditorKeyEventArgs.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsoleTextEditorKeyEventArgs.cs index 4df2cb29d0..82da79d790 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsoleTextEditorKeyEventArgs.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsoleTextEditorKeyEventArgs.cs @@ -7,6 +7,7 @@ using System; using System.Windows.Input; +using ICSharpCode.Scripting; namespace ICSharpCode.RubyBinding { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyControlFieldExpression.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyControlFieldExpression.cs index 4c3b47240a..17fc94d7c3 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyControlFieldExpression.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyControlFieldExpression.cs @@ -11,6 +11,8 @@ using System.ComponentModel; using System.Reflection; using System.Text; using System.Windows.Forms; + +using ICSharpCode.Scripting; using IronRuby.Builtins; using IronRuby.Compiler.Ast; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyDesignerLoader.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyDesignerLoader.cs index cac49b5c51..5f2d46db4a 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyDesignerLoader.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyDesignerLoader.cs @@ -18,6 +18,7 @@ using System.Security.Permissions; using ICSharpCode.FormsDesigner; using ICSharpCode.FormsDesigner.Services; +using ICSharpCode.Scripting; namespace ICSharpCode.RubyBinding { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyFileService.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyFileService.cs index de29272053..8a0a634219 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyFileService.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyFileService.cs @@ -8,6 +8,7 @@ using System; using System.IO; using System.Text; +using ICSharpCode.Scripting; namespace ICSharpCode.RubyBinding { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyTestRunnerApplication.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyTestRunnerApplication.cs index 1dbe4dcd25..8277a8f770 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyTestRunnerApplication.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyTestRunnerApplication.cs @@ -10,6 +10,7 @@ using System.Diagnostics; using System.IO; using System.Text; using ICSharpCode.Core; +using ICSharpCode.Scripting; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Project; using ICSharpCode.UnitTesting; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/ThreadSafeRubyConsoleTextEditor.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/ThreadSafeRubyConsoleTextEditor.cs index f313949709..1d18a3bd0c 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/ThreadSafeRubyConsoleTextEditor.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/ThreadSafeRubyConsoleTextEditor.cs @@ -7,6 +7,7 @@ using System; using ICSharpCode.AvalonEdit; +using ICSharpCode.Scripting; namespace ICSharpCode.RubyBinding { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/CodeCompletionTests.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/CodeCompletionTests.cs index 1503989347..945edd492e 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/CodeCompletionTests.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/CodeCompletionTests.cs @@ -9,6 +9,7 @@ using System; using ICSharpCode.AvalonEdit.CodeCompletion; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Console; using ICSharpCode.SharpDevelop; using NUnit.Framework; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/CommandLineHistoryTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/CommandLineHistoryTestFixture.cs deleted file mode 100644 index ee8caef13e..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/CommandLineHistoryTestFixture.cs +++ /dev/null @@ -1,82 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using ICSharpCode.RubyBinding; -using NUnit.Framework; - -namespace RubyBinding.Tests.Console -{ - /// - /// Tests the CommandLineHistory class. - /// - [TestFixture] - public class CommandLineHistoryTestFixture - { - CommandLineHistory history; - - [SetUp] - public void Init() - { - history = new CommandLineHistory(); - history.Add("a"); - history.Add("b"); - history.Add("c"); - } - - [Test] - public void LastCommandLineIsNull() - { - Assert.IsNull(history.Current); - } - - [Test] - public void MovePreviousOnce() - { - Assert.IsTrue(history.MovePrevious()); - } - - [Test] - public void CurrentAfterMovePrevious() - { - history.MovePrevious(); - Assert.AreEqual("c", history.Current); - } - - [Test] - public void AddLineAfterMovePrevious() - { - history.MovePrevious(); - history.MovePrevious(); - history.Add("d"); - - Assert.IsNull(history.Current); - } - - [Test] - public void EmptyLineIgnored() - { - history.Add(String.Empty); - history.MovePrevious(); - Assert.AreEqual("c", history.Current); - } - - /// - /// After trying to move beyond the end of the list moving previous should not show the last - /// item again. - /// - [Test] - public void MovePreviousThenNextTwiceThenPreviousAgain() - { - history.MovePrevious(); - history.MoveNext(); - history.MoveNext(); - history.MovePrevious(); - Assert.AreEqual("b", history.Current); - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/EmptyCommandLineHistoryTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/EmptyCommandLineHistoryTestFixture.cs deleted file mode 100644 index 52ca354900..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/EmptyCommandLineHistoryTestFixture.cs +++ /dev/null @@ -1,46 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using ICSharpCode.RubyBinding; -using NUnit.Framework; - -namespace RubyBinding.Tests.Console -{ - /// - /// Tests the CommandLineHistory class. - /// - [TestFixture] - public class EmptyCommandLineHistoryTestFixture - { - CommandLineHistory history; - - [SetUp] - public void Init() - { - history = new CommandLineHistory(); - } - - [Test] - public void CurrentCommandLineIsNull() - { - Assert.IsNull(history.Current); - } - - [Test] - public void MoveNextReturnsFalse() - { - Assert.IsFalse(history.MoveNext()); - } - - [Test] - public void MovePreviousReturnsFalse() - { - Assert.IsFalse(history.MovePrevious()); - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/MockMemberProvider.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/MockMemberProvider.cs deleted file mode 100644 index aced5763aa..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/MockMemberProvider.cs +++ /dev/null @@ -1,80 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections.Generic; -using ICSharpCode.RubyBinding; - -namespace RubyBinding.Tests.Console -{ - public class MockMemberProvider : IMemberProvider - { - List memberNames = new List(); - string getMemberNamesParameter; - List globals = new List(); - string getGlobalsParameter; - Exception exceptionToThrow; - - public MockMemberProvider() - { - } - - /// - /// Exception that will be thrown if the GetMemberNames method or GetGlobals method is called. - /// - public Exception ExceptionToThrow { - get { return exceptionToThrow; } - set { exceptionToThrow = value; } - } - - public void SetMemberNames(string[] names) - { - memberNames.AddRange(names); - } - - public IList GetMemberNames(string name) - { - getMemberNamesParameter = name; - - if (exceptionToThrow != null) { - throw exceptionToThrow; - } - - return memberNames; - } - - public void SetGlobals(string[] names) - { - globals.AddRange(names); - } - - public IList GetGlobals(string name) - { - getGlobalsParameter = name; - - if (exceptionToThrow != null) { - throw exceptionToThrow; - } - - return globals; - } - - /// - /// Returns the parameter passed to the GetGlobals method. - /// - public string GetGlobalsParameter { - get { return getGlobalsParameter; } - } - - /// - /// Returns the parameter passed to the GetMemberNames method. - /// - public string GetMemberNamesParameter { - get { return getMemberNamesParameter; } - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/OneItemCommandLineHistoryTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/OneItemCommandLineHistoryTestFixture.cs deleted file mode 100644 index 01c4b65f7f..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/OneItemCommandLineHistoryTestFixture.cs +++ /dev/null @@ -1,113 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using ICSharpCode.RubyBinding; -using NUnit.Framework; - -namespace RubyBinding.Tests.Console -{ - [TestFixture] - public class OneItemCommandLineHistoryTestFixture - { - CommandLineHistory history; - - [SetUp] - public void Init() - { - history = new CommandLineHistory(); - history.Add("a"); - } - - [Test] - public void Current() - { - Assert.AreEqual(null, history.Current); - } - - [Test] - public void MovePrevious() - { - Assert.IsTrue(history.MovePrevious()); - } - - [Test] - public void MovePreviousTwice() - { - history.MovePrevious(); - Assert.IsFalse(history.MovePrevious()); - } - - [Test] - public void MoveNextFails() - { - Assert.IsFalse(history.MoveNext()); - } - - [Test] - public void CurrentAfterMovePrevious() - { - history.MovePrevious(); - Assert.AreEqual("a", history.Current); - } - - [Test] - public void CurrentAfterMovePreviousTwice() - { - history.MovePrevious(); - history.MovePrevious(); - Assert.AreEqual("a", history.Current); - } - - [Test] - public void MovePreviousThenBack() - { - history.MovePrevious(); - Assert.IsFalse(history.MoveNext()); - } - - [Test] - public void CurrentAfterMovePreviousThenBack() - { - history.MovePrevious(); - history.MoveNext(); - Assert.AreEqual("a", history.Current); - } - - [Test] - public void CurrentAfterMovePreviousTwiceThenBack() - { - history.MovePrevious(); - history.MovePrevious(); - history.MoveNext(); - Assert.AreEqual("a", history.Current); - } - - [Test] - public void MoveNextTwiceThenBack() - { - history.MoveNext(); - history.MoveNext(); - Assert.IsTrue(history.MovePrevious()); - } - - [Test] - public void CurrentAfterMoveNextTwiceThenBack() - { - MoveNextTwiceThenBack(); - Assert.AreEqual("a", history.Current); - } - - [Test] - public void IgnoreSameCommandLineEntered() - { - history.Add("a"); - history.MovePrevious(); - Assert.IsFalse(history.MovePrevious()); - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/ThreadSafeRubyConsoleTextEditorTests.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/ThreadSafeRubyConsoleTextEditorTests.cs index f00304b20b..8513df89e3 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/ThreadSafeRubyConsoleTextEditorTests.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Console/ThreadSafeRubyConsoleTextEditorTests.cs @@ -9,9 +9,11 @@ using System; using System.Collections.Generic; using System.Threading; using System.Windows.Input; + using ICSharpCode.AvalonEdit; using ICSharpCode.AvalonEdit.Editing; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils.Tests; using NUnit.Framework; using RubyBinding.Tests.Utils; using RubyBinding.Tests.Utils.Tests; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Converter/ConvertCSharpToRubyMenuCommandTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Converter/ConvertCSharpToRubyMenuCommandTestFixture.cs index 4020b972d2..0f4bd37014 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Converter/ConvertCSharpToRubyMenuCommandTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Converter/ConvertCSharpToRubyMenuCommandTestFixture.cs @@ -7,8 +7,9 @@ using System; using ICSharpCode.Core; -using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; +using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Converter/ConvertToRubyProjectCommandTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Converter/ConvertToRubyProjectCommandTestFixture.cs index 223a1f6ce5..596811fd14 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Converter/ConvertToRubyProjectCommandTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Converter/ConvertToRubyProjectCommandTestFixture.cs @@ -9,9 +9,11 @@ using System; using System.Collections.Generic; using System.IO; using System.Text; + using ICSharpCode.Core; using ICSharpCode.NRefactory; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Project; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Converter/ConvertVBNetToRubyMenuCommandTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Converter/ConvertVBNetToRubyMenuCommandTestFixture.cs index c2ca74e109..eada7da1e6 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Converter/ConvertVBNetToRubyMenuCommandTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Converter/ConvertVBNetToRubyMenuCommandTestFixture.cs @@ -7,8 +7,9 @@ using System; using ICSharpCode.Core; -using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; +using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/AppendNullPropertyValueTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/AppendNullPropertyValueTestFixture.cs index 3e47bab940..6dbc994d86 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/AppendNullPropertyValueTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/AppendNullPropertyValueTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; @@ -55,7 +57,7 @@ namespace RubyBinding.Tests.Designer public void GeneratedCode() { string expectedCode = - "@userControl1 = RubyBinding::Tests::Utils::NullPropertyUserControl.new()\r\n" + + "@userControl1 = ICSharpCode::Scripting::Tests::Utils::NullPropertyUserControl.new()\r\n" + "self.SuspendLayout()\r\n" + "# \r\n" + "# userControl1\r\n" + diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/CallBeginInitOnLoadTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/CallBeginInitOnLoadTestFixture.cs index 9ead6b7805..21fb3775ac 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/CallBeginInitOnLoadTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/CallBeginInitOnLoadTestFixture.cs @@ -8,7 +8,9 @@ using System; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/DeserializeAssignmentTestFixtureBase.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/DeserializeAssignmentTestFixtureBase.cs index d3445dcaf8..ca8ff70615 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/DeserializeAssignmentTestFixtureBase.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/DeserializeAssignmentTestFixtureBase.cs @@ -10,7 +10,9 @@ using System.ComponentModel; using System.ComponentModel.Design; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using IronRuby.Compiler.Ast; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/DeserializeConstructorStringArrayTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/DeserializeConstructorStringArrayTestFixture.cs index 27bf4ddf3d..85705f851b 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/DeserializeConstructorStringArrayTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/DeserializeConstructorStringArrayTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel; using System.ComponentModel.Design; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using IronRuby.Compiler.Ast; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/DeserializeLocalVariableTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/DeserializeLocalVariableTestFixture.cs index 45822513a0..61d00a2d78 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/DeserializeLocalVariableTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/DeserializeLocalVariableTestFixture.cs @@ -10,7 +10,9 @@ using System.ComponentModel; using System.ComponentModel.Design; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using IronRuby.Compiler.Ast; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/DeserializeMethodParametersTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/DeserializeMethodParametersTestFixture.cs index 14c001c949..6d6082d28d 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/DeserializeMethodParametersTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/DeserializeMethodParametersTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel; using System.ComponentModel.Design; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using IronRuby.Compiler.Ast; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/EventHandlerAlreadyExistsTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/EventHandlerAlreadyExistsTestFixture.cs index b4860722b1..386eae60e0 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/EventHandlerAlreadyExistsTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/EventHandlerAlreadyExistsTestFixture.cs @@ -6,8 +6,9 @@ // using System; -using ICSharpCode.RubyBinding; using ICSharpCode.FormsDesigner; +using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/EventHandlerExistsWithIncorrectParameterCountTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/EventHandlerExistsWithIncorrectParameterCountTestFixture.cs index 7381c062ff..f0b473d451 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/EventHandlerExistsWithIncorrectParameterCountTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/EventHandlerExistsWithIncorrectParameterCountTestFixture.cs @@ -6,8 +6,9 @@ // using System; -using ICSharpCode.RubyBinding; using ICSharpCode.FormsDesigner; +using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/FormsDesignerDisplayBindingTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/FormsDesignerDisplayBindingTestFixture.cs index c6ccc33c46..00d57111b9 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/FormsDesignerDisplayBindingTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/FormsDesignerDisplayBindingTestFixture.cs @@ -9,6 +9,7 @@ using System; using ICSharpCode.Core; using ICSharpCode.FormsDesigner; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Gui; using NUnit.Framework; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateAcceptButtonTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateAcceptButtonTestFixture.cs index bf80561404..130b0e6ac1 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateAcceptButtonTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateAcceptButtonTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateAccessibleRoleFormTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateAccessibleRoleFormTestFixture.cs index e481ed63ed..123283d824 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateAccessibleRoleFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateAccessibleRoleFormTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateAutoScrollFormTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateAutoScrollFormTestFixture.cs index c58068a87d..19d72b6c8a 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateAutoScrollFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateAutoScrollFormTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateButtonFlatAppearanceTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateButtonFlatAppearanceTestFixture.cs index 082e0d784d..3db2d4d5e9 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateButtonFlatAppearanceTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateButtonFlatAppearanceTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateComboBoxItemsTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateComboBoxItemsTestFixture.cs index 9addfc86c6..5c3a5cbaaf 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateComboBoxItemsTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateComboBoxItemsTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateContextMenuStripTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateContextMenuStripTestFixture.cs index 42be1c1a84..014e466a48 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateContextMenuStripTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateContextMenuStripTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateCursorFormTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateCursorFormTestFixture.cs index d5b3ce94a6..3ac594d2bd 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateCursorFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateCursorFormTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateCustomCollectionItemsTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateCustomCollectionItemsTestFixture.cs index fbf3a4f8a1..552e5bae7c 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateCustomCollectionItemsTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateCustomCollectionItemsTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; @@ -69,18 +71,18 @@ namespace RubyBinding.Tests.Designer [Test] public void GeneratedCode() { - string expectedCode = " fooItem1 = RubyBinding::Tests::Utils::FooItem.new()\r\n" + - " fooItem2 = RubyBinding::Tests::Utils::FooItem.new()\r\n" + - " barItem1 = RubyBinding::Tests::Utils::BarItem.new()\r\n" + - " barItem2 = RubyBinding::Tests::Utils::BarItem.new()\r\n" + - " @userControl1 = RubyBinding::Tests::Utils::CustomUserControl.new()\r\n" + + string expectedCode = " fooItem1 = ICSharpCode::Scripting::Tests::Utils::FooItem.new()\r\n" + + " fooItem2 = ICSharpCode::Scripting::Tests::Utils::FooItem.new()\r\n" + + " barItem1 = ICSharpCode::Scripting::Tests::Utils::BarItem.new()\r\n" + + " barItem2 = ICSharpCode::Scripting::Tests::Utils::BarItem.new()\r\n" + + " @userControl1 = ICSharpCode::Scripting::Tests::Utils::CustomUserControl.new()\r\n" + " self.SuspendLayout()\r\n" + " # \r\n" + " # userControl1\r\n" + " # \r\n" + " fooItem1.Text = \"aa\"\r\n" + " fooItem2.Text = \"bb\"\r\n" + - " @userControl1.FooItems.AddRange(System::Array[RubyBinding::Tests::Utils::FooItem].new(\r\n" + + " @userControl1.FooItems.AddRange(System::Array[ICSharpCode::Scripting::Tests::Utils::FooItem].new(\r\n" + " [fooItem1,\r\n" + " fooItem2]))\r\n" + " @userControl1.Location = System::Drawing::Point.new(0, 0)\r\n" + @@ -90,7 +92,7 @@ namespace RubyBinding.Tests.Designer " # \r\n" + " barItem1.Text = \"cc\"\r\n" + " barItem2.Text = \"dd\"\r\n" + - " @userControl1.ParentComponent.ParentBarItems.AddRange(System::Array[RubyBinding::Tests::Utils::BarItem].new(\r\n" + + " @userControl1.ParentComponent.ParentBarItems.AddRange(System::Array[ICSharpCode::Scripting::Tests::Utils::BarItem].new(\r\n" + " [barItem1,\r\n" + " barItem2]))\r\n" + " @userControl1.Size = System::Drawing::Size.new(200, 100)\r\n" + diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateDataSetTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateDataSetTestFixture.cs index 12b94e7aca..2546942616 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateDataSetTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateDataSetTestFixture.cs @@ -13,7 +13,9 @@ using System.ComponentModel.Design.Serialization; using System.Data; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateEventHandlerFormTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateEventHandlerFormTestFixture.cs index 33fc311102..51640288d2 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateEventHandlerFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateEventHandlerFormTestFixture.cs @@ -14,7 +14,9 @@ using System.Drawing; using System.Globalization; using System.Reflection; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFolderBrowserDialogRootFolderTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFolderBrowserDialogRootFolderTestFixture.cs index 872e67ecea..5bd70b8ced 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFolderBrowserDialogRootFolderTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFolderBrowserDialogRootFolderTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFormColorTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFormColorTestFixture.cs index 9e5556824a..1b7a19100a 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFormColorTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFormColorTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFormLocationTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFormLocationTestFixture.cs index 46dc52f2a4..81001e90f9 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFormLocationTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFormLocationTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFormPaddingTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFormPaddingTestFixture.cs index 029490369a..1d0724ab61 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFormPaddingTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFormPaddingTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFormResourceTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFormResourceTestFixture.cs index 7c9a06e6be..0921c103af 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFormResourceTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateFormResourceTestFixture.cs @@ -13,7 +13,9 @@ using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Globalization; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateImageListResourceTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateImageListResourceTestFixture.cs index 2b47ad28ca..c77c084526 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateImageListResourceTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateImageListResourceTestFixture.cs @@ -13,7 +13,9 @@ using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Globalization; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateInheritedToolTipTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateInheritedToolTipTestFixture.cs index 8ef9af0fbf..63193b07c3 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateInheritedToolTipTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateInheritedToolTipTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateListViewGroupsTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateListViewGroupsTestFixture.cs index 14eb025703..6bc5dfebb2 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateListViewGroupsTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateListViewGroupsTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateListViewItemTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateListViewItemTestFixture.cs index 449539ccbc..b2fd976990 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateListViewItemTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateListViewItemTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateListViewSubItemsTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateListViewSubItemsTestFixture.cs index 0cc0f2456b..1468474cd3 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateListViewSubItemsTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateListViewSubItemsTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateListViewWithImageListFormTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateListViewWithImageListFormTestFixture.cs index 89deef404a..f5bbcc550a 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateListViewWithImageListFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateListViewWithImageListFormTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateLocalImageResourceTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateLocalImageResourceTestFixture.cs index 471217ee87..afeae8f592 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateLocalImageResourceTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateLocalImageResourceTestFixture.cs @@ -13,7 +13,9 @@ using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Globalization; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateMenuStripFormTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateMenuStripFormTestFixture.cs index faef5e45c9..f478653e5f 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateMenuStripFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateMenuStripFormTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateMenuStripItemsFormTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateMenuStripItemsFormTestFixture.cs index e9544d127f..fca5b300ae 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateMenuStripItemsFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateMenuStripItemsFormTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateMonthCalendarTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateMonthCalendarTestFixture.cs index dbd18432d4..f8a927e37c 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateMonthCalendarTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateMonthCalendarTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GeneratePanelFormTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GeneratePanelFormTestFixture.cs index 7bb3610cc1..0eb799bc8b 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GeneratePanelFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GeneratePanelFormTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateTableLayoutPanelTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateTableLayoutPanelTestFixture.cs index 9038470409..3ff1d03ac3 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateTableLayoutPanelTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateTableLayoutPanelTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateToolTipFormTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateToolTipFormTestFixture.cs index 7134e12fba..1f07acf7e8 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateToolTipFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateToolTipFormTestFixture.cs @@ -11,7 +11,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateTreeViewTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateTreeViewTestFixture.cs index 5b096fad66..401ee65d3b 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateTreeViewTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GenerateTreeViewTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GeneratorMergeFindsInitializeComponentsTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GeneratorMergeFindsInitializeComponentsTestFixture.cs index 2cb1d70536..fe7a9a3b8e 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GeneratorMergeFindsInitializeComponentsTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GeneratorMergeFindsInitializeComponentsTestFixture.cs @@ -15,8 +15,9 @@ using System.Drawing; using System.IO; using System.Windows.Forms; -using ICSharpCode.RubyBinding; using ICSharpCode.FormsDesigner; +using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GetComponentFromDesignerLoaderTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GetComponentFromDesignerLoaderTestFixture.cs index d4a458d127..e019f486b6 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GetComponentFromDesignerLoaderTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GetComponentFromDesignerLoaderTestFixture.cs @@ -9,7 +9,9 @@ using System; using System.ComponentModel; using System.ComponentModel.Design.Serialization; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GetInstanceFromDesignerLoaderTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GetInstanceFromDesignerLoaderTestFixture.cs index 39a5949e5a..6fd4eb9ee8 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GetInstanceFromDesignerLoaderTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GetInstanceFromDesignerLoaderTestFixture.cs @@ -9,7 +9,9 @@ using System; using System.ComponentModel; using System.ComponentModel.Design.Serialization; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GetResourcesFromDesignerLoaderTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GetResourcesFromDesignerLoaderTestFixture.cs index 15969e6947..cdbf11a713 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GetResourcesFromDesignerLoaderTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/GetResourcesFromDesignerLoaderTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design.Serialization; using System.Globalization; using System.Resources; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/InsertEventHandlerTestFixtureBase.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/InsertEventHandlerTestFixtureBase.cs index 2b5dcb1709..129070a6e1 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/InsertEventHandlerTestFixtureBase.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/InsertEventHandlerTestFixtureBase.cs @@ -6,8 +6,9 @@ // using System; -using ICSharpCode.RubyBinding; using ICSharpCode.FormsDesigner; +using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/InsertEventHandlerWithSpaceIndentTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/InsertEventHandlerWithSpaceIndentTestFixture.cs index f05b8ff673..20e5e66d12 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/InsertEventHandlerWithSpaceIndentTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/InsertEventHandlerWithSpaceIndentTestFixture.cs @@ -6,8 +6,9 @@ // using System; -using ICSharpCode.RubyBinding; using ICSharpCode.FormsDesigner; +using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/InsertNewEventHandlerTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/InsertNewEventHandlerTestFixture.cs index 3329e07fe0..e60cf5f57c 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/InsertNewEventHandlerTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/InsertNewEventHandlerTestFixture.cs @@ -6,8 +6,9 @@ // using System; -using ICSharpCode.RubyBinding; using ICSharpCode.FormsDesigner; +using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/InsertSecondEventHandlerTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/InsertSecondEventHandlerTestFixture.cs index 8de6248ce7..324206acd1 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/InsertSecondEventHandlerTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/InsertSecondEventHandlerTestFixture.cs @@ -6,8 +6,9 @@ // using System; -using ICSharpCode.RubyBinding; using ICSharpCode.FormsDesigner; +using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadBindingNavigatorTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadBindingNavigatorTestFixture.cs index e983dfb3cc..60c93b3e48 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadBindingNavigatorTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadBindingNavigatorTestFixture.cs @@ -16,6 +16,7 @@ using System.Resources; using System.Windows.Forms; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadControlEventHandlerTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadControlEventHandlerTestFixture.cs index a703d457be..c4be29cf05 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadControlEventHandlerTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadControlEventHandlerTestFixture.cs @@ -14,6 +14,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadEventHandlerTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadEventHandlerTestFixture.cs index dbdd4fe0ae..1f76454b57 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadEventHandlerTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadEventHandlerTestFixture.cs @@ -14,6 +14,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadFormTestFixtureBase.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadFormTestFixtureBase.cs index 54eeaa529e..2934db831e 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadFormTestFixtureBase.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadFormTestFixtureBase.cs @@ -11,6 +11,7 @@ using System.Reflection; using System.Windows.Forms; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadFormWithStatementsBeforeFormTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadFormWithStatementsBeforeFormTestFixture.cs index 08611d502f..5728b36d75 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadFormWithStatementsBeforeFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadFormWithStatementsBeforeFormTestFixture.cs @@ -13,6 +13,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadLocalImageResourceTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadLocalImageResourceTestFixture.cs index 19e2b2762c..c9216c6975 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadLocalImageResourceTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadLocalImageResourceTestFixture.cs @@ -16,6 +16,7 @@ using System.Resources; using System.Windows.Forms; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadLocalVariablePropertyAssignmentTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadLocalVariablePropertyAssignmentTestFixture.cs index d6929de1b5..8ca4f24b8a 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadLocalVariablePropertyAssignmentTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadLocalVariablePropertyAssignmentTestFixture.cs @@ -12,6 +12,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadSimpleFormTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadSimpleFormTestFixture.cs index f86bf70d4d..54771d3c1f 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadSimpleFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadSimpleFormTestFixture.cs @@ -12,6 +12,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadSimpleUserControlTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadSimpleUserControlTestFixture.cs index cc36086631..9f8c9f732e 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadSimpleUserControlTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadSimpleUserControlTestFixture.cs @@ -12,6 +12,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadTextBoxTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadTextBoxTestFixture.cs index 72fc19e697..c68ec1e123 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadTextBoxTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadTextBoxTestFixture.cs @@ -13,6 +13,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadTimerTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadTimerTestFixture.cs index eda50359c0..e61c5c76a4 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadTimerTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadTimerTestFixture.cs @@ -12,6 +12,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadTreeViewTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadTreeViewTestFixture.cs index 35fba90b2c..30e1183bca 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadTreeViewTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadTreeViewTestFixture.cs @@ -13,6 +13,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadUserControlWithDoublePropertyTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadUserControlWithDoublePropertyTestFixture.cs index c3cd6ae447..dcb7f4700e 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadUserControlWithDoublePropertyTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/LoadUserControlWithDoublePropertyTestFixture.cs @@ -12,6 +12,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; @@ -31,7 +32,7 @@ namespace RubyBinding.Tests.Designer return "class MainForm < System::Windows::Forms::Form\r\n" + " def InitializeComponent()\r\n" + - " @userControl = RubyBinding::Tests::Utils::DoublePropertyUserControl.new()\r\n" + + " @userControl = ICSharpCode::Scripting::Tests::Utils::DoublePropertyUserControl.new()\r\n" + " self.SuspendLayout()\r\n" + " # \r\n" + " # userControl1\r\n" + diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/MergeFormTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/MergeFormTestFixture.cs index 27805d2fac..0a973cb648 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/MergeFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/MergeFormTestFixture.cs @@ -14,14 +14,15 @@ using System.Drawing; using System.IO; using System.Windows.Forms; -using AvalonEdit = ICSharpCode.AvalonEdit; using ICSharpCode.AvalonEdit.Document; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Editor.AvalonEdit; using ICSharpCode.SharpDevelop.Refactoring; using NUnit.Framework; using RubyBinding.Tests.Utils; +using AvalonEdit = ICSharpCode.AvalonEdit; namespace RubyBinding.Tests.Designer { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/MissingInitializeComponentMethodTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/MissingInitializeComponentMethodTestFixture.cs index 2d9d22f80a..e180d1336d 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/MissingInitializeComponentMethodTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/MissingInitializeComponentMethodTestFixture.cs @@ -16,6 +16,7 @@ using System.Resources; using System.Windows.Forms; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting; using IronRuby.Compiler.Ast; using Microsoft.Scripting; using NUnit.Framework; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/NameCreationServiceTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/NameCreationServiceTestFixture.cs index 5df8f7845b..46a250c884 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/NameCreationServiceTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/NameCreationServiceTestFixture.cs @@ -8,7 +8,9 @@ using System; using System.ComponentModel.Design.Serialization; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/NoNewLineAfterInitializeComponentMethodTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/NoNewLineAfterInitializeComponentMethodTestFixture.cs index b0b6b5d6ac..da8fa39768 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/NoNewLineAfterInitializeComponentMethodTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/NoNewLineAfterInitializeComponentMethodTestFixture.cs @@ -14,15 +14,16 @@ using System.Drawing; using System.IO; using System.Windows.Forms; -using AvalonEdit = ICSharpCode.AvalonEdit; using ICSharpCode.AvalonEdit.Document; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Editor.AvalonEdit; using ICSharpCode.SharpDevelop.Refactoring; using NUnit.Framework; using RubyBinding.Tests.Utils; +using AvalonEdit = ICSharpCode.AvalonEdit; namespace RubyBinding.Tests.Designer { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/OneCompatibleMethodTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/OneCompatibleMethodTestFixture.cs index 004b73ffd3..78876b3b7e 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/OneCompatibleMethodTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/OneCompatibleMethodTestFixture.cs @@ -10,7 +10,9 @@ using System.CodeDom; using System.CodeDom.Compiler; using System.Collections; using System.IO; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/ProjectRootNamespacePassedToMergeTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/ProjectRootNamespacePassedToMergeTestFixture.cs index 7915a6dbfd..214fe364a6 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/ProjectRootNamespacePassedToMergeTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/ProjectRootNamespacePassedToMergeTestFixture.cs @@ -14,15 +14,16 @@ using System.Drawing; using System.IO; using System.Windows.Forms; -using AvalonEdit = ICSharpCode.AvalonEdit; using ICSharpCode.AvalonEdit.Document; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Editor.AvalonEdit; using ICSharpCode.SharpDevelop.Refactoring; using NUnit.Framework; using RubyBinding.Tests.Utils; +using AvalonEdit = ICSharpCode.AvalonEdit; namespace RubyBinding.Tests.Designer { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/RemoveMainMenuStripFromFormTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/RemoveMainMenuStripFromFormTestFixture.cs index 6ceb65942b..a07874ed71 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/RemoveMainMenuStripFromFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/RemoveMainMenuStripFromFormTestFixture.cs @@ -12,7 +12,9 @@ using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/RubyCodeDeserializerTests.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/RubyCodeDeserializerTests.cs index 4be6f575a9..076fb83932 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/RubyCodeDeserializerTests.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/RubyCodeDeserializerTests.cs @@ -11,6 +11,7 @@ using System.Drawing; using System.Windows.Forms; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using IronRuby.Compiler.Ast; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/RubyControlFieldExpressionTests.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/RubyControlFieldExpressionTests.cs index bab001b957..99975d93e0 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/RubyControlFieldExpressionTests.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/RubyControlFieldExpressionTests.cs @@ -8,7 +8,9 @@ using System; using System.ComponentModel; using System.Windows.Forms; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using IronRuby.Compiler.Ast; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/RubyDesignerLoaderTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/RubyDesignerLoaderTestFixture.cs index e5a7604b78..1c6dddd92b 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/RubyDesignerLoaderTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/RubyDesignerLoaderTestFixture.cs @@ -18,6 +18,7 @@ using System.Windows.Forms; using ICSharpCode.FormsDesigner; using ICSharpCode.FormsDesigner.Services; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/TextBoxNotAddedToFormTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/TextBoxNotAddedToFormTestFixture.cs index a3ec6148af..1fe00849fa 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/TextBoxNotAddedToFormTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/TextBoxNotAddedToFormTestFixture.cs @@ -13,6 +13,7 @@ using System.IO; using System.Windows.Forms; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/TextEditorIndentPassedToGeneratorTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/TextEditorIndentPassedToGeneratorTestFixture.cs index ef1b127395..d7a9ff40a5 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/TextEditorIndentPassedToGeneratorTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/TextEditorIndentPassedToGeneratorTestFixture.cs @@ -16,6 +16,7 @@ using System.Windows.Forms; using ICSharpCode.FormsDesigner; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Editor; using NUnit.Framework; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/UnknownTypeTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/UnknownTypeTestFixture.cs index e22f8724af..c854c5a101 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/UnknownTypeTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Designer/UnknownTypeTestFixture.cs @@ -14,6 +14,7 @@ using System.Windows.Forms; using ICSharpCode.Core; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using IronRuby.Compiler.Ast; using Microsoft.Scripting; using NUnit.Framework; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/DebugRunRubyCommandTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/DebugRunRubyCommandTestFixture.cs index 6cbe6ce246..4bccfe5fe7 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/DebugRunRubyCommandTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/DebugRunRubyCommandTestFixture.cs @@ -8,10 +8,11 @@ using System; using System.Diagnostics; using ICSharpCode.Core; -using ICSharpCode.SharpDevelop.Debugging; using ICSharpCode.RubyBinding; -using RubyBinding.Tests.Utils; +using ICSharpCode.Scripting.Tests.Utils; +using ICSharpCode.SharpDevelop.Debugging; using NUnit.Framework; +using RubyBinding.Tests.Utils; namespace RubyBinding.Tests.Gui { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/RubyIndentationTests.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/RubyIndentationTests.cs index 2d94fc66c5..932702e86e 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/RubyIndentationTests.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/RubyIndentationTests.cs @@ -8,6 +8,7 @@ using System; using ICSharpCode.AvalonEdit; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Editor.AvalonEdit; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/RunRubyCommandTests.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/RunRubyCommandTests.cs index 0dc6be7cb1..c5970b8014 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/RunRubyCommandTests.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/RunRubyCommandTests.cs @@ -8,6 +8,7 @@ using System; using ICSharpCode.Core; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Gui; using NUnit.Framework; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/SendLineToRubyConsoleCommandTests.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/SendLineToRubyConsoleCommandTests.cs index 5ce0bdb5de..af7727b471 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/SendLineToRubyConsoleCommandTests.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/SendLineToRubyConsoleCommandTests.cs @@ -7,6 +7,7 @@ using System; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using NUnit.Framework; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Parsing/RubyParserTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Parsing/RubyParserTestFixture.cs index e64d321da4..733dd437b9 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Parsing/RubyParserTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Parsing/RubyParserTestFixture.cs @@ -7,8 +7,8 @@ using System; using System.IO; - using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Internal.Templates; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyBinding.Tests.csproj b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyBinding.Tests.csproj index e903cce751..13ad0fa770 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyBinding.Tests.csproj @@ -73,13 +73,9 @@ - - - - @@ -322,8 +318,6 @@ - - @@ -333,67 +327,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - RubyBinding.addin @@ -445,6 +400,14 @@ {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} FormsDesigner + + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD} + ICSharpCode.Scripting + + + {85C09AD8-183B-403A-869A-7226646218A9} + ICSharpCode.Scripting.Tests + {C896FFFF-5B6C-4B0E-B6DF-049865F501B4} RubyBinding diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/CreateTextWriterFromCreateTextWriterInfoTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/CreateTextWriterFromCreateTextWriterInfoTestFixture.cs deleted file mode 100644 index 10d11f7ed8..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/CreateTextWriterFromCreateTextWriterInfoTestFixture.cs +++ /dev/null @@ -1,41 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.IO; -using System.Text; -using ICSharpCode.RubyBinding; -using NUnit.Framework; - -namespace RubyBinding.Tests.Testing -{ - [TestFixture] - public class CreateTextWriterFromCreateTextWriterInfoTestFixture - { - TextWriter textWriter; - - [TestFixtureSetUp] - public void SetUpFixture() - { - string fileName = Path.GetTempFileName(); - CreateTextWriterInfo info = new CreateTextWriterInfo(fileName, Encoding.UTF8, false); - textWriter = info.CreateTextWriter(); - } - - [TestFixtureTearDown] - public void TearDownFixture() - { - textWriter.Dispose(); - } - - [Test] - public void CreatedTextWriterEncodingIsUtf8() - { - Assert.AreEqual(Encoding.UTF8, textWriter.Encoding); - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/CreateTextWriterInfoEqualsTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/CreateTextWriterInfoEqualsTestFixture.cs deleted file mode 100644 index 039456c2ee..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/CreateTextWriterInfoEqualsTestFixture.cs +++ /dev/null @@ -1,57 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Text; -using ICSharpCode.RubyBinding; -using NUnit.Framework; - -namespace RubyBinding.Tests.Testing -{ - [TestFixture] - public class CreateTextWriterInfoEqualsTestFixture - { - [Test] - public void CreateTextWriterInfosAreEqualWhenFileNameAndEncodingAndAppendAreEqual() - { - CreateTextWriterInfo lhs = new CreateTextWriterInfo("test.txt", Encoding.UTF8, true); - CreateTextWriterInfo rhs = new CreateTextWriterInfo("test.txt", Encoding.UTF8, true); - Assert.AreEqual(lhs, rhs); - } - - [Test] - public void CreateTextWriterInfosAreNotEqualWhenFileNamesAreDifferent() - { - CreateTextWriterInfo lhs = new CreateTextWriterInfo("test.txt", Encoding.UTF8, true); - CreateTextWriterInfo rhs = new CreateTextWriterInfo("different-filename.txt", Encoding.UTF8, true); - Assert.AreNotEqual(lhs, rhs); - } - - [Test] - public void CreateTextWriterInfosAreNotEqualWhenEncodingsAreDifferent() - { - CreateTextWriterInfo lhs = new CreateTextWriterInfo("test.txt", Encoding.UTF8, true); - CreateTextWriterInfo rhs = new CreateTextWriterInfo("test.txt", Encoding.ASCII, true); - Assert.AreNotEqual(lhs, rhs); - } - - [Test] - public void CreateTextWriterInfosAreNotEqualWhenAppendIsDifferent() - { - CreateTextWriterInfo lhs = new CreateTextWriterInfo("test.txt", Encoding.UTF8, true); - CreateTextWriterInfo rhs = new CreateTextWriterInfo("test.txt", Encoding.UTF8, false); - Assert.AreNotEqual(lhs, rhs); - } - - [Test] - public void CreateTextWriterInfoEqualsReturnsFalseWhenNullPassedAsParameter() - { - CreateTextWriterInfo lhs = new CreateTextWriterInfo("test.txt", Encoding.UTF8, true); - Assert.IsFalse(lhs.Equals(null)); - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyTestFrameworkIsTestProjectTests.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyTestFrameworkIsTestProjectTests.cs index 5aee8115ba..745fe9706f 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyTestFrameworkIsTestProjectTests.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyTestFrameworkIsTestProjectTests.cs @@ -7,6 +7,7 @@ using System; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Internal.Templates; using ICSharpCode.SharpDevelop.Project; using NUnit.Framework; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/AddInHelper.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/AddInHelper.cs deleted file mode 100644 index 31876a870e..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/AddInHelper.cs +++ /dev/null @@ -1,46 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections.Generic; -using ICSharpCode.Core; -using ICSharpCode.SharpDevelop; - -namespace RubyBinding.Tests.Utils -{ - public class AddInHelper - { - AddInHelper() - { - } - - /// - /// Gets the codon with the specified extension path and name. - /// - public static Codon GetCodon(AddIn addin, string extensionPath, string name) - { - if (addin.Paths.ContainsKey(extensionPath)) { - ExtensionPath path = addin.Paths[extensionPath]; - return GetCodon(path.Codons, name); - } - return null; - } - - /// - /// Gets the codon with the specified name. - /// - public static Codon GetCodon(IEnumerable codons, string name) - { - foreach (Codon codon in codons) { - if (codon.Id == name) { - return codon; - } - } - return null; - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/BarItemCollection.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/BarItemCollection.cs deleted file mode 100644 index 9cd3d23e48..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/BarItemCollection.cs +++ /dev/null @@ -1,58 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Windows.Forms; - -namespace RubyBinding.Tests.Utils -{ - public class BarItem - { - string text = String.Empty; - - public BarItem() - { - } - - public BarItem(string text) - { - this.text = text; - } - - public string Text { - get { return text; } - set { text = value; } - } - } - - public class BarItemCollection : Collection - { - public BarItemCollection() - { - } - - public void AddRange(BarItem[] items) - { - foreach (BarItem item in items) { - Add(item); - } - } - } - - public class BarItemCollectionParentComponent : Component - { - BarItemCollection barItems = new BarItemCollection(); - - [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] - public BarItemCollection ParentBarItems { - get { return barItems; } - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/ConvertedFile.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/ConvertedFile.cs deleted file mode 100644 index c9d65e0b32..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/ConvertedFile.cs +++ /dev/null @@ -1,50 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Text; - -namespace RubyBinding.Tests.Utils -{ - /// - /// Stores the filename and the code for the converted file. - /// - public class ConvertedFile - { - public string FileName; - public string Text; - public Encoding Encoding; - - public ConvertedFile(string fileName, string text, Encoding encoding) - { - this.FileName = fileName; - this.Text = text; - this.Encoding = encoding; - } - - public override string ToString() - { - return "FileName: " + FileName + "\r\n" + - "Encoding: " + Encoding + "\r\n" + - "Text: " + Text; - } - - public override bool Equals(object obj) - { - ConvertedFile convertedFile = obj as ConvertedFile; - if (convertedFile != null) { - return FileName == convertedFile.FileName && Text == convertedFile.Text && Encoding == convertedFile.Encoding; - } - return false; - } - - public override int GetHashCode() - { - return FileName.GetHashCode(); - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/CreatedComponent.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/CreatedComponent.cs deleted file mode 100644 index ef775fc037..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/CreatedComponent.cs +++ /dev/null @@ -1,48 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.ComponentModel; - -namespace RubyBinding.Tests.Utils -{ - /// - /// Helper class that stores the component name and type. - /// - public class CreatedComponent - { - public CreatedComponent(string typeName, string name, IComponent component) - { - TypeName = typeName; - Name = name; - Component = component; - } - - public string TypeName { get; set; } - public string Name { get; set; } - public IComponent Component { get; set; } - - public override bool Equals(object obj) - { - CreatedComponent rhs = obj as CreatedComponent; - if (rhs != null) { - return TypeName == rhs.TypeName && Name == rhs.Name; - } - return base.Equals(obj); - } - - public override int GetHashCode() - { - return TypeName.GetHashCode() ^ Name.GetHashCode(); - } - - public override string ToString() - { - return "CreatedComponent [Type=" + TypeName + ", Name=" + Name + "]"; - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/CreatedInstance.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/CreatedInstance.cs deleted file mode 100644 index 2d221ef1a4..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/CreatedInstance.cs +++ /dev/null @@ -1,69 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections; -using System.Text; - -namespace RubyBinding.Tests.Utils -{ - /// - /// Helper class that stores the parameters passed when the IComponentCreator.CreateInstance method is called. - /// - public class CreatedInstance - { - public CreatedInstance(Type type, ICollection arguments, string name, bool addToContainer) - { - InstanceType = type; - Arguments = arguments; - Name = name; - AddToContainer = addToContainer; - } - - public Type InstanceType { get; set; } - public ICollection Arguments { get; set; } - public string Name { get; set; } - public bool AddToContainer { get; set; } - public object Object { get; set; } - - public override bool Equals(object obj) - { - CreatedInstance rhs = obj as CreatedInstance; - if (rhs != null) { - return ToString() == rhs.ToString(); - } - return base.Equals(obj); - } - - public override int GetHashCode() - { - return InstanceType.GetHashCode(); - } - - public override string ToString() - { - return "CreatedInstance [Type=" + InstanceType + ", Name=" + Name + ArgsToString() + "]"; - } - - string ArgsToString() - { - StringBuilder s = new StringBuilder(); - s.Append("[Args="); - - bool firstArg = true; - foreach (object o in Arguments) { - if (!firstArg) { - s.Append(", "); - } - s.Append(o); - firstArg = false; - } - s.Append("]"); - return s.ToString(); - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/CustomUserControl.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/CustomUserControl.cs deleted file mode 100644 index 63065e04b4..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/CustomUserControl.cs +++ /dev/null @@ -1,33 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.ComponentModel; -using System.Windows.Forms; - -namespace RubyBinding.Tests.Utils -{ - public class CustomUserControl : UserControl - { - FooItemCollection fooItems = new FooItemCollection(); - BarItemCollectionParentComponent component = new BarItemCollectionParentComponent(); - - public CustomUserControl() - { - } - - [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] - public FooItemCollection FooItems { - get { return fooItems; } - } - - [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] - public BarItemCollectionParentComponent ParentComponent { - get { return component; } - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/DerivedConvertProjectToRubyProjectCommand.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/DerivedConvertProjectToRubyProjectCommand.cs index c44eee14d0..95ae9aabf3 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/DerivedConvertProjectToRubyProjectCommand.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/DerivedConvertProjectToRubyProjectCommand.cs @@ -8,8 +8,10 @@ using System; using System.Collections.Generic; using System.Text; + using ICSharpCode.Core; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Project; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/DerivedFormDesignerViewContent.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/DerivedFormDesignerViewContent.cs deleted file mode 100644 index 93cd50f2e0..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/DerivedFormDesignerViewContent.cs +++ /dev/null @@ -1,40 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using ICSharpCode.FormsDesigner; -using ICSharpCode.RubyBinding; -using ICSharpCode.SharpDevelop.Gui; - -namespace RubyBinding.Tests.Utils -{ - /// - /// Derived FormDesignerViewContent class that is used for - /// unit testing the RubyDesignerGenerator. - /// - public class DerivedFormDesignerViewContent : FormsDesignerViewContent - { - bool mergeFormChangesCalled; - - public DerivedFormDesignerViewContent(IViewContent view, ICSharpCode.SharpDevelop.OpenedFile mockFile) - : base(view, mockFile) - { - } - - public override void MergeFormChanges() - { - mergeFormChangesCalled = true; - } - - /// - /// Gets whether the MergeFormChanges method was called. - /// - public bool MergeFormChangesCalled { - get { return mergeFormChangesCalled; } - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/DerivedRubyDesignerGenerator.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/DerivedRubyDesignerGenerator.cs index 637d349174..0612dd345d 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/DerivedRubyDesignerGenerator.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/DerivedRubyDesignerGenerator.cs @@ -14,9 +14,10 @@ using System.Reflection; using ICSharpCode.FormsDesigner; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Editor; +using ICSharpCode.SharpDevelop.Gui; namespace RubyBinding.Tests.Utils { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/DerivedToolStripMenuItem.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/DerivedToolStripMenuItem.cs deleted file mode 100644 index 2b80cf7460..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/DerivedToolStripMenuItem.cs +++ /dev/null @@ -1,19 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Windows.Forms; - -namespace RubyBinding.Tests.Utils -{ - public class DerivedToolStripMenuItem : ToolStripMenuItem - { - public DerivedToolStripMenuItem() : base() - { - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/FakeCaret.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/FakeCaret.cs deleted file mode 100644 index 2ddf7d4052..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/FakeCaret.cs +++ /dev/null @@ -1,53 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using ICSharpCode.SharpDevelop.Editor; - -namespace RubyBinding.Tests.Utils -{ - public class FakeCaret : ITextEditorCaret - { - public event EventHandler PositionChanged; - - protected virtual void OnPositionChanged(EventArgs e) - { - if (PositionChanged != null) { - PositionChanged(this, e); - } - } - - public int Offset { - get { - throw new NotImplementedException(); - } - set { - throw new NotImplementedException(); - } - } - - public int Line { get; set; } - - public int Column { - get { - throw new NotImplementedException(); - } - set { - throw new NotImplementedException(); - } - } - - public ICSharpCode.NRefactory.Location Position { - get { - throw new NotImplementedException(); - } - set { - throw new NotImplementedException(); - } - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/FakeDocumentLine.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/FakeDocumentLine.cs deleted file mode 100644 index 2472c5d6e8..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/FakeDocumentLine.cs +++ /dev/null @@ -1,23 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using ICSharpCode.SharpDevelop.Editor; - -namespace RubyBinding.Tests.Utils -{ - public class FakeDocumentLine : IDocumentLine - { - public int Offset { get; set; } - public int Length { get; set; } - public int EndOffset { get; set; } - public int TotalLength { get; set; } - public int DelimiterLength { get; set; } - public int LineNumber { get; set; } - public string Text { get; set; } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/FakeLock.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/FakeLock.cs deleted file mode 100644 index bba884a3c3..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/FakeLock.cs +++ /dev/null @@ -1,33 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections.Generic; -using ICSharpCode.RubyBinding; - -namespace RubyBinding.Tests.Utils -{ - public class FakeLock : ILock - { - public List Lines; - public bool IsDisposed; - public int UnreadLineCountWhenLockCreated = -1; - public int UnreadLineCountWhenLockDisposed = -1; - - public FakeLock(List lines) - { - this.Lines = lines; - UnreadLineCountWhenLockCreated = lines.Count; - } - - public void Dispose() - { - UnreadLineCountWhenLockDisposed = Lines.Count; - IsDisposed = true; - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/FooItemCollection.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/FooItemCollection.cs deleted file mode 100644 index 7e5b9c3a1c..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/FooItemCollection.cs +++ /dev/null @@ -1,58 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Windows.Forms; - -namespace RubyBinding.Tests.Utils -{ - public class FooItem - { - string text = String.Empty; - - public FooItem() - { - } - - public FooItem(string text) - { - this.text = text; - } - - public string Text { - get { return text; } - set { text = value; } - } - } - - public class FooItemCollection : Collection - { - public FooItemCollection() - { - } - - public void AddRange(FooItem[] items) - { - foreach (FooItem item in items) { - Add(item); - } - } - } - - public class FooItemCollectionParentComponent : Component - { - FooItemCollection fooItems = new FooItemCollection(); - - [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] - public FooItemCollection ParentFooItems { - get { return fooItems; } - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockComponentCreator.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockComponentCreator.cs deleted file mode 100644 index 50fec8fd7d..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockComponentCreator.cs +++ /dev/null @@ -1,251 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections; -using System.Collections.Generic; -using System.ComponentModel; -using System.ComponentModel.Design.Serialization; -using System.Globalization; -using System.Drawing; -using System.Reflection; -using System.Resources; -using System.Windows.Forms; -using ICSharpCode.RubyBinding; - -namespace RubyBinding.Tests.Utils -{ - public class MockComponentCreator : IComponentCreator - { - List createdComponents = new List(); - List createdInstances = new List(); - List addedComponents = new List(); - List typeNames = new List(); - PropertyDescriptor propertyDescriptor; - EventDescriptor eventDescriptor; - IComponent rootComponent; - bool getResourceReaderCalled; - CultureInfo cultureInfoPassedToGetResourceReader; - IResourceWriter resourceWriter; - bool getResourceWriterCalled; - CultureInfo cultureInfoPassedToGetResourceWriter; - IResourceReader resourceReader; - Dictionary types = new Dictionary(); - - public MockComponentCreator() - { - } - - public IComponent RootComponent { - get { return rootComponent; } - } - - public IComponent CreateComponent(Type componentClass, string name) - { - object instance = componentClass.Assembly.CreateInstance(componentClass.FullName); - - if (rootComponent == null) { - rootComponent = instance as IComponent; - } - - CreatedComponent c = new CreatedComponent(componentClass.FullName, name, (IComponent)instance); - createdComponents.Add(c); - - return (IComponent)instance; - } - - public void Add(IComponent component, string name) - { - if (component == null) { - throw new ArgumentNullException("component"); - } - - AddedComponent addedComponent = new AddedComponent(component, name); - addedComponents.Add(addedComponent); - } - - public IComponent GetComponent(string name) - { - foreach (AddedComponent addedComponent in addedComponents) { - if (addedComponent.Name == name) { - return addedComponent.Component; - } - } - foreach (CreatedComponent createdComponent in createdComponents) { - if (!String.IsNullOrEmpty(createdComponent.Name)) { - if (createdComponent.Name == name) { - return createdComponent.Component; - } - } - } - return null; - } - - public void AddInstance(object obj, string name) - { - CreatedInstance createdInstance = new CreatedInstance(obj.GetType(), new object[0], name, false); - createdInstance.Object = obj; - createdInstances.Add(createdInstance); - } - - public object CreateInstance(Type type, ICollection arguments, string name, bool addToContainer) - { - CreatedInstance createdInstance = new CreatedInstance(type, arguments, name, addToContainer); - createdInstances.Add(createdInstance); - - object[] argumentsArray = new object[arguments.Count]; - arguments.CopyTo(argumentsArray, 0); - - object o = null; - DesignerSerializationManager designerSerializationManager = new DesignerSerializationManager(); - using (designerSerializationManager.CreateSession()) { - IDesignerSerializationManager manager = designerSerializationManager as IDesignerSerializationManager; - o = manager.CreateInstance(type, arguments, name, addToContainer); - } - createdInstance.Object = o; - return o; - } - - /// - /// Adds a type that can be returned from the GetType method. - /// - public void AddType(string name, Type type) - { - types.Add(name, type); - } - - public Type GetType(string typeName) - { - typeNames.Add(typeName); - - // Lookup type in System.Windows.Forms assembly. - Type type = typeof(Form).Assembly.GetType(typeName); - if (type == null) { - // Lookup type in System.Drawing assembly. - type = typeof(Size).Assembly.GetType(typeName); - } - if (type == null) { - type = typeof(String).Assembly.GetType(typeName); - } - if (type == null) { - type = typeof(Component).Assembly.GetType(typeName); - } - if (type == null) { - types.TryGetValue(typeName, out type); - } - - return type; - } - - public PropertyDescriptor GetEventProperty(EventDescriptor e) - { - this.eventDescriptor = e; - return propertyDescriptor; - } - - public EventDescriptor EventDescriptorPassedToGetEventProperty { - get { return eventDescriptor; } - } - - /// - /// Sets the property descriptor to return from the GetEventProperty method. - /// - public void SetEventPropertyDescriptor(PropertyDescriptor propertyDescriptor) - { - this.propertyDescriptor = propertyDescriptor; - } - - public List CreatedComponents { - get { return createdComponents; } - } - - public List AddedComponents { - get { return addedComponents; } - } - - public List CreatedInstances { - get { return createdInstances; } - } - - public List TypeNames { - get { return typeNames; } - } - - public string LastTypeNameResolved { - get { return TypeNames[TypeNames.Count - 1]; } - } - - public CreatedInstance GetCreatedInstance(Type type) - { - foreach (CreatedInstance instance in createdInstances) { - if (instance.InstanceType == type) { - return instance; - } - } - return null; - } - - public CreatedInstance GetCreatedInstance(string name) - { - foreach (CreatedInstance instance in createdInstances) { - if (instance.Name == name) { - return instance; - } - } - return null; - } - - public object GetInstance(string name) - { - CreatedInstance instance = GetCreatedInstance(name); - if (instance != null) { - return instance.Object; - } - return null; - } - - public void SetResourceReader(IResourceReader reader) - { - resourceReader = reader; - } - - public bool GetResourceReaderCalled { - get { return getResourceReaderCalled; } - } - - public CultureInfo CultureInfoPassedToGetResourceReader { - get { return cultureInfoPassedToGetResourceReader; } - } - - public IResourceReader GetResourceReader(CultureInfo info) - { - getResourceReaderCalled = true; - cultureInfoPassedToGetResourceReader = info; - return resourceReader; - } - - public void SetResourceWriter(IResourceWriter writer) - { - resourceWriter = writer; - } - - public IResourceWriter GetResourceWriter(CultureInfo info) - { - getResourceWriterCalled = true; - cultureInfoPassedToGetResourceWriter = info; - return resourceWriter; - } - - public bool GetResourceWriterCalled { - get { return getResourceWriterCalled; } - } - - public CultureInfo CultureInfoPassedToGetResourceWriter { - get { return cultureInfoPassedToGetResourceWriter; } - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockConsoleTextEditor.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockConsoleTextEditor.cs index d984fccda4..4acfc01ed6 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockConsoleTextEditor.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockConsoleTextEditor.cs @@ -13,6 +13,8 @@ using System.Windows.Input; using ICSharpCode.NRefactory; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting; +using ICSharpCode.Scripting.Tests.Utils; namespace RubyBinding.Tests.Utils { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockDebugger.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockDebugger.cs deleted file mode 100644 index 811eeda51e..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockDebugger.cs +++ /dev/null @@ -1,178 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Diagnostics; -using ICSharpCode.SharpDevelop.Debugging; -using ICSharpCode.SharpDevelop.Project; - -namespace RubyBinding.Tests.Utils -{ - public class MockDebugger : IDebugger - { - ProcessStartInfo processStartInfo; - bool startMethodCalled; - bool startWithoutDebuggingMethodCalled; - bool stopMethodCalled; - - public MockDebugger() - { - } - - /// - /// Gets the ProcessStartInfo passed to the Start or StartWithoutDebugging methods. - /// - public ProcessStartInfo ProcessStartInfo { - get { return processStartInfo; } - } - - public bool StartMethodCalled { - get { return startMethodCalled; } - } - - public bool StartWithoutDebuggingMethodCalled { - get { return startWithoutDebuggingMethodCalled; } - } - - public bool StopMethodCalled { - get { return stopMethodCalled; } - } - - public event EventHandler DebugStarting; - public event EventHandler DebugStarted; - public event EventHandler IsProcessRunningChanged; - public event EventHandler DebugStopped; - - public bool IsDebugging { - get { - throw new NotImplementedException(); - } - } - - public bool IsProcessRunning { - get { - throw new NotImplementedException(); - } - } - - public bool CanDebug(IProject project) - { - throw new NotImplementedException(); - } - - public void Start(ProcessStartInfo processStartInfo) - { - this.processStartInfo = processStartInfo; - startMethodCalled = true; - } - - public void StartWithoutDebugging(ProcessStartInfo processStartInfo) - { - this.processStartInfo = processStartInfo; - startWithoutDebuggingMethodCalled = true; - } - - public void Stop() - { - stopMethodCalled = true; - } - - public void Break() - { - throw new NotImplementedException(); - } - - public void Continue() - { - throw new NotImplementedException(); - } - - public void StepInto() - { - throw new NotImplementedException(); - } - - public void StepOver() - { - throw new NotImplementedException(); - } - - public void StepOut() - { - throw new NotImplementedException(); - } - - public void ShowAttachDialog() - { - throw new NotImplementedException(); - } - - public void Attach(System.Diagnostics.Process process) - { - throw new NotImplementedException(); - } - - public void Detach() - { - throw new NotImplementedException(); - } - - public string GetValueAsString(string variable) - { - throw new NotImplementedException(); - } - - public object GetTooltipControl(string variable) - { - throw new NotImplementedException(); - } - - public bool CanSetInstructionPointer(string filename, int line, int column) - { - throw new NotImplementedException(); - } - - public bool SetInstructionPointer(string filename, int line, int column) - { - throw new NotImplementedException(); - } - - public void Dispose() - { - throw new NotImplementedException(); - } - - protected virtual void OnDebugStarting(EventArgs e) - { - if (DebugStarting != null) { - DebugStarting(this, e); - } - } - - - protected virtual void OnDebugStarted(EventArgs e) - { - if (DebugStarted != null) { - DebugStarted(this, e); - } - } - - protected virtual void OnIsProcessRunningChanged(EventArgs e) - { - if (IsProcessRunningChanged != null) { - IsProcessRunningChanged(this, e); - } - } - - protected virtual void OnDebugStopped(EventArgs e) - { - if (DebugStopped != null) { - DebugStopped(this, e); - } - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockDesignerLoaderHost.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockDesignerLoaderHost.cs deleted file mode 100644 index ea5cf291b7..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockDesignerLoaderHost.cs +++ /dev/null @@ -1,217 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections; -using System.Collections.Generic; -using System.ComponentModel; -using System.ComponentModel.Design; -using System.ComponentModel.Design.Serialization; - -namespace RubyBinding.Tests.Utils -{ - /// - /// Mock IDesignerLoaderHost implementation. - /// - public class MockDesignerLoaderHost : IDesignerLoaderHost - { - ServiceContainer serviceContainer = new ServiceContainer(); - List createdComponents = new List(); - IComponent rootComponent; - MockTypeResolutionService typeResolutionService = new MockTypeResolutionService(); - Container container = new Container(); - - public MockDesignerLoaderHost() - { - AddService(typeof(IServiceContainer), serviceContainer); - AddService(typeof(ITypeResolutionService), typeResolutionService); - } - - public event EventHandler Activated; - public event EventHandler Deactivated; - public event EventHandler LoadComplete; - public event DesignerTransactionCloseEventHandler TransactionClosed; - public event DesignerTransactionCloseEventHandler TransactionClosing; - public event EventHandler TransactionOpened; - public event EventHandler TransactionOpening; - - /// - /// Gets the components created via the CreateComponent method. - /// - public List CreatedComponents { - get { return createdComponents; } - } - - public MockTypeResolutionService TypeResolutionService { - get { return typeResolutionService; } - } - - public bool Loading { - get { - throw new NotImplementedException(); - } - } - - public bool InTransaction { - get { - throw new NotImplementedException(); - } - } - - public IContainer Container { - get { return container; } - set { container = value as Container; } - } - - public IComponent RootComponent { - get { return rootComponent; } - set { rootComponent = value; } - } - - public string RootComponentClassName { - get { - throw new NotImplementedException(); - } - } - - public string TransactionDescription { - get { - throw new NotImplementedException(); - } - } - - public void EndLoad(string baseClassName, bool successful, ICollection errorCollection) - { - } - - public void Reload() - { - } - - public void Activate() - { - } - - public IComponent CreateComponent(Type componentClass) - { - return null; - } - - public IComponent CreateComponent(Type componentClass, string name) - { - IComponent component = componentClass.Assembly.CreateInstance(componentClass.FullName) as IComponent; - if (rootComponent == null) { - rootComponent = component; - } - createdComponents.Add(new CreatedComponent(componentClass.FullName, name, component)); - return component; - } - - public DesignerTransaction CreateTransaction() - { - return null; - } - - public DesignerTransaction CreateTransaction(string description) - { - throw new NotImplementedException(); - } - - public void DestroyComponent(IComponent component) - { - } - - public IDesigner GetDesigner(IComponent component) - { - return null; - } - - public Type GetType(string typeName) - { - return typeResolutionService.GetType(typeName); - } - - public void AddService(Type serviceType, object serviceInstance) - { - serviceContainer.AddService(serviceType, serviceInstance); - } - - public void AddService(Type serviceType, object serviceInstance, bool promote) - { - } - - public void AddService(Type serviceType, ServiceCreatorCallback callback) - { - } - - public void AddService(Type serviceType, ServiceCreatorCallback callback, bool promote) - { - } - - public void RemoveService(Type serviceType) - { - } - - public void RemoveService(Type serviceType, bool promote) - { - } - - public object GetService(Type serviceType) - { - return serviceContainer.GetService(serviceType); - } - - protected virtual void OnDeactivated(EventArgs e) - { - if (Deactivated != null) { - Deactivated(this, e); - } - } - - protected virtual void OnLoadComplete(EventArgs e) - { - if (LoadComplete != null) { - LoadComplete(this, e); - } - } - - protected virtual void OnTransactionClosed(DesignerTransactionCloseEventArgs e) - { - if (TransactionClosed != null) { - TransactionClosed(this, e); - } - } - - protected virtual void OnTransactionClosing(DesignerTransactionCloseEventArgs e) - { - if (TransactionClosing != null) { - TransactionClosing(this, e); - } - } - - protected virtual void OnTransactionOpened(EventArgs e) - { - if (TransactionOpened != null) { - TransactionOpened(this, e); - } - } - - protected virtual void OnTransactionOpening(EventArgs e) - { - if (TransactionOpening != null) { - TransactionOpening(this, e); - } - } - - protected virtual void OnActivated(EventArgs e) - { - if (Activated != null) { - Activated(this, e); - } - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockEditableViewContent.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockEditableViewContent.cs deleted file mode 100644 index 134d8aeb2a..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockEditableViewContent.cs +++ /dev/null @@ -1,53 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using ICSharpCode.AvalonEdit; -using ICSharpCode.SharpDevelop; -using ICSharpCode.SharpDevelop.Editor; -using ICSharpCode.SharpDevelop.Gui; - -namespace RubyBinding.Tests.Utils -{ - /// - /// Mock implementation of the IEditable and IViewContent. - /// - public class MockEditableViewContent : MockViewContent, IEditable, ITextEditorProvider - { - public MockTextEditor MockTextEditor = new MockTextEditor(); - - public MockEditableViewContent() - { - Text = String.Empty; - } - - public string Text { get; set; } - - public ITextBuffer CreateSnapshot() - { - return new StringTextBuffer(Text); - } - - public ITextEditorOptions TextEditorOptions { - get { return MockTextEditor.Options; } - } - - public MockTextEditorOptions MockTextEditorOptions { - get { return MockTextEditor.MockTextEditorOptions; } - set { MockTextEditor.MockTextEditorOptions = value; } - } - - public ITextEditor TextEditor { - get { return MockTextEditor; } - } - - public IDocument GetDocumentForFile(OpenedFile file) - { - throw new NotImplementedException(); - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockEventBindingService.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockEventBindingService.cs deleted file mode 100644 index 0a9525b677..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockEventBindingService.cs +++ /dev/null @@ -1,52 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections; -using System.ComponentModel; -using System.ComponentModel.Design; - -namespace RubyBinding.Tests.Utils -{ - public class MockEventBindingService : EventBindingService - { - public MockEventBindingService(IServiceProvider serviceProvider) - : base(serviceProvider) - { - } - - public MockEventBindingService() - : this(new ServiceContainer()) - { - } - - protected override string CreateUniqueMethodName(IComponent component, EventDescriptor e) - { - return String.Empty; - } - - protected override ICollection GetCompatibleMethods(EventDescriptor e) - { - return new ArrayList(); - } - - protected override bool ShowCode() - { - return false; - } - - protected override bool ShowCode(int lineNumber) - { - return false; - } - - protected override bool ShowCode(IComponent component, EventDescriptor e, string methodName) - { - return false; - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockOpenedFile.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockOpenedFile.cs deleted file mode 100644 index 71a4ea9845..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockOpenedFile.cs +++ /dev/null @@ -1,45 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections.Generic; -using ICSharpCode.SharpDevelop; -using ICSharpCode.SharpDevelop.Gui; - -namespace RubyBinding.Tests.Utils -{ - /// - /// Mock OpenedFile class. - /// - public class MockOpenedFile : OpenedFile - { - public MockOpenedFile() - { - } - - public MockOpenedFile(string fileName) - { - this.FileName = new ICSharpCode.Core.FileName(fileName); - } - - public override IList RegisteredViewContents { - get { - throw new NotImplementedException(); - } - } - - public override void RegisterView(IViewContent view) - { - } - - public override void UnregisterView(IViewContent view) - { - } - - public override event EventHandler FileClosed { add {} remove {} } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockPropertyDescriptor.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockPropertyDescriptor.cs deleted file mode 100644 index 0deaf61b89..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockPropertyDescriptor.cs +++ /dev/null @@ -1,69 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.ComponentModel; -using System.Windows.Forms; - -namespace RubyBinding.Tests.Utils -{ - public class MockPropertyDescriptor : PropertyDescriptor - { - object propertyValue; - bool shouldSerializeValue; - object setValueComponent; - - public MockPropertyDescriptor(string name, object value, bool shouldSerializeValue) - : base(name, null) - { - this.propertyValue = value; - this.shouldSerializeValue = shouldSerializeValue; - } - - public override Type ComponentType { - get { return typeof(Form); } - } - - public override bool IsReadOnly { - get { return false; } - } - - public override Type PropertyType { - get { return typeof(String); } - } - - public override bool CanResetValue(object component) - { - return true; - } - - public override object GetValue(object component) - { - return this.propertyValue; - } - - public override void ResetValue(object component) - { - } - - public override void SetValue(object component, object value) - { - setValueComponent = component; - propertyValue = value; - } - - public object GetSetValueComponent() - { - return setValueComponent; - } - - public override bool ShouldSerializeValue(object component) - { - return shouldSerializeValue; - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockResourceReader.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockResourceReader.cs deleted file mode 100644 index df90a42f5f..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockResourceReader.cs +++ /dev/null @@ -1,52 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Resources; - -namespace RubyBinding.Tests.Utils -{ - public class MockResourceReader : IResourceReader - { - bool disposed; - Dictionary resources = new Dictionary(); - - public MockResourceReader() - { - } - - public void AddResource(string name, object value) - { - resources.Add(name, value); - } - - public void Close() - { - } - - public IDictionaryEnumerator GetEnumerator() - { - return resources.GetEnumerator(); - } - - IEnumerator IEnumerable.GetEnumerator() - { - return resources.GetEnumerator(); - } - - public void Dispose() - { - disposed = true; - } - - public bool IsDisposed { - get { return disposed; } - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockResourceService.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockResourceService.cs deleted file mode 100644 index 76b3227ed4..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockResourceService.cs +++ /dev/null @@ -1,63 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.ComponentModel.Design; -using System.Globalization; -using System.Resources; - -namespace RubyBinding.Tests.Utils -{ - public class MockResourceService : IResourceService - { - IResourceReader reader; - IResourceWriter writer; - CultureInfo readerCultureInfo; - CultureInfo writerCultureInfo; - - public MockResourceService() - { -// reader = new MockResourceReader(); - } - - public void SetResourceReader(IResourceReader reader) - { - this.reader = reader; - } - - public void SetResourceWriter(IResourceWriter writer) - { - this.writer = writer; - } - - public IResourceReader GetResourceReader(CultureInfo info) - { - readerCultureInfo = info; - return reader; - } - - /// - /// Gets the culture passed to GetResourceReader. - /// - public CultureInfo ResourceReaderCultureInfo { - get { return readerCultureInfo; } - } - - public IResourceWriter GetResourceWriter(CultureInfo info) - { - writerCultureInfo = info; - return writer; - } - - /// - /// Gets the culture passed to GetResourceWriter. - /// - public CultureInfo ResourceWriterCultureInfo { - get { return writerCultureInfo; } - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockResourceWriter.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockResourceWriter.cs deleted file mode 100644 index b214141d9a..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockResourceWriter.cs +++ /dev/null @@ -1,63 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections.Generic; -using System.Resources; - -namespace RubyBinding.Tests.Utils -{ - public class MockResourceWriter : IResourceWriter - { - bool disposed; - Dictionary resources = new Dictionary(); - - public MockResourceWriter() - { - } - - public object GetResource(string name) - { - if (resources.ContainsKey(name)) { - return resources[name]; - } - return null; - } - - public void AddResource(string name, string value) - { - resources.Add(name, value); - } - - public void AddResource(string name, object value) - { - resources.Add(name, value); - } - - public void AddResource(string name, byte[] value) - { - throw new NotImplementedException(); - } - - public void Close() - { - } - - public void Generate() - { - } - - public void Dispose() - { - disposed = true; - } - - public bool IsDisposed { - get { return disposed; } - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockRubyFileService.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockRubyFileService.cs index 99eba47622..18a7910954 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockRubyFileService.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockRubyFileService.cs @@ -8,7 +8,9 @@ using System; using System.IO; using System.Text; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting; namespace RubyBinding.Tests.Utils { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockTypeResolutionService.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockTypeResolutionService.cs deleted file mode 100644 index c101a1f53a..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockTypeResolutionService.cs +++ /dev/null @@ -1,85 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.ComponentModel.Design; -using System.Drawing; -using System.Reflection; -using System.Windows.Forms; - -namespace RubyBinding.Tests.Utils -{ - /// - /// Mock implementation of the ITypeResolutionService interface. - /// - public class MockTypeResolutionService : ITypeResolutionService - { - string lastTypeNameResolved; - - public MockTypeResolutionService() - { - } - - /// - /// Returns the last type name passed to the GetType method. - /// - public string LastTypeNameResolved { - get { return lastTypeNameResolved; } - } - - public Assembly GetAssembly(AssemblyName name) - { - throw new NotImplementedException(); - } - - public Assembly GetAssembly(AssemblyName name, bool throwOnError) - { - throw new NotImplementedException(); - } - - public Type GetType(string name) - { - System.Console.WriteLine("TypeResolutionService.GetType: " + name); - lastTypeNameResolved = name; - if (name == "Form") { - return typeof(Form); - } - - Type type = typeof(Form).Assembly.GetType(name, false); - if (type != null) { - return type; - } - - type = typeof(Color).Assembly.GetType(name, false); - if (type != null) { - return type; - } - - return Type.GetType(name); - } - - public Type GetType(string name, bool throwOnError) - { - throw new NotImplementedException(); - } - - public Type GetType(string name, bool throwOnError, bool ignoreCase) - { - throw new NotImplementedException(); - } - - public void ReferenceAssembly(AssemblyName name) - { - throw new NotImplementedException(); - } - - public string GetPathOfAssembly(AssemblyName name) - { - throw new NotImplementedException(); - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockViewContent.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockViewContent.cs deleted file mode 100644 index a800c2b8c3..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockViewContent.cs +++ /dev/null @@ -1,234 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections.Generic; -using System.Windows.Forms; - -using ICSharpCode.Core; -using ICSharpCode.SharpDevelop; -using ICSharpCode.SharpDevelop.Gui; - -namespace RubyBinding.Tests.Utils -{ - /// - /// Dummy IViewContent class. - /// - public class MockViewContent : IViewContent - { - FileName fileName; - List secondaryViewContents = new List(); - - public MockViewContent() - { - } - - public event EventHandler TitleNameChanged; - public event EventHandler TabPageTextChanged; - public event EventHandler Disposed; - public event EventHandler IsDirtyChanged; - - public string TitleName { - get { - throw new NotImplementedException(); - } - set { - throw new NotImplementedException(); - } - } - - public bool IsReadOnly { - get { - throw new NotImplementedException(); - } - } - - public bool IsViewOnly { - get { - throw new NotImplementedException(); - } - } - - public ICollection SecondaryViewContents { - get { return secondaryViewContents; } - } - - public object Control { - get { - throw new NotImplementedException(); - } - } - - public IWorkbenchWindow WorkbenchWindow { - get { - throw new NotImplementedException(); - } - set { - throw new NotImplementedException(); - } - } - - public string TabPageText { - get { - throw new NotImplementedException(); - } - } - - public bool IsDirty { - get { - throw new NotImplementedException(); - } - set { - throw new NotImplementedException(); - } - } - - public void Save() - { - throw new NotImplementedException(); - } - - public void Save(string fileName) - { - throw new NotImplementedException(); - } - - public void Load(string fileName) - { - throw new NotImplementedException(); - } - - public INavigationPoint BuildNavPoint() - { - throw new NotImplementedException(); - } - - public void SwitchedTo() - { - throw new NotImplementedException(); - } - - public void Selected() - { - throw new NotImplementedException(); - } - - public void Deselecting() - { - throw new NotImplementedException(); - } - - public void Deselected() - { - throw new NotImplementedException(); - } - - public void RedrawContent() - { - throw new NotImplementedException(); - } - - public void Dispose() - { - throw new NotImplementedException(); - } - - public IList Files { - get { - throw new NotImplementedException(); - } - } - - public OpenedFile PrimaryFile { - get { - MockOpenedFile file = new MockOpenedFile(); - //file.FileName = fileName; - return file; - } - } - - public FileName PrimaryFileName { - get { return fileName; } - set { fileName = value; } - } - - public bool IsDisposed { - get { - throw new NotImplementedException(); - } - } - - public void Save(OpenedFile file, System.IO.Stream stream) - { - throw new NotImplementedException(); - } - - public void Load(OpenedFile file, System.IO.Stream stream) - { - throw new NotImplementedException(); - } - - public bool SupportsSwitchFromThisWithoutSaveLoad(OpenedFile file, IViewContent newView) - { - throw new NotImplementedException(); - } - - public bool SupportsSwitchToThisWithoutSaveLoad(OpenedFile file, IViewContent oldView) - { - throw new NotImplementedException(); - } - - public void SwitchFromThisWithoutSaveLoad(OpenedFile file, IViewContent newView) - { - throw new NotImplementedException(); - } - - public void SwitchToThisWithoutSaveLoad(OpenedFile file, IViewContent oldView) - { - throw new NotImplementedException(); - } - - protected virtual void OnTitleNameChanged(EventArgs e) - { - if (TitleNameChanged != null) { - TitleNameChanged(this, e); - } - } - - protected virtual void OnTabPageTextChanged(EventArgs e) - { - if (TabPageTextChanged != null) { - TabPageTextChanged(this, e); - } - } - - protected virtual void OnDisposed(EventArgs e) - { - if (Disposed != null) { - Disposed(this, e); - } - } - - protected virtual void OnIsDirtyChanged(EventArgs e) - { - if (IsDirtyChanged != null) { - IsDirtyChanged(this, e); - } - } - - public object InitiallyFocusedControl { - get { - throw new NotImplementedException(); - } - } - - public object GetService(Type serviceType) - { - return null; - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockWorkbench.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockWorkbench.cs index f133e8e34c..5e1ebf387b 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockWorkbench.cs +++ b/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.Tests.Utils; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Gui; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/NullPropertyUserControl.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/NullPropertyUserControl.cs deleted file mode 100644 index b409b76400..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/NullPropertyUserControl.cs +++ /dev/null @@ -1,26 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Windows.Forms; - -namespace RubyBinding.Tests.Utils -{ - public class NullPropertyUserControl : UserControl - { - string fooBar; - - public string FooBar { - get { return fooBar; } - set { fooBar = value; } - } - - public NullPropertyUserControl() - { - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/TestableRubyConsole.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/TestableRubyConsole.cs index f3d8772579..3a50cdc4cd 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/TestableRubyConsole.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/TestableRubyConsole.cs @@ -8,6 +8,8 @@ using System; using System.Collections.Generic; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting; +using ICSharpCode.Scripting.Tests.Utils; using IronRuby.Hosting; namespace RubyBinding.Tests.Utils diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/Tests/MockConsoleTextEditorTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/Tests/MockConsoleTextEditorTestFixture.cs index 6fabbf0a64..d16482cbde 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/Tests/MockConsoleTextEditorTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/Tests/MockConsoleTextEditorTestFixture.cs @@ -8,6 +8,7 @@ using System; using System.Windows.Input; using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting; using NUnit.Framework; using RubyBinding.Tests.Console; using RubyBinding.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/Tests/MockEditableViewContentTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/Tests/MockEditableViewContentTestFixture.cs deleted file mode 100644 index e1b1bd52e0..0000000000 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/Tests/MockEditableViewContentTestFixture.cs +++ /dev/null @@ -1,49 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using ICSharpCode.AvalonEdit; -using ICSharpCode.SharpDevelop; -using ICSharpCode.SharpDevelop.Editor; -using ICSharpCode.SharpDevelop.Gui; -using NUnit.Framework; -using RubyBinding.Tests.Utils; - -namespace RubyBinding.Tests.Utils.Tests -{ - [TestFixture] - public class MockEditableViewContentTestFixture - { - MockEditableViewContent view; - - [SetUp] - public void Init() - { - view = new MockEditableViewContent(); - } - - [Test] - public void ImplementsIEditableInterface() - { - Assert.IsNotNull(view as IEditable); - } - - [Test] - public void ImplementsITextEditorProviderInterface() - { - Assert.IsNotNull(view as ITextEditorProvider); - } - - [Test] - public void CanReplaceTextEditorOptions() - { - MockTextEditorOptions options = new MockTextEditorOptions(); - view.MockTextEditorOptions = options; - Assert.AreSame(options, view.TextEditor.Options); - } - } -} diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/Tests/MockRubyFileServiceTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/Tests/MockRubyFileServiceTestFixture.cs index 83b994acaa..9146f69cf7 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/Tests/MockRubyFileServiceTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/Tests/MockRubyFileServiceTestFixture.cs @@ -8,7 +8,9 @@ using System; using System.IO; using System.Text; + using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting; using NUnit.Framework; namespace RubyBinding.Tests.Utils.Tests diff --git a/src/AddIns/BackendBindings/Scripting/ICSharpCode.Scripting.sln b/src/AddIns/BackendBindings/Scripting/ICSharpCode.Scripting.sln new file mode 100644 index 0000000000..5574b12df1 --- /dev/null +++ b/src/AddIns/BackendBindings/Scripting/ICSharpCode.Scripting.sln @@ -0,0 +1,24 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +# SharpDevelop 4.0.0.6511 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Scripting", "Project\ICSharpCode.Scripting.csproj", "{7048AE18-EB93-4A84-82D0-DD60EB58ADBD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Scripting.Tests", "Test\ICSharpCode.Scripting.Tests.csproj", "{85C09AD8-183B-403A-869A-7226646218A9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Debug|x86.Build.0 = Debug|x86 + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Debug|x86.ActiveCfg = Debug|x86 + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Release|x86.Build.0 = Release|x86 + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Release|x86.ActiveCfg = Release|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Debug|x86.Build.0 = Debug|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Debug|x86.ActiveCfg = Debug|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Release|x86.Build.0 = Release|x86 + {85C09AD8-183B-403A-869A-7226646218A9}.Release|x86.ActiveCfg = Release|x86 + EndGlobalSection +EndGlobal diff --git a/src/AddIns/BackendBindings/Scripting/Project/Configuration/AssemblyInfo.cs b/src/AddIns/BackendBindings/Scripting/Project/Configuration/AssemblyInfo.cs new file mode 100644 index 0000000000..b7a21550c5 --- /dev/null +++ b/src/AddIns/BackendBindings/Scripting/Project/Configuration/AssemblyInfo.cs @@ -0,0 +1,20 @@ +// +// +// +// +// $Revision$ +// + +using System.Reflection; + +// Information about this assembly is defined by the following +// attributes. +// +// change them to the information which is associated with the assembly +// you compile. + +[assembly: AssemblyTitle("ICSharpCode.Scripting")] +[assembly: AssemblyDescription("SharpDevelop dynamic language support.")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] diff --git a/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj b/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj new file mode 100644 index 0000000000..2c42c10421 --- /dev/null +++ b/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj @@ -0,0 +1,68 @@ + + + + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD} + Debug + x86 + Library + ICSharpCode.Scripting + ICSharpCode.Scripting + v4.0 + False + False + 4 + false + ..\..\..\..\..\bin\ + + + x86 + False + Auto + 4194304 + 4096 + + + true + Full + False + True + DEBUG;TRACE + + + false + None + True + False + TRACE + + + + 3.0 + + + + + 3.0 + + + + + + + + + Configuration\GlobalAssemblyInfo.cs + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/CommandLineHistory.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/CommandLineHistory.cs similarity index 93% rename from src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/CommandLineHistory.cs rename to src/AddIns/BackendBindings/Scripting/Project/Src/CommandLineHistory.cs index 000959fdf7..cf489d8344 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/CommandLineHistory.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/CommandLineHistory.cs @@ -8,11 +8,8 @@ using System; using System.Collections.Generic; -namespace ICSharpCode.PythonBinding +namespace ICSharpCode.Scripting { - /// - /// Stores the command line history for the PythonConsole. - /// public class CommandLineHistory { List lines = new List(); diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/ConsoleTextEditorKeyEventArgs.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/ConsoleTextEditorKeyEventArgs.cs similarity index 95% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/ConsoleTextEditorKeyEventArgs.cs rename to src/AddIns/BackendBindings/Scripting/Project/Src/ConsoleTextEditorKeyEventArgs.cs index 4bb29a6f9a..e3b72250f1 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/ConsoleTextEditorKeyEventArgs.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/ConsoleTextEditorKeyEventArgs.cs @@ -8,7 +8,7 @@ using System; using System.Windows.Input; -namespace ICSharpCode.RubyBinding +namespace ICSharpCode.Scripting { public delegate void ConsoleTextEditorKeyEventHandler(object source, ConsoleTextEditorKeyEventArgs e); diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/ControlDispatcher.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/ControlDispatcher.cs similarity index 95% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/ControlDispatcher.cs rename to src/AddIns/BackendBindings/Scripting/Project/Src/ControlDispatcher.cs index 84233b03c6..1b486c1aa4 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/ControlDispatcher.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/ControlDispatcher.cs @@ -9,7 +9,7 @@ using System; using System.Windows; using System.Windows.Threading; -namespace ICSharpCode.RubyBinding +namespace ICSharpCode.Scripting { public class ControlDispatcher : IControlDispatcher { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/CreateTextWriterInfo.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/CreateTextWriterInfo.cs similarity index 97% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/CreateTextWriterInfo.cs rename to src/AddIns/BackendBindings/Scripting/Project/Src/CreateTextWriterInfo.cs index 5bae55e9b8..2856ca1c4e 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/CreateTextWriterInfo.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/CreateTextWriterInfo.cs @@ -9,7 +9,7 @@ using System; using System.IO; using System.Text; -namespace ICSharpCode.RubyBinding +namespace ICSharpCode.Scripting { public class CreateTextWriterInfo { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IComponentCreator.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/IComponentCreator.cs similarity index 98% rename from src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IComponentCreator.cs rename to src/AddIns/BackendBindings/Scripting/Project/Src/IComponentCreator.cs index 2b00312a07..4d82c48945 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IComponentCreator.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/IComponentCreator.cs @@ -12,7 +12,7 @@ using System.ComponentModel.Design; using System.Globalization; using System.Resources; -namespace ICSharpCode.PythonBinding +namespace ICSharpCode.Scripting { /// /// Interface that can: diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/IControlDispatcher.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/IControlDispatcher.cs similarity index 91% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/IControlDispatcher.cs rename to src/AddIns/BackendBindings/Scripting/Project/Src/IControlDispatcher.cs index f06bb05bb3..a8ed6e675d 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/IControlDispatcher.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/IControlDispatcher.cs @@ -7,7 +7,7 @@ using System; -namespace ICSharpCode.RubyBinding +namespace ICSharpCode.Scripting { public interface IControlDispatcher { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/ILock.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/ILock.cs similarity index 90% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/ILock.cs rename to src/AddIns/BackendBindings/Scripting/Project/Src/ILock.cs index ba88f63542..8b17061057 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/ILock.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/ILock.cs @@ -8,7 +8,7 @@ using System; using System.Collections.Generic; -namespace ICSharpCode.RubyBinding +namespace ICSharpCode.Scripting { public interface ILock : IDisposable { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IMemberProvider.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/IMemberProvider.cs similarity index 79% rename from src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IMemberProvider.cs rename to src/AddIns/BackendBindings/Scripting/Project/Src/IMemberProvider.cs index 7b82f0c44c..5bce261705 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IMemberProvider.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/IMemberProvider.cs @@ -8,10 +8,10 @@ using System; using System.Collections.Generic; -namespace ICSharpCode.PythonBinding +namespace ICSharpCode.Scripting { /// - /// Returns member names or global names for the python console command line. + /// Returns member names or global names for the console command line. /// public interface IMemberProvider { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/StringListLock.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/StringListLock.cs similarity index 94% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/StringListLock.cs rename to src/AddIns/BackendBindings/Scripting/Project/Src/StringListLock.cs index 3fa5a74bdc..e7dc011410 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/StringListLock.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/StringListLock.cs @@ -9,7 +9,7 @@ using System; using System.Collections.Generic; using System.Threading; -namespace ICSharpCode.RubyBinding +namespace ICSharpCode.Scripting { public class StringListLock : ILock { diff --git a/src/AddIns/BackendBindings/Scripting/Test/Configuration/AssemblyInfo.cs b/src/AddIns/BackendBindings/Scripting/Test/Configuration/AssemblyInfo.cs new file mode 100644 index 0000000000..804e3c371e --- /dev/null +++ b/src/AddIns/BackendBindings/Scripting/Test/Configuration/AssemblyInfo.cs @@ -0,0 +1,20 @@ +// +// +// +// +// $Revision$ +// + +using System.Reflection; + +// Information about this assembly is defined by the following +// attributes. +// +// change them to the information which is associated with the assembly +// you compile. + +[assembly: AssemblyTitle("ICSharpCode.Scripting.Tests")] +[assembly: AssemblyDescription("SharpDevelop dynamic language support.")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/CommandLineHistoryTestFixture.cs b/src/AddIns/BackendBindings/Scripting/Test/Console/CommandLineHistoryTestFixture.cs similarity index 95% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/CommandLineHistoryTestFixture.cs rename to src/AddIns/BackendBindings/Scripting/Test/Console/CommandLineHistoryTestFixture.cs index 756ec17f10..10f4cfb7c6 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/CommandLineHistoryTestFixture.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Console/CommandLineHistoryTestFixture.cs @@ -6,10 +6,10 @@ // using System; -using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting; using NUnit.Framework; -namespace PythonBinding.Tests.Console +namespace ICSharpCode.Scripting.Tests.Console { /// /// Tests the CommandLineHistory class. diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/EmptyCommandLineHistoryTestFixture.cs b/src/AddIns/BackendBindings/Scripting/Test/Console/EmptyCommandLineHistoryTestFixture.cs similarity index 91% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/EmptyCommandLineHistoryTestFixture.cs rename to src/AddIns/BackendBindings/Scripting/Test/Console/EmptyCommandLineHistoryTestFixture.cs index b1ff824b81..a2f6a898ea 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/EmptyCommandLineHistoryTestFixture.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Console/EmptyCommandLineHistoryTestFixture.cs @@ -6,10 +6,10 @@ // using System; -using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting; using NUnit.Framework; -namespace PythonBinding.Tests.Console +namespace ICSharpCode.Scripting.Tests.Console { /// /// Tests the CommandLineHistory class. diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/OneItemCommandLineHistoryTestFixture.cs b/src/AddIns/BackendBindings/Scripting/Test/Console/OneItemCommandLineHistoryTestFixture.cs similarity index 96% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/OneItemCommandLineHistoryTestFixture.cs rename to src/AddIns/BackendBindings/Scripting/Test/Console/OneItemCommandLineHistoryTestFixture.cs index b1f838228b..547b3a5aa0 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/OneItemCommandLineHistoryTestFixture.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Console/OneItemCommandLineHistoryTestFixture.cs @@ -6,10 +6,10 @@ // using System; -using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting; using NUnit.Framework; -namespace PythonBinding.Tests.Console +namespace ICSharpCode.Scripting.Tests.Console { [TestFixture] public class OneItemCommandLineHistoryTestFixture diff --git a/src/AddIns/BackendBindings/Scripting/Test/ICSharpCode.Scripting.Tests.csproj b/src/AddIns/BackendBindings/Scripting/Test/ICSharpCode.Scripting.Tests.csproj new file mode 100644 index 0000000000..19af43b6a3 --- /dev/null +++ b/src/AddIns/BackendBindings/Scripting/Test/ICSharpCode.Scripting.Tests.csproj @@ -0,0 +1,148 @@ + + + + {85C09AD8-183B-403A-869A-7226646218A9} + Debug + x86 + Library + ICSharpCode.Scripting.Tests + ICSharpCode.Scripting.Tests + v4.0 + False + False + 4 + false + ..\..\..\..\..\bin\UnitTests\ + + + x86 + False + Auto + 4194304 + 4096 + + + true + Full + False + True + DEBUG;TRACE + + + false + None + True + False + TRACE + + + + ..\..\..\..\Tools\NUnit\nunit.framework.dll + + + 3.0 + + + 3.0 + + + + + + + + 4.0 + + + + 3.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} + ICSharpCode.AvalonEdit + + + {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} + NRefactory + + + {2748AD25-9C63-4E12-877B-4DCE96FBED54} + ICSharpCode.SharpDevelop + + + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} + ICSharpCode.Core + + + {924EE450-603D-49C1-A8E5-4AFAA31CE6F3} + ICSharpCode.SharpDevelop.Dom + + + {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} + FormsDesigner + + + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD} + ICSharpCode.Scripting + + + + \ No newline at end of file diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/CreateTextWriterFromCreateTextWriterInfoTestFixture.cs b/src/AddIns/BackendBindings/Scripting/Test/Testing/CreateTextWriterFromCreateTextWriterInfoTestFixture.cs similarity index 92% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/CreateTextWriterFromCreateTextWriterInfoTestFixture.cs rename to src/AddIns/BackendBindings/Scripting/Test/Testing/CreateTextWriterFromCreateTextWriterInfoTestFixture.cs index a0f36b8026..4687722acb 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/CreateTextWriterFromCreateTextWriterInfoTestFixture.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Testing/CreateTextWriterFromCreateTextWriterInfoTestFixture.cs @@ -8,10 +8,11 @@ using System; using System.IO; using System.Text; -using ICSharpCode.PythonBinding; + +using ICSharpCode.Scripting; using NUnit.Framework; -namespace PythonBinding.Tests.Testing +namespace ICSharpCode.Scripting.Tests.Testing { [TestFixture] public class CreateTextWriterFromCreateTextWriterInfoTestFixture diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/CreateTextWriterInfoEqualsTestFixture.cs b/src/AddIns/BackendBindings/Scripting/Test/Testing/CreateTextWriterInfoEqualsTestFixture.cs similarity index 96% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/CreateTextWriterInfoEqualsTestFixture.cs rename to src/AddIns/BackendBindings/Scripting/Test/Testing/CreateTextWriterInfoEqualsTestFixture.cs index 3c8e19c2f1..6e7563a2ec 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/CreateTextWriterInfoEqualsTestFixture.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Testing/CreateTextWriterInfoEqualsTestFixture.cs @@ -7,10 +7,10 @@ using System; using System.Text; -using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting; using NUnit.Framework; -namespace PythonBinding.Tests.Testing +namespace ICSharpCode.Scripting.Tests.Testing { [TestFixture] public class CreateTextWriterInfoEqualsTestFixture diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/AddInHelper.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/AddInHelper.cs similarity index 95% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/AddInHelper.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/AddInHelper.cs index 9e1853edef..3d2fbfa879 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/AddInHelper.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/AddInHelper.cs @@ -10,7 +10,7 @@ using System.Collections.Generic; using ICSharpCode.Core; using ICSharpCode.SharpDevelop; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class AddInHelper { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/AddedComponent.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/AddedComponent.cs similarity index 96% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/AddedComponent.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/AddedComponent.cs index df5ffd23e7..1732de6afd 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/AddedComponent.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/AddedComponent.cs @@ -8,7 +8,7 @@ using System; using System.ComponentModel; -namespace RubyBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { /// /// Component passed to the IComponentCreator.Add method. diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/BarItemCollection.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/BarItemCollection.cs similarity index 96% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/BarItemCollection.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/BarItemCollection.cs index fa7919a81a..b9906f2134 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/BarItemCollection.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/BarItemCollection.cs @@ -11,7 +11,7 @@ using System.Collections.ObjectModel; using System.ComponentModel; using System.Windows.Forms; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class BarItem { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/ConvertedFile.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/ConvertedFile.cs similarity index 96% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/ConvertedFile.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/ConvertedFile.cs index 64f2189ddd..68e0a84aee 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/ConvertedFile.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/ConvertedFile.cs @@ -8,7 +8,7 @@ using System; using System.Text; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { /// /// Stores the filename and the code for the converted file. diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/CreatedComponent.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/CreatedComponent.cs similarity index 96% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/CreatedComponent.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/CreatedComponent.cs index 77fd41a59c..c175b694f6 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/CreatedComponent.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/CreatedComponent.cs @@ -8,7 +8,7 @@ using System; using System.ComponentModel; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { /// /// Helper class that stores the component name and type. diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/CreatedInstance.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/CreatedInstance.cs similarity index 97% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/CreatedInstance.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/CreatedInstance.cs index 5fefa7dae6..05b51f1887 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/CreatedInstance.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/CreatedInstance.cs @@ -9,7 +9,7 @@ using System; using System.Collections; using System.Text; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { /// /// Helper class that stores the parameters passed when the IComponentCreator.CreateInstance method is called. diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/CustomUserControl.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/CustomUserControl.cs similarity index 95% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/CustomUserControl.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/CustomUserControl.cs index 52144a68e4..2ff581e0b7 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/CustomUserControl.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/CustomUserControl.cs @@ -9,7 +9,7 @@ using System; using System.ComponentModel; using System.Windows.Forms; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class CustomUserControl : UserControl { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedFormDesignerViewContent.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/DerivedFormDesignerViewContent.cs similarity index 93% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedFormDesignerViewContent.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/DerivedFormDesignerViewContent.cs index 5e23db034c..aeb97f7981 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedFormDesignerViewContent.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/DerivedFormDesignerViewContent.cs @@ -7,10 +7,9 @@ using System; using ICSharpCode.FormsDesigner; -using ICSharpCode.PythonBinding; using ICSharpCode.SharpDevelop.Gui; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { /// /// Derived FormDesignerViewContent class that is used for diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedToolStripMenuItem.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/DerivedToolStripMenuItem.cs similarity index 89% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedToolStripMenuItem.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/DerivedToolStripMenuItem.cs index f7a7bd9ab5..2498da6578 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedToolStripMenuItem.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/DerivedToolStripMenuItem.cs @@ -8,7 +8,7 @@ using System; using System.Windows.Forms; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class DerivedToolStripMenuItem : ToolStripMenuItem { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/DoublePropertyUserControl.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/DoublePropertyUserControl.cs similarity index 92% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/DoublePropertyUserControl.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/DoublePropertyUserControl.cs index 1eb7ff3a36..4ec11b47b8 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/DoublePropertyUserControl.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/DoublePropertyUserControl.cs @@ -8,7 +8,7 @@ using System; using System.Windows.Forms; -namespace RubyBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class DoublePropertyUserControl : UserControl { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/FakeCaret.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeCaret.cs similarity index 95% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/FakeCaret.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/FakeCaret.cs index 07ba5bb10b..5a8f13583f 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/FakeCaret.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeCaret.cs @@ -8,7 +8,7 @@ using System; using ICSharpCode.SharpDevelop.Editor; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class FakeCaret : ITextEditorCaret { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/FakeDocument.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeDocument.cs similarity index 98% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/FakeDocument.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/FakeDocument.cs index 739ae82aa9..aa147fc3f1 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/FakeDocument.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeDocument.cs @@ -12,7 +12,7 @@ using ICSharpCode.NRefactory; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Editor; -namespace RubyBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class FakeDocument : IDocument { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/FakeDocumentLine.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeDocumentLine.cs similarity index 93% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/FakeDocumentLine.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/FakeDocumentLine.cs index 532381a838..a756ad40ae 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/FakeDocumentLine.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeDocumentLine.cs @@ -8,7 +8,7 @@ using System; using ICSharpCode.SharpDevelop.Editor; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class FakeDocumentLine : IDocumentLine { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/FakeLock.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeLock.cs similarity index 90% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/FakeLock.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/FakeLock.cs index 3fb3cfefa6..608dc75893 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/FakeLock.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeLock.cs @@ -7,9 +7,9 @@ using System; using System.Collections.Generic; -using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class FakeLock : ILock { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/FooItemCollection.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/FooItemCollection.cs similarity index 96% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/FooItemCollection.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/FooItemCollection.cs index 21c1f94a7d..20fa1d4795 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/FooItemCollection.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/FooItemCollection.cs @@ -11,7 +11,7 @@ using System.Collections.ObjectModel; using System.ComponentModel; using System.Windows.Forms; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class FooItem { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockComponentCreator.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockComponentCreator.cs similarity index 98% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockComponentCreator.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockComponentCreator.cs index f5661a4b0b..d45d997b58 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockComponentCreator.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockComponentCreator.cs @@ -16,9 +16,10 @@ using System.Globalization; using System.Reflection; using System.Resources; using System.Windows.Forms; -using ICSharpCode.PythonBinding; -namespace PythonBinding.Tests.Utils +using ICSharpCode.Scripting; + +namespace ICSharpCode.Scripting.Tests.Utils { public class MockComponentCreator : IComponentCreator { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockConsoleTextEditorKeyEventArgs.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockConsoleTextEditorKeyEventArgs.cs similarity index 88% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockConsoleTextEditorKeyEventArgs.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockConsoleTextEditorKeyEventArgs.cs index 78652153cd..1c4673e31f 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockConsoleTextEditorKeyEventArgs.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockConsoleTextEditorKeyEventArgs.cs @@ -7,9 +7,9 @@ using System; using System.Windows.Input; -using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting; -namespace RubyBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class MockConsoleTextEditorKeyEventArgs : ConsoleTextEditorKeyEventArgs { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockControlDispatcher.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockControlDispatcher.cs similarity index 92% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockControlDispatcher.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockControlDispatcher.cs index 78ebeae78c..23cefa19be 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockControlDispatcher.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockControlDispatcher.cs @@ -6,9 +6,9 @@ // using System; -using ICSharpCode.RubyBinding; +using ICSharpCode.Scripting; -namespace RubyBinding.Tests.Utils.Tests +namespace ICSharpCode.Scripting.Tests.Utils.Tests { public class MockControlDispatcher : IControlDispatcher { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockDebugger.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockDebugger.cs similarity index 98% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockDebugger.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockDebugger.cs index b970acbc4d..86640c639d 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockDebugger.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockDebugger.cs @@ -10,7 +10,7 @@ using System.Diagnostics; using ICSharpCode.SharpDevelop.Debugging; using ICSharpCode.SharpDevelop.Project; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class MockDebugger : IDebugger { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockDesignerLoaderHost.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockDesignerLoaderHost.cs similarity index 98% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockDesignerLoaderHost.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockDesignerLoaderHost.cs index d50bc05ed6..70251e9963 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockDesignerLoaderHost.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockDesignerLoaderHost.cs @@ -12,7 +12,9 @@ using System.ComponentModel; using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; -namespace PythonBinding.Tests.Utils +using ICSharpCode.Scripting.Tests.Utils; + +namespace ICSharpCode.Scripting.Tests.Utils { /// /// Mock IDesignerLoaderHost implementation. diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockEditableViewContent.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockEditableViewContent.cs similarity index 96% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockEditableViewContent.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockEditableViewContent.cs index 25cc8afda2..c96b5c34b0 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockEditableViewContent.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockEditableViewContent.cs @@ -11,7 +11,7 @@ using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Gui; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { /// /// Mock implementation of the IEditable and IViewContent. diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockEventBindingService.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockEventBindingService.cs similarity index 96% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockEventBindingService.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockEventBindingService.cs index 066e92cd09..d1847fc453 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockEventBindingService.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockEventBindingService.cs @@ -10,7 +10,7 @@ using System.Collections; using System.ComponentModel; using System.ComponentModel.Design; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class MockEventBindingService : EventBindingService { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockEventDescriptor.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockEventDescriptor.cs similarity index 95% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockEventDescriptor.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockEventDescriptor.cs index f788a5dda1..d3f130176b 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockEventDescriptor.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockEventDescriptor.cs @@ -8,7 +8,7 @@ using System; using System.ComponentModel; -namespace RubyBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { /// /// Mock EventDescriptor class. diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockExtenderProviderService.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockExtenderProviderService.cs similarity index 88% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockExtenderProviderService.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockExtenderProviderService.cs index ad25243eba..cde3cd4b8b 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockExtenderProviderService.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockExtenderProviderService.cs @@ -10,11 +10,8 @@ using System.ComponentModel; using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; -namespace RubyBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { - /// - /// Description of MockExtenderProviderService. - /// public class MockExtenderProviderService : IExtenderProviderService { bool languageExtendersAdded; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/MockMemberProvider.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockMemberProvider.cs similarity index 95% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/MockMemberProvider.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockMemberProvider.cs index 8c9092cc82..acc7fade9c 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/MockMemberProvider.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockMemberProvider.cs @@ -7,9 +7,9 @@ using System; using System.Collections.Generic; -using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting; -namespace PythonBinding.Tests.Console +namespace ICSharpCode.Scripting.Tests.Console { public class MockMemberProvider : IMemberProvider { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockOpenedFile.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockOpenedFile.cs similarity index 90% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockOpenedFile.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockOpenedFile.cs index e6c30595dc..a002dbac51 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockOpenedFile.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockOpenedFile.cs @@ -10,11 +10,8 @@ using System.Collections.Generic; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Gui; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { - /// - /// Mock OpenedFile class. - /// public class MockOpenedFile : OpenedFile { public MockOpenedFile() diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockProject.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockProject.cs similarity index 98% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockProject.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockProject.cs index 4614d3106e..ffbeeee332 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockProject.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockProject.cs @@ -13,11 +13,8 @@ using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Internal.Templates; using ICSharpCode.SharpDevelop.Project; -namespace RubyBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { - /// - /// MockProject. - /// public class MockProject : IProject { readonly object syncRoot = new object(); diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockPropertyDescriptor.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockPropertyDescriptor.cs similarity index 97% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockPropertyDescriptor.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockPropertyDescriptor.cs index ba6666dbfa..61aae6f95c 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockPropertyDescriptor.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockPropertyDescriptor.cs @@ -9,7 +9,7 @@ using System; using System.ComponentModel; using System.Windows.Forms; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class MockPropertyDescriptor : PropertyDescriptor { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockResourceReader.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockResourceReader.cs similarity index 95% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockResourceReader.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockResourceReader.cs index 1229559865..36b71ca69f 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockResourceReader.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockResourceReader.cs @@ -10,7 +10,7 @@ using System.Collections; using System.Collections.Generic; using System.Resources; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class MockResourceReader : IResourceReader { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockResourceService.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockResourceService.cs similarity index 96% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockResourceService.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockResourceService.cs index 7a8680fc66..45c13dfc1b 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockResourceService.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockResourceService.cs @@ -10,7 +10,7 @@ using System.ComponentModel.Design; using System.Globalization; using System.Resources; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class MockResourceService : IResourceService { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockResourceWriter.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockResourceWriter.cs similarity index 96% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockResourceWriter.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockResourceWriter.cs index 777cc49294..f34b356115 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockResourceWriter.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockResourceWriter.cs @@ -9,7 +9,7 @@ using System; using System.Collections.Generic; using System.Resources; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class MockResourceWriter : IResourceWriter { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockTextEditor.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockTextEditor.cs similarity index 98% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockTextEditor.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockTextEditor.cs index cef4e6153c..39a7e4c668 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockTextEditor.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockTextEditor.cs @@ -9,7 +9,7 @@ using System; using System.Windows.Input; using ICSharpCode.SharpDevelop.Editor; -namespace RubyBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class MockTextEditor : ITextEditor { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockTextEditorOptions.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockTextEditorOptions.cs similarity index 94% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockTextEditorOptions.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockTextEditorOptions.cs index e24f15baac..5ddf46b96b 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockTextEditorOptions.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockTextEditorOptions.cs @@ -9,7 +9,7 @@ using System; using ICSharpCode.AvalonEdit; using ICSharpCode.SharpDevelop.Editor; -namespace RubyBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class MockTextEditorOptions : TextEditorOptions, ITextEditorOptions { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockTextEditorViewContent.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockTextEditorViewContent.cs similarity index 95% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockTextEditorViewContent.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockTextEditorViewContent.cs index 7fe0b9a631..fced1b5fa4 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockTextEditorViewContent.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockTextEditorViewContent.cs @@ -11,7 +11,7 @@ using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Editor.AvalonEdit; -namespace RubyBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { /// /// A mock IViewContent implementation that also implements the diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockTypeResolutionService.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockTypeResolutionService.cs similarity index 92% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockTypeResolutionService.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockTypeResolutionService.cs index d52e52cf7b..a8076531a7 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockTypeResolutionService.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockTypeResolutionService.cs @@ -11,11 +11,8 @@ using System.Drawing; using System.Reflection; using System.Windows.Forms; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { - /// - /// Mock implementation of the ITypeResolutionService interface. - /// public class MockTypeResolutionService : ITypeResolutionService { string lastTypeNameResolved; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockViewContent.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockViewContent.cs similarity index 97% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockViewContent.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/MockViewContent.cs index a18b61c9d4..44f80e696b 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockViewContent.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockViewContent.cs @@ -13,11 +13,8 @@ using ICSharpCode.Core; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Gui; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { - /// - /// Dummy IViewContent class. - /// public class MockViewContent : IViewContent { FileName fileName; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/NullPropertyUserControl.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/NullPropertyUserControl.cs similarity index 91% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/NullPropertyUserControl.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/NullPropertyUserControl.cs index ae3ff4549e..6b92a44a30 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/NullPropertyUserControl.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/NullPropertyUserControl.cs @@ -8,7 +8,7 @@ using System; using System.Windows.Forms; -namespace PythonBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class NullPropertyUserControl : UserControl { diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/SupportInitCustomControl.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/SupportInitCustomControl.cs similarity index 96% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/SupportInitCustomControl.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/SupportInitCustomControl.cs index 5eec9fc60a..b34d181324 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/SupportInitCustomControl.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/SupportInitCustomControl.cs @@ -9,7 +9,7 @@ using System; using System.ComponentModel; using System.Windows.Forms; -namespace RubyBinding.Tests.Utils +namespace ICSharpCode.Scripting.Tests.Utils { public class SupportInitCustomControl : UserControl, ISupportInitialize { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/Tests/MockComponentCreatorTests.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/MockComponentCreatorTests.cs similarity index 89% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/Tests/MockComponentCreatorTests.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/MockComponentCreatorTests.cs index ab781509c7..cc8b937a4c 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/Tests/MockComponentCreatorTests.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/MockComponentCreatorTests.cs @@ -7,11 +7,10 @@ using System; using System.Data; -using ICSharpCode.PythonBinding; using NUnit.Framework; -using PythonBinding.Tests.Utils; +using ICSharpCode.Scripting.Tests.Utils; -namespace PythonBinding.Tests.Utils.Tests +namespace ICSharpCode.Scripting.Tests.Utils.Tests { [TestFixture] public class MockComponentCreatorTests diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/Tests/MockControlDispatcherTestFixture.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/MockControlDispatcherTestFixture.cs similarity index 93% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/Tests/MockControlDispatcherTestFixture.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/MockControlDispatcherTestFixture.cs index 48d9534f6c..4db80dd756 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/Tests/MockControlDispatcherTestFixture.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/MockControlDispatcherTestFixture.cs @@ -6,11 +6,10 @@ // using System; -using ICSharpCode.RubyBinding; using NUnit.Framework; -using RubyBinding.Tests.Utils; +using ICSharpCode.Scripting.Tests.Utils; -namespace RubyBinding.Tests.Utils.Tests +namespace ICSharpCode.Scripting.Tests.Utils.Tests { [TestFixture] public class MockControlDispatcherTestFixture diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/Tests/MockEditableViewContentTestFixture.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/MockEditableViewContentTestFixture.cs similarity index 92% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/Tests/MockEditableViewContentTestFixture.cs rename to src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/MockEditableViewContentTestFixture.cs index dda354a795..bc980efda6 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/Tests/MockEditableViewContentTestFixture.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/MockEditableViewContentTestFixture.cs @@ -11,9 +11,9 @@ using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Gui; using NUnit.Framework; -using PythonBinding.Tests.Utils; +using ICSharpCode.Scripting.Tests.Utils; -namespace PythonBinding.Tests.Utils.Tests +namespace ICSharpCode.Scripting.Tests.Utils.Tests { [TestFixture] public class MockEditableViewContentTestFixture diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs index 2679398fdc..32bfd0c268 100644 --- a/src/Setup/Files.wxs +++ b/src/Setup/Files.wxs @@ -438,6 +438,9 @@ + + + diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs index 0d4b3c3b6d..a26b8195b0 100644 --- a/src/Setup/Setup.wxs +++ b/src/Setup/Setup.wxs @@ -391,6 +391,7 @@ +