fix unit tests

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

@@ -159,7 +159,6 @@
     <Compile Include="Utils\MockNUnitTestFramework.cs" />
     <Compile Include="Utils\MockNUnitTestRunnerContext.cs" />
     <Compile Include="Utils\MockProcessRunner.cs" />
-    <Compile Include="Utils\MockProjectChangeWatcher.cs" />
     <Compile Include="Utils\MockRegisteredTestFrameworks.cs" />
     <Compile Include="Utils\MockRunTestCommandContext.cs" />
     <Compile Include="Utils\MockSaveAllFilesCommand.cs" />

src/AddIns/Analysis/UnitTesting/Test/Utils/MockProjectChangeWatcher.cs

@@ -1,29 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-using System;
-using ICSharpCode.SharpDevelop.Project;
-
-namespace UnitTesting.Tests.Utils
-{
-	/// <summary>
-	/// Description of MockProjectChangeWatcher.
-	/// </summary>
-	public class MockProjectChangeWatcher : IProjectChangeWatcher
-	{
-		public MockProjectChangeWatcher()
-		{
-		}
-		
-		public void Enable()
-		{
-		}
-		
-		public void Disable()
-		{
-		}
-		
-		public void Rename(string newFileName)
-		{
-		}
-	}
-}

src/AddIns/BackendBindings/WixBinding/Test/Utils/MockProjectChangeWatcher.cs

@@ -1,29 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-using System;
-using ICSharpCode.SharpDevelop.Project;
-
-namespace WixBinding.Tests.Utils
-{
-	/// <summary>
-	/// Description of MockProjectChangeWatcher.
-	/// </summary>
-	public class MockProjectChangeWatcher : IProjectChangeWatcher
-	{
-		public MockProjectChangeWatcher()
-		{
-		}
-		
-		public void Enable()
-		{
-		}
-		
-		public void Disable()
-		{
-		}
-		
-		public void Rename(string newFileName)
-		{
-		}
-	}
-}

src/AddIns/BackendBindings/WixBinding/Test/WixBinding.Tests.csproj

@@ -112,7 +112,6 @@
     <Compile Include="Utils\MockFormsDesignerView.cs" />
     <Compile Include="Utils\MockOpenedFile.cs" />
     <Compile Include="Utils\MockPackageFilesViewFactory.cs" />
-    <Compile Include="Utils\MockProjectChangeWatcher.cs" />
     <Compile Include="Utils\MockTextEditor.cs" />
     <Compile Include="Utils\MockTextEditorOptions.cs" />
     <Compile Include="Utils\MockTextFileReader.cs" />

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

@@ -73,7 +73,6 @@
     <Compile Include="Src\Helpers\FakeSolutionPackageRepositoryFactory.cs" />
     <Compile Include="Src\Helpers\FakeUpdatePackageActions.cs" />
     <Compile Include="Src\Helpers\FakeUpdatePackageActionsFactory.cs" />
-    <Compile Include="Src\Helpers\MockProjectChangeWatcher.cs" />
     <Compile Include="Src\Helpers\SelectedProjectCollectionAssert.cs" />
     <Compile Include="Src\Helpers\TestableInstalledPackageViewModel.cs" />
     <Compile Include="Src\Helpers\TestablePackageFromRepository.cs" />

src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/DTETests.cs

@@ -20,7 +20,7 @@ namespace PackageManagement.Tests.EnvDTE
 		void CreateDTE()
 		{
 			fakeProjectService = new FakePackageManagementProjectService();
-			fakeProjectService.OpenSolution = new SD.Solution(new MockProjectChangeWatcher());
+			fakeProjectService.OpenSolution = new SD.Solution(new SD.MockProjectChangeWatcher());
 			fakeFileService = new FakeFileService(null);
 			dte = new DTE(fakeProjectService, fakeFileService);
 		}

src/AddIns/Misc/PackageManagement/Test/Src/Helpers/MockProjectChangeWatcher.cs

@@ -1,29 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-using System;
-using ICSharpCode.SharpDevelop.Project;
-
-namespace PackageManagement.Tests.Helpers
-{
-	/// <summary>
-	/// Description of MockProjectChangeWatcher.
-	/// </summary>
-	public class MockProjectChangeWatcher : IProjectChangeWatcher
-	{
-		public MockProjectChangeWatcher()
-		{
-		}
-		
-		public void Enable()
-		{
-		}
-		
-		public void Disable()
-		{
-		}
-		
-		public void Rename(string newFileName)
-		{
-		}
-	}
-}

src/AddIns/Misc/ResourceToolkit/Test/MockProjectChangeWatcher.cs

@@ -1,29 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-using System;
-using ICSharpCode.SharpDevelop.Project;
-
-namespace ResourceToolkit.Tests
-{
-	/// <summary>
-	/// Description of MockProjectChangeWatcher.
-	/// </summary>
-	public class MockProjectChangeWatcher : IProjectChangeWatcher
-	{
-		public MockProjectChangeWatcher()
-		{
-		}
-		
-		public void Enable()
-		{
-		}
-		
-		public void Disable()
-		{
-		}
-		
-		public void Rename(string newFileName)
-		{
-		}
-	}
-}

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

@@ -57,7 +57,6 @@
     <Compile Include="CSharp\ICSharpCodeCoreNRefactoryResourceResolverTests.cs" />
     <Compile Include="CSharp\ICSharpCodeCoreResourceResolverTests.cs" />
     <Compile Include="CSharp\SpecificResourceReferenceFinderTests.cs" />
-    <Compile Include="MockProjectChangeWatcher.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestHelper.cs" />
     <Compile Include="VBNet\AbstractVBNetResourceResolverTestFixture.cs" />

src/AddIns/Misc/TextTemplating/Test/Helpers/MockProjectChangeWatcher.cs

@@ -1,31 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using ICSharpCode.SharpDevelop.Internal.Templates;
-using ICSharpCode.SharpDevelop.Project;
-
-namespace TextTemplating.Tests.Helpers
-{
-	/// <summary>
-	/// Description of MockProjectChangeWatcher.
-	/// </summary>
-	public class MockProjectChangeWatcher : IProjectChangeWatcher
-	{
-		public MockProjectChangeWatcher()
-		{
-		}
-		
-		public void Enable()
-		{
-		}
-		
-		public void Disable()
-		{
-		}
-		
-		public void Rename(string newFileName)
-		{
-		}
-	}
-}

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

@@ -62,7 +62,6 @@
     <Compile Include="Helpers\FakeTextTemplatingFilePreprocessor.cs" />
     <Compile Include="Helpers\FakeTextTemplatingHost.cs" />
     <Compile Include="Helpers\FakeTextTemplatingFileGenerator.cs" />
-    <Compile Include="Helpers\MockProjectChangeWatcher.cs" />
     <Compile Include="Helpers\ProjectHelper.cs" />
     <Compile Include="Helpers\TestableFileProjectItem.cs" />
     <Compile Include="Helpers\TestableProject.cs" />

src/Main/Base/Project/Src/Project/AbstractProject.cs

@@ -116,7 +116,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		#region Filename / Directory
 		volatile string fileName;
 		string cachedDirectoryName;
-		protected ProjectChangeWatcher watcher;
+		protected IProjectChangeWatcher watcher;
 		
 		/// <summary>
 		/// Gets the name of the project file.
@@ -135,6 +135,9 @@ namespace ICSharpCode.SharpDevelop.Project
 				WorkbenchSingleton.AssertMainThread();
 				Debug.Assert(FileUtility.IsUrl(value) || Path.IsPathRooted(value));
 				
+				if (WorkbenchSingleton.Workbench == null)
+					watcher = new MockProjectChangeWatcher();
+				
 				if (watcher == null) {
 					watcher = new ProjectChangeWatcher(value);
 					watcher.Enable();

src/Main/Base/Project/Src/Project/IProjectChangeWatcher.cs

@@ -7,10 +7,29 @@ using ICSharpCode.SharpDevelop.Gui;
 
 namespace ICSharpCode.SharpDevelop.Project
 {
-	public interface IProjectChangeWatcher
+	public interface IProjectChangeWatcher : IDisposable
 	{
 		void Enable();
 		void Disable();
 		void Rename(string newFileName);
 	}
+	
+	public sealed class MockProjectChangeWatcher : IProjectChangeWatcher
+	{
+		public void Enable()
+		{
+		}
+		
+		public void Disable()
+		{
+		}
+		
+		public void Rename(string newFileName)
+		{
+		}
+		
+		public void Dispose()
+		{
+		}
+	}
 }

src/Main/Base/Project/Src/Project/ProjectChangeWatcher.cs

@@ -7,7 +7,7 @@ using ICSharpCode.SharpDevelop.Gui;
 
 namespace ICSharpCode.SharpDevelop.Project
 {
-	public sealed class ProjectChangeWatcher : IDisposable, IProjectChangeWatcher
+	public sealed class ProjectChangeWatcher : IProjectChangeWatcher
 	{
 		FileSystemWatcher watcher;
 		string fileName;

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

@@ -100,7 +100,6 @@
     <Compile Include="Utils\MockMethod.cs" />
     <Compile Include="Utils\MockOpenedFile.cs" />
     <Compile Include="Utils\MockProject.cs" />
-    <Compile Include="Utils\MockProjectChangeWatcher.cs" />
     <Compile Include="Utils\MockProperty.cs" />
     <Compile Include="Utils\MockSite.cs" />
     <Compile Include="Utils\MockTextMarker.cs" />

src/Main/Base/Test/Utils/MockProjectChangeWatcher.cs

@@ -1,29 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-using System;
-using ICSharpCode.SharpDevelop.Project;
-
-namespace ICSharpCode.SharpDevelop.Tests.Utils
-{
-	/// <summary>
-	/// Description of MockProjectChangeWatcher.
-	/// </summary>
-	public class MockProjectChangeWatcher : IProjectChangeWatcher
-	{
-		public MockProjectChangeWatcher()
-		{
-		}
-		
-		public void Enable()
-		{
-		}
-		
-		public void Disable()
-		{
-		}
-		
-		public void Rename(string newFileName)
-		{
-		}
-	}
-}