Introduce SDTestFixtureBase to initialize/tear down the static service container.

src/AddIns/Analysis/UnitTesting/Test/NUnit/CreateNUnitTestRunnerTestFixture.cs

@@ -7,6 +7,7 @@ using UnitTesting.Tests.Utils;
 using NUnit.Framework;
 using Rhino.Mocks;
 using ICSharpCode.SharpDevelop.Project;
+using ICSharpCode.SharpDevelop;
 
 namespace UnitTesting.Tests.NUnit
 {

src/AddIns/Analysis/UnitTesting/Test/NUnit/NUnitConsoleCommandLineTests.cs

@@ -9,6 +9,7 @@ using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using NUnit.Framework;
 using UnitTesting.Tests.Utils;
+using ICSharpCode.SharpDevelop;
 
 namespace UnitTesting.Tests.NUnit
 {

src/AddIns/Analysis/UnitTesting/Test/NUnit/NUnitConsoleExeSelectedTestFixture.cs

@@ -7,6 +7,7 @@ using ICSharpCode.SharpDevelop.Project;
 using NUnit.Framework;
 using ICSharpCode.UnitTesting;
 using UnitTesting.Tests.Utils;
+using ICSharpCode.SharpDevelop;
 
 namespace UnitTesting.Tests.NUnit
 {

src/AddIns/Analysis/UnitTesting/Test/NUnit/NUnitConsoleProcessStartInfoTestFixture.cs

@@ -5,6 +5,7 @@ using System;
 using System.Diagnostics;
 using ICSharpCode.Core;
 using ICSharpCode.UnitTesting;
+using ICSharpCode.SharpDevelop;
 using NUnit.Framework;
 using UnitTesting.Tests.Utils;
 

src/AddIns/Analysis/UnitTesting/Test/UnitTesting.Tests.csproj

@@ -75,11 +75,6 @@
     <Compile Include="NUnit\NUnitTestResultFailureTestFixture.cs" />
     <Compile Include="Utils\MockCSharpProject.cs" />
     <Compile Include="Utils\AssemblyLoader.cs" />
-    <Compile Include="Utils\SDTestFixtureBase.cs" />
-    <None Include="..\..\..\..\..\bin\SharpDevelop.exe">
-      <Link>SharpDevelop.exe</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
@@ -90,6 +85,10 @@
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj">
+      <Project>{4980B743-B32F-4aba-AABD-45E2CAD3568D}</Project>
+      <Name>ICSharpCode.SharpDevelop.Tests</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">
       <Project>{8035765F-D51F-4A0C-A746-2FD100E19419}</Project>
       <Name>ICSharpCode.SharpDevelop.Widgets</Name>

src/AddIns/BackendBindings/CSharpBinding/Tests/OverrideCompletionTests.cs

@@ -65,6 +65,12 @@ class DerivedClass : BaseClass {
 			keyPressResult = completion.HandleKeyPressed(textEditor, ' ');
 		}
 		
+		[TearDown]
+		public void TearDown()
+		{
+			SD.TearDownForUnitTests();
+		}
+		
 		[Test]
 		public void CheckKeyPressResult()
 		{

src/AddIns/DisplayBindings/XmlEditor/Test/Editor/RegisteredXmlSchemasEditorTestFixture.cs

@@ -14,7 +14,7 @@ using XmlEditor.Tests.Utils;
 namespace XmlEditor.Tests.Editor
 {
 	[TestFixture]
-	public class RegisteredXmlSchemasEditorTestFixture
+	public class RegisteredXmlSchemasEditorTestFixture : SDTestFixtureBase
 	{
 		RegisteredXmlSchemasEditor schemasEditor;
 		MockXmlSchemaCompletionDataFactory factory;
@@ -30,7 +30,6 @@ namespace XmlEditor.Tests.Editor
 		[SetUp]
 		public void Init()
 		{
-			SD.InitializeForUnitTests();
 			LoadBarSchema();
 			LoadFooSchema();
 			fooSchemaData.IsReadOnly = true;

src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AddElementsToTreeControlTestFixture.cs

@@ -13,15 +13,14 @@ using XmlEditor.Tests.Utils;
 namespace XmlEditor.Tests.Tree
 {
 	[TestFixture]
-	public class AddElementsToTreeControlTestFixture
+	public class AddElementsToTreeControlTestFixture : SDTestFixtureBase
 	{
 		XmlDocument doc;
 		XmlElementTreeNode rootNode;
 		
-		[SetUp]
+		public override void FixtureSetUp()
-		public void SetUpFixture()
 		{
-			SD.InitializeForUnitTests();
+			base.FixtureSetUp();
 			using (DerivedXmlTreeViewContainerControl treeViewContainer = new DerivedXmlTreeViewContainerControl()) {
 				treeViewContainer.LoadXml("<root/>");
 				

src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AddNewNodeDialogTestFixture.cs

@@ -22,7 +22,7 @@ namespace XmlEditor.Tests.Tree
 	/// since their behaviour is the same.
 	/// </summary>
 	[TestFixture]
-	public class AddNewNodeDialogTestFixture
+	public class AddNewNodeDialogTestFixture : SDTestFixtureBase
 	{
 		DerivedAddXmlNodeDialog dialog;
 		ListBox namesListBox;
@@ -33,12 +33,6 @@ namespace XmlEditor.Tests.Tree
 		Label customNameTextBoxLabel;
 		Panel bottomPanel;
 		
-		[TestFixtureSetUp]
-		public void SetUpFixture()
-		{
-			SD.InitializeForUnitTests();
-		}
-		
 		[SetUp]
 		public void Init()
 		{

src/AddIns/DisplayBindings/XmlEditor/Test/Tree/EditCommentNodesInTreeControlTestFixture.cs

@@ -64,6 +64,7 @@ namespace XmlEditor.Tests.Tree
 			if (treeViewContainer != null) {
 				treeViewContainer.Dispose();
 			}
+			SD.TearDownForUnitTests();
 		}
 		
 		/// <summary>

src/AddIns/DisplayBindings/XmlEditor/Test/Tree/MenuCommandsTestFixture.cs

@@ -17,7 +17,7 @@ namespace XmlEditor.Tests.Tree
 	/// Xml Tree (e.g. InsertElementBeforeCommand).
 	/// </summary>
 	[TestFixture]
-	public class MenuCommandsTestFixture
+	public class MenuCommandsTestFixture : SDTestFixtureBase
 	{
 		DerivedXmlTreeViewContainerControl treeViewContainer;
 		XmlDocument doc;
@@ -29,7 +29,6 @@ namespace XmlEditor.Tests.Tree
 		[SetUp]
 		public void Init()
 		{
-			SD.InitializeForUnitTests();
 			treeViewContainer = new DerivedXmlTreeViewContainerControl();
 			treeViewContainer.LoadXml("<html><body></body></html>");
 			doc = treeViewContainer.Document;

src/AddIns/DisplayBindings/XmlEditor/Test/Tree/MouseDownTestFixture.cs

@@ -29,7 +29,7 @@ namespace XmlEditor.Tests.Tree
 		List<TreeViewEventArgs> treeViewEventArgs;
 		
 		[SetUp]
-		public void SetUpFixture()
+		public void SetUp()
 		{
 			SD.InitializeForUnitTests();
 			SD.Services.AddMockService<IWinFormsService>();
@@ -43,12 +43,13 @@ namespace XmlEditor.Tests.Tree
 		}
 		
 		[TearDown]
-		public void TearDownFixture()
+		public void TearDown()
 		{
 			if (treeView != null) {
 				treeView.AfterSelect -= XmlTreeViewAfterSelect;
 				treeView.Dispose();
 			}
+			SD.TearDownForUnitTests();
 		}
 		
 		/// <summary>

src/AddIns/DisplayBindings/XmlEditor/Test/Tree/OwnerStatusTestFixture.cs

@@ -14,7 +14,7 @@ namespace XmlEditor.Tests.Tree
 	/// Tests the XmlTreeViewContainerControl.OwnerState property.
 	/// </summary>
 	[TestFixture]
-	public class OwnerStatusTestFixture
+	public class OwnerStatusTestFixture : SDTestFixtureBase
 	{
 		DerivedXmlTreeViewContainerControl treeViewContainer;
 		XmlTreeViewControl treeView;
@@ -28,7 +28,6 @@ namespace XmlEditor.Tests.Tree
 		[SetUp]
 		public void Init()
 		{
-			SD.InitializeForUnitTests();
 			treeViewContainer = new DerivedXmlTreeViewContainerControl();
 			treeViewContainer.LoadXml("<!-- comment --><html><body class='a'><p>Text</p></body></html>");
 			doc = treeViewContainer.Document;

src/AddIns/DisplayBindings/XmlEditor/Test/Tree/PasteInTreeControlTestFixture.cs

@@ -16,7 +16,7 @@ namespace XmlEditor.Tests.Tree
 	/// Tests pasting in the XmlTreeViewContainerControl.
 	/// </summary>
 	[TestFixture]
-	public class PasteInTreeControlTestFixture
+	public class PasteInTreeControlTestFixture : SDTestFixtureBase
 	{
 		XmlDocument doc;
 		DerivedXmlTreeViewContainerControl treeViewContainerControl; 
@@ -36,7 +36,6 @@ namespace XmlEditor.Tests.Tree
 		[SetUp]
 		public void SetUp()
 		{
-			SD.InitializeForUnitTests();
 			treeViewContainerControl = new DerivedXmlTreeViewContainerControl();
 			treeView = treeViewContainerControl.TreeView;
 			treeViewContainerControl.LoadXml(GetXml());

src/AddIns/DisplayBindings/XmlEditor/Test/Tree/RootNodeAddedToTreeControlTestFixture.cs

@@ -25,7 +25,6 @@ namespace XmlEditor.Tests.Tree
 		[TestFixtureSetUp]
 		public void SetUpFixture()
 		{
-			SD.InitializeForUnitTests();
 			using (DerivedXmlTreeViewContainerControl treeViewContainer = new DerivedXmlTreeViewContainerControl()) {
 				treeViewContainer.LoadXml("<test/>");
 				

src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewClipboardHandlerTestFixture.cs

@@ -66,6 +66,7 @@ namespace XmlEditor.Tests.Tree
 			if (xmlView != null) {
 				xmlView.Dispose();
 			}
+			SD.TearDownForUnitTests();
 		}
 		
 		[Test]

src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewTestFixtureBase.cs

@@ -16,7 +16,6 @@ namespace XmlEditor.Tests.Tree
 		
 		public void InitFixture()
 		{
-			SD.InitializeForUnitTests();
 			mockXmlTreeView = new MockXmlTreeView();
 			editor = new XmlTreeEditor(mockXmlTreeView, Schemas, DefaultSchemaCompletion);
 			editor.LoadXml(GetXml());

src/AddIns/Misc/SearchAndReplace/Test/FindNextWithCursorAtEndTestFixture.cs

@@ -26,14 +26,13 @@ namespace SearchAndReplace.Tests
 	/// </summary>
 	[TestFixture]
 	[Ignore("FindNext fails because no editor is open (??)")]
-	public class FindNextWithCursorAtEndTestFixture
+	public class FindNextWithCursorAtEndTestFixture : SDTestFixtureBase
 	{
 		SearchResultMatch result = null;
 		
-		[SetUp]
+		public override void FixtureSetUp()
-		public void SetUp()
 		{
-			SD.InitializeForUnitTests();
+			base.FixtureSetUp();
 			SD.Services.AddService(typeof(IWorkbench), MockRepository.GenerateStub<IWorkbench>());
 			
 			// Set up SearchOptions required by the BruteForceSearchStrategy.

src/AddIns/Misc/SearchAndReplace/Test/SearchAndReplace.Tests.csproj

@@ -65,6 +65,10 @@
       <Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
       <Name>ICSharpCode.SharpDevelop</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj">
+      <Project>{4980B743-B32F-4aba-AABD-45E2CAD3568D}</Project>
+      <Name>ICSharpCode.SharpDevelop.Tests</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Main\Core\Project\ICSharpCode.Core.csproj">
       <Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
       <Name>ICSharpCode.Core</Name>

src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj

@@ -94,6 +94,7 @@
     <Compile Include="GenericResolverTests.cs" />
     <Compile Include="InnerClassesResolverTests.cs" />
     <Compile Include="RefactoringTests.cs" />
+    <Compile Include="SDTestFixtureBase.cs" />
     <Compile Include="SearchClassTests.cs" />
     <Compile Include="OverloadFinding.cs" />
     <Compile Include="SearchGenericClassTests.cs" />

src/Main/Base/Test/SDTestFixtureBase.cs

@@ -3,9 +3,8 @@
 
 using System;
 using NUnit.Framework;
-using ICSharpCode.SharpDevelop;
 
-namespace UnitTesting.Tests.Utils
+namespace ICSharpCode.SharpDevelop
 {
 	/// <summary>
 	/// Base class for test fixtures that use SD services.

src/Main/Base/Test/ServiceReferences/DirectoryNodeFactoryTests.cs

@@ -12,14 +12,8 @@ using Rhino.Mocks;
 namespace ICSharpCode.SharpDevelop.Tests.ServiceReferences
 {
 	[TestFixture]
-	public class DirectoryNodeFactoryTests
+	public class DirectoryNodeFactoryTests : SDTestFixtureBase
 	{
-		[TestFixtureSetUpAttribute]
-		public void FixtureSetUp()
-		{
-			SD.InitializeForUnitTests();
-		}
-		
 		MSBuildBasedProject project;
 		
 		void CreateProject()

src/Main/Base/Test/ServiceReferences/MSBuildBasedProjectTests.cs

@@ -11,7 +11,7 @@ using Rhino.Mocks;
 namespace ICSharpCode.SharpDevelop.Tests.ServiceReferences
 {
 	[TestFixture]
-	public class MSBuildBasedProjectTests
+	public class MSBuildBasedProjectTests : SDTestFixtureBase
 	{
 		MSBuildBasedProject project;
 		IProjectItemBackendStore backendStore;

src/Main/Base/Test/ServiceReferences/ProjectWithServiceReferencesTests.cs

@@ -16,7 +16,7 @@ using Rhino.Mocks;
 namespace ICSharpCode.SharpDevelop.Tests.ServiceReferences
 {
 	[TestFixture]
-	public class ProjectWithServiceReferencesTests
+	public class ProjectWithServiceReferencesTests : SDTestFixtureBase
 	{
 		IProject fakeProject;
 		ProjectWithServiceReferences project;

src/Main/Base/Test/ServiceReferences/ServiceReferencesFolderNodeTests.cs

@@ -10,7 +10,7 @@ using NUnit.Framework;
 namespace ICSharpCode.SharpDevelop.Tests.ServiceReferences
 {
 	[TestFixture]
-	public class ServiceReferencesFolderNodeTests
+	public class ServiceReferencesFolderNodeTests : SDTestFixtureBase
 	{
 		MSBuildBasedProject project;
 		ServiceReferencesProjectItem projectItem;

src/Main/Base/Test/ServiceReferences/ServiceReferencesProjectItemTests.cs

@@ -9,7 +9,7 @@ using NUnit.Framework;
 namespace ICSharpCode.SharpDevelop.Tests.ServiceReferences
 {
 	[TestFixture]
-	public class ServiceReferencesProjectItemTests
+	public class ServiceReferencesProjectItemTests : SDTestFixtureBase
 	{
 		MSBuildBasedProject project;
 		ServiceReferencesProjectItem projectItem;

src/Main/Base/Test/WebReferences/DirectoryNodeFactoryTests.cs

@@ -9,7 +9,7 @@ using ICSharpCode.SharpDevelop.Project;
 namespace ICSharpCode.SharpDevelop.Tests.WebReferences
 {
 	[TestFixture]
-	public class DirectoryNodeFactoryTests
+	public class DirectoryNodeFactoryTests : SDTestFixtureBase
 	{		
 		DirectoryNode appDesignerFolderNode;
 		DirectoryNode ordinaryFolderNode;

src/Main/Base/Test/WebReferences/WebReferenceTests.cs

@@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop.Tests.WebReferences
 	/// Tests the generated project items for a web reference.
 	/// </summary>
 	[TestFixture]
-	public class WebReferenceTests
+	public class WebReferenceTests : SDTestFixtureBase
 	{
 		SD.WebReference webReference;
 		DiscoveryClientProtocol protocol;

src/Main/Base/Test/WebReferences/WebReferencesProjectItemTests.cs

@@ -9,7 +9,7 @@ using System;
 namespace ICSharpCode.SharpDevelop.Tests.WebReferences
 {
 	[TestFixture]
-	public class WebReferencesProjectItemTests
+	public class WebReferencesProjectItemTests : SDTestFixtureBase
 	{
 		MSBuildBasedProject project;