Move AddInPathHelper to Scripting Tests project.

src/AddIns/BackendBindings/Python/PythonBinding/Test/Configuration/AddInOptionsTestFixture.cs

@@ -9,6 +9,7 @@ using System;
 using System.IO;
 using ICSharpCode.Core;
 using ICSharpCode.PythonBinding;
+using ICSharpCode.Scripting.Tests.Utils;
 using NUnit.Framework;
 using PythonBinding.Tests.Utils;
 
@@ -27,7 +28,8 @@ namespace PythonBinding.Tests.Configuration
 		[TestFixtureSetUp]
 		public void SetUpFixture()
 		{
-			addin = AddInPathHelper.CreateDummyPythonAddInInsideAddInTree();
+			AddInPathHelper helper = new AddInPathHelper("PythonBinding");
+			addin = helper.CreateDummyAddInInsideAddInTree();
 			addin.FileName = @"C:\Projects\SD\AddIns\Python\pythonbinding.addin";
 		}
 		

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

@@ -425,7 +425,6 @@
     <Compile Include="Testing\PythonTestResultStackTraceLineNumberOverflowTestFixture.cs" />
     <Compile Include="Testing\PythonTestRunnerResponseFileTestFixture.cs" />
     <Compile Include="Testing\PythonTestRunnerRunsSelectedTestMethodTestFixture.cs" />
-    <Compile Include="Utils\AddInPathHelper.cs" />
     <Compile Include="Utils\BrowseButtonInfo.cs" />
     <Compile Include="Utils\BrowseFolderButtonInfo.cs" />
     <Compile Include="Utils\DerivedApplicationSettingsPanel.cs" />
@@ -443,7 +442,6 @@
     <Compile Include="Utils\MockWorkbench.cs" />
     <Compile Include="Utils\PythonMSBuildEngineHelper.cs" />
     <Compile Include="Utils\TestablePythonConsole.cs" />
-    <Compile Include="Utils\Tests\AddInPathHelperTestFixture.cs" />
     <EmbeddedResource Include="..\Project\PythonBinding.addin">
       <Link>PythonBinding.addin</Link>
     </EmbeddedResource>

src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/PythonTestDebuggerRunsSelectedTestMethodTestFixture.cs

@@ -9,8 +9,10 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
+
 using ICSharpCode.Core;
 using ICSharpCode.PythonBinding;
+using ICSharpCode.Scripting.Tests.Utils;
 using ICSharpCode.SharpDevelop.Dom;
 using ICSharpCode.UnitTesting;
 using NUnit.Framework;
@@ -110,7 +112,8 @@ namespace PythonBinding.Tests.Testing
 		[Test]
 		public void CommandLineArgumentHasSharpDevelopTestPythonScriptAndResponseFileName()
 		{
-			AddIn addin = AddInPathHelper.CreateDummyPythonAddInInsideAddInTree();
+			AddInPathHelper helper = new AddInPathHelper("PythonBinding");
+			AddIn addin = helper.CreateDummyAddInInsideAddInTree();
 			addin.FileName = @"c:\sharpdevelop\addins\pythonbinding\pythonbinding.addin";
 			
 			RunTestsOnSelectedTestMethod();

src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/PythonTestRunnerRunsSelectedTestMethodTestFixture.cs

@@ -9,8 +9,10 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
+
 using ICSharpCode.Core;
 using ICSharpCode.PythonBinding;
+using ICSharpCode.Scripting.Tests.Utils;
 using ICSharpCode.SharpDevelop.Dom;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.UnitTesting;
@@ -97,7 +99,8 @@ namespace PythonBinding.Tests.Testing
 		[Test]
 		public void CommandLineArgumentHasSharpDevelopTestPythonScriptAndResponseFileName()
 		{
-			AddIn addin = AddInPathHelper.CreateDummyPythonAddInInsideAddInTree();
+			AddInPathHelper helper = new AddInPathHelper("PythonBinding");
+			AddIn addin = helper.CreateDummyAddInInsideAddInTree();
 			addin.FileName = @"c:\sharpdevelop\addins\pythonbinding\pythonbinding.addin";
 			
 			RunTestsOnSelectedTestMethod();

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

@@ -323,7 +323,6 @@
     <Compile Include="Testing\RubyTestRunnerApplicationTests.cs" />
     <Compile Include="Testing\RubyTestRunnerRunsSelectedTestMethodTestFixture.cs" />
     <Compile Include="Testing\RubyTestRunnerResponseFileTestFixture.cs" />
-    <Compile Include="Utils\AddInPathHelper.cs" />
     <Compile Include="Utils\DerivedConvertProjectToRubyProjectCommand.cs" />
     <Compile Include="Utils\DerivedRubyAddInOptions.cs" />
     <Compile Include="Utils\DerivedRubyConsoleHost.cs" />
@@ -340,7 +339,6 @@
     <Compile Include="Utils\RubyParserHelper.cs" />
     <Compile Include="Utils\RubySelectedTestsHelper.cs" />
     <Compile Include="Utils\TestableRubyConsole.cs" />
-    <Compile Include="Utils\Tests\AddInPathHelperTestFixture.cs" />
     <Compile Include="Utils\Tests\MockRubyFileServiceTestFixture.cs" />
     <EmbeddedResource Include="..\Project\RubyBinding.addin">
       <Link>RubyBinding.addin</Link>

src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyTestDebuggerRunsSelectedTestMethodTestFixture.cs

@@ -9,8 +9,10 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
+
 using ICSharpCode.Core;
 using ICSharpCode.RubyBinding;
+using ICSharpCode.Scripting.Tests.Utils;
 using ICSharpCode.SharpDevelop.Dom;
 using ICSharpCode.UnitTesting;
 using NUnit.Framework;
@@ -109,7 +111,8 @@ namespace RubyBinding.Tests.Testing
 		[Test]
 		public void CommandLineArgumentHasSharpDevelopTestRubyScriptFileNameAndTestResultsFileNameResponseFileName()
 		{
-			AddIn addin = AddInPathHelper.CreateDummyRubyAddInInsideAddInTree();
+			AddInPathHelper helper = new AddInPathHelper("RubyBinding");
+			AddIn addin = helper.CreateDummyAddInInsideAddInTree();
 			addin.FileName = @"c:\sharpdevelop\addins\rubybinding\rubybinding.addin";
 				
 			testResultsMonitor.FileName = @"d:\testresults.txt";

src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyTestRunnerApplicationTests.cs

@@ -6,10 +6,12 @@
 // </file>
 
 using System;
-using System.IO;
 using System.Diagnostics;
+using System.IO;
+
 using ICSharpCode.Core;
 using ICSharpCode.RubyBinding;
+using ICSharpCode.Scripting.Tests.Utils;
 using ICSharpCode.SharpDevelop.Dom;
 using ICSharpCode.SharpDevelop.Project;
 using ICSharpCode.UnitTesting;
@@ -37,7 +39,8 @@ namespace RubyBinding.Tests.Testing
 			Properties properties = new Properties();
 			options = new RubyAddInOptions(properties);
 
-			AddIn addin = AddInPathHelper.CreateDummyRubyAddInInsideAddInTree();
+			AddInPathHelper helper = new AddInPathHelper("RubyBinding");
+			AddIn addin = helper.CreateDummyAddInInsideAddInTree();
 			addin.FileName = @"c:\rubybinding\rubybinding.addin";
 
 			string testResultsFileName = "results.txt";
@@ -91,7 +94,8 @@ namespace RubyBinding.Tests.Testing
 		[Test]
 		public void CreateProcessInfoReturnsFixedTestRunnerFilePath()
 		{
-			AddIn addin = AddInPathHelper.CreateDummyRubyAddInInsideAddInTree();
+			AddInPathHelper helper = new AddInPathHelper("RubyBinding");
+			AddIn addin = helper.CreateDummyAddInInsideAddInTree();
 			addin.FileName = @"c:\rubybinding\bin\..\AddIns\rubybinding.addin";
 			
 			MockCSharpProject project = new MockCSharpProject();

src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyTestRunnerRunsSelectedTestMethodTestFixture.cs

@@ -9,8 +9,10 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
+
 using ICSharpCode.Core;
 using ICSharpCode.RubyBinding;
+using ICSharpCode.Scripting.Tests.Utils;
 using ICSharpCode.SharpDevelop.Dom;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.UnitTesting;
@@ -90,7 +92,8 @@ namespace RubyBinding.Tests.Testing
 		[Test]
 		public void CommandLineArgumentHasSharpDevelopTestRubyScriptFileNameAndTestResultsFileNameAndResponseFileName()
 		{
-			AddIn addin = AddInPathHelper.CreateDummyRubyAddInInsideAddInTree();
+			AddInPathHelper helper = new AddInPathHelper("RubyBinding");
+			AddIn addin = helper.CreateDummyAddInInsideAddInTree();
 			addin.FileName = @"c:\sharpdevelop\addins\rubybinding\rubybinding.addin";
 			
 			testResultsMonitor.FileName = @"d:\testresults.txt";

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

@@ -1,60 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.IO;
-using ICSharpCode.Core;
-
-namespace RubyBinding.Tests.Utils
-{
-	public static class AddInPathHelper
-	{
-		public static AddIn CreateDummyRubyAddInInsideAddInTree()
-		{
-			RemoveOldAddIn();
-			AddIn addin = CreateAddIn();
-			AddInTree.InsertAddIn(addin);
-			return addin;
-		}
-		
-		static void RemoveOldAddIn()
-		{
-			AddIn oldAddin = FindOldAddIn();
-			if (oldAddin != null) {
-				AddInTree.RemoveAddIn(oldAddin);
-			}
-		}
-		
-		static AddIn FindOldAddIn()
-		{
-			foreach (AddIn addin in AddInTree.AddIns) {
-				if (addin.Manifest.PrimaryIdentity == "ICSharpCode.RubyBinding") {
-					return addin;
-				}
-			}
-			return null;
-		}
-		
-		static AddIn CreateAddIn()
-		{
-			string xml = GetAddInXml();
-			AddIn addin = AddIn.Load(new StringReader(xml));
-			addin.FileName = @"C:\SharpDevelop\AddIns\RubyBinding\RubyBinding.addin";
-			return addin;
-		}
-		
-		static string GetAddInXml()
-		{
-			return
-				"<AddIn name='RubyBinding' author= '' copyright='' description=''>\r\n" +
-				"    <Manifest>\r\n" +
-				"        <Identity name='ICSharpCode.RubyBinding'/>\r\n" +
-				"    </Manifest>\r\n" +
-				"</AddIn>";
-		}
-	}
-}

src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/Tests/AddInPathHelperTestFixture.cs

@@ -1,50 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.Core;
-using NUnit.Framework;
-using RubyBinding.Tests.Utils;
-
-namespace RubyBinding.Tests.Utils.Tests
-{
-	[TestFixture]
-	public class AddInPathHelperTestFixture
-	{
-		AddIn rubyAddIn;
-		
-		[SetUp]
-		public void Init()
-		{
-			rubyAddIn = AddInPathHelper.CreateDummyRubyAddInInsideAddInTree();
-		}
-		
-		[Test]
-		public void AddInFileNameIsCDriveSharpDevelopAddInsRubyBindingRubyBindingAddIn()
-		{
-			string expectedFileName = @"C:\SharpDevelop\AddIns\RubyBinding\RubyBinding.addin";
-			Assert.AreEqual(expectedFileName, rubyAddIn.FileName);
-		}
-		
-		[Test]
-		public void StringParserAddInPathIsCDriveSharpDevelopAddInsRubyBindingForRubyBindingAddIn()
-		{
-			string directory = StringParser.Parse("${addinpath:ICSharpCode.RubyBinding}");
-			string expectedDirectory = @"C:\SharpDevelop\AddIns\RubyBinding";
-			Assert.AreEqual(expectedDirectory, directory);
-		}
-		
-		[Test]
-		public void ChangingAddInFileNameReturnsExpectedFileNameFromStringParserAddInPath()
-		{
-			rubyAddIn.FileName = @"c:\def\pythonbinding.addin";
-			string expectedDirectory = @"c:\def";
-			string actualDirectory = StringParser.Parse("${addinpath:ICSharpCode.RubyBinding}");
-			Assert.AreEqual(expectedDirectory, actualDirectory);
-		}
-	}
-}

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

@@ -78,6 +78,7 @@
     <Compile Include="Testing\CreateTextWriterInfoEqualsTestFixture.cs" />
     <Compile Include="Utils\AddedComponent.cs" />
     <Compile Include="Utils\AddInHelper.cs" />
+    <Compile Include="Utils\AddInPathHelper.cs" />
     <Compile Include="Utils\BarItemCollection.cs" />
     <Compile Include="Utils\ConvertedFile.cs" />
     <Compile Include="Utils\CreatedComponent.cs" />
@@ -118,6 +119,7 @@
     <Compile Include="Utils\MSBuildEngineHelper.cs" />
     <Compile Include="Utils\NullPropertyUserControl.cs" />
     <Compile Include="Utils\SupportInitCustomControl.cs" />
+    <Compile Include="Utils\Tests\AddInPathHelperTests.cs" />
     <Compile Include="Utils\Tests\MockComponentCreatorTests.cs" />
     <Compile Include="Utils\Tests\MockConsoleTextEditorTests.cs" />
     <Compile Include="Utils\Tests\MockControlDispatcherTestFixture.cs" />

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

@@ -9,11 +9,22 @@ using System;
 using System.IO;
 using ICSharpCode.Core;
 
-namespace PythonBinding.Tests.Utils
+namespace ICSharpCode.Scripting.Tests.Utils
 {
-	public static class AddInPathHelper
+	public class AddInPathHelper
 	{
-		public static AddIn CreateDummyPythonAddInInsideAddInTree()
+		string addInName;
+		string identity;
+		string fileName;
+		
+		public AddInPathHelper(string addInName)
+		{
+			this.addInName = addInName;
+			identity = String.Format("ICSharpCode.{0}", addInName);
+			fileName = String.Format(@"C:\SharpDevelop\AddIns\{0}\{0}.addin", addInName);
+		}
+		
+		public AddIn CreateDummyAddInInsideAddInTree()
 		{
 			RemoveOldAddIn();
 			AddIn addin = CreateAddIn();
@@ -21,7 +32,7 @@ namespace PythonBinding.Tests.Utils
 			return addin;
 		}
 		
-		static void RemoveOldAddIn()
+		void RemoveOldAddIn()
 		{
 			AddIn oldAddin = FindOldAddIn();
 			if (oldAddin != null) {
@@ -29,32 +40,34 @@ namespace PythonBinding.Tests.Utils
 			}
 		}
 		
-		static AddIn FindOldAddIn()
+		AddIn FindOldAddIn()
 		{
 			foreach (AddIn addin in AddInTree.AddIns) {
-				if (addin.Manifest.PrimaryIdentity == "ICSharpCode.PythonBinding") {
+				if (addin.Manifest.PrimaryIdentity == identity) {
 					return addin;
 				}
 			}
 			return null;
 		}
 		
-		static AddIn CreateAddIn()
+		AddIn CreateAddIn()
 		{
 			string xml = GetAddInXml();
 			AddIn addin = AddIn.Load(new StringReader(xml));
-			addin.FileName = @"C:\SharpDevelop\AddIns\PythonBinding\PythonBinding.addin";
+			addin.FileName = fileName;
 			return addin;
 		}
 		
-		static string GetAddInXml()
+		string GetAddInXml()
 		{
-			return
-				"<AddIn name='PythonBinding' author= '' copyright='' description=''>\r\n" +
+			string format =
+				"<AddIn name='{0}' author= '' copyright='' description=''>\r\n" +
 				"    <Manifest>\r\n" +
-				"        <Identity name='ICSharpCode.PythonBinding'/>\r\n" +
+				"        <Identity name='{1}'/>\r\n" +
 				"    </Manifest>\r\n" +
 				"</AddIn>";
+
+			return String.Format(format, addInName, identity);
 		}
 	}
 }

src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/AddInPathHelperTests.cs

@@ -7,10 +7,10 @@
 
 using System;
 using ICSharpCode.Core;
+using ICSharpCode.Scripting.Tests.Utils;
 using NUnit.Framework;
-using PythonBinding.Tests.Utils;
 
-namespace PythonBinding.Tests.Utils.Tests
+namespace ICSharpCode.Scripting.Tests.Utils.Tests
 {
 	[TestFixture]
 	public class AddInPathHelperTestFixture
@@ -20,7 +20,8 @@ namespace PythonBinding.Tests.Utils.Tests
 		[SetUp]
 		public void Init()
 		{
-			pythonAddIn = AddInPathHelper.CreateDummyPythonAddInInsideAddInTree();
+			AddInPathHelper helper = new AddInPathHelper("PythonBinding");
+			pythonAddIn = helper.CreateDummyAddInInsideAddInTree();
 		}
 		
 		[Test]