From 46a0fda1aebe6ba858a1fe3f77b9e3f3ee3c8a07 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Tue, 2 Oct 2012 13:17:25 +0200 Subject: [PATCH] Fix unit tests. --- .../Test/NUnit/NUnitTestFrameworkIsTestProjectTests.cs | 2 ++ src/Main/Base/Test/SDTestFixtureBase.cs | 3 +++ .../NullProjectStringTagProviderTestFixture.cs | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/AddIns/Analysis/UnitTesting/Test/NUnit/NUnitTestFrameworkIsTestProjectTests.cs b/src/AddIns/Analysis/UnitTesting/Test/NUnit/NUnitTestFrameworkIsTestProjectTests.cs index 5264f84cae..b7611472fe 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/NUnit/NUnitTestFrameworkIsTestProjectTests.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/NUnit/NUnitTestFrameworkIsTestProjectTests.cs @@ -23,7 +23,9 @@ namespace UnitTesting.Tests.NUnit public void Init() { SD.InitializeForUnitTests(); + SD.Services.AddService(typeof(IMessageLoop), MockRepository.GenerateStrictMock()); SD.Services.AddService(typeof(IParserService), MockRepository.GenerateStrictMock()); + SD.MainThread.Stub(m => m.VerifyAccess()); testFramework = new NUnitTestFramework(); } diff --git a/src/Main/Base/Test/SDTestFixtureBase.cs b/src/Main/Base/Test/SDTestFixtureBase.cs index 27d8f538a1..c9386db5d8 100644 --- a/src/Main/Base/Test/SDTestFixtureBase.cs +++ b/src/Main/Base/Test/SDTestFixtureBase.cs @@ -3,6 +3,7 @@ using System; using NUnit.Framework; +using Rhino.Mocks; namespace ICSharpCode.SharpDevelop { @@ -16,6 +17,8 @@ namespace ICSharpCode.SharpDevelop public virtual void FixtureSetUp() { SD.InitializeForUnitTests(); + SD.Services.AddService(typeof(IMessageLoop), MockRepository.GenerateStrictMock()); + SD.MainThread.Stub(m => m.VerifyAccess()); } [TestFixtureTearDown] diff --git a/src/Main/Base/Test/StringTagProvider/NullProjectStringTagProviderTestFixture.cs b/src/Main/Base/Test/StringTagProvider/NullProjectStringTagProviderTestFixture.cs index 77fc30b572..bb45bc7be4 100644 --- a/src/Main/Base/Test/StringTagProvider/NullProjectStringTagProviderTestFixture.cs +++ b/src/Main/Base/Test/StringTagProvider/NullProjectStringTagProviderTestFixture.cs @@ -12,7 +12,7 @@ namespace ICSharpCode.SharpDevelop.Tests.StringTagProvider /// Tests the SharpDevelopStringTagProvider when there is no active project. /// [TestFixture] - public class NullProjectStringTagProviderTestFixture + public class NullProjectStringTagProviderTestFixture : SDTestFixtureBase { SharpDevelopStringTagProvider tagProvider;