Browse Source

Fixed build - NUnit 2.5 no longer allows hiding the SetUpFixture method in derived classes.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@4055 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Matt Ward 17 years ago
parent
commit
acc3c88a7b
  1. 4
      src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadControlEventHandlerTestFixture.cs
  2. 4
      src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadEventHandlerTestFixture.cs
  3. 8
      src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadFormTestFixtureBase.cs
  4. 2
      src/AddIns/Misc/ResourceToolkit/Test/CSharp/BclNRefactoryResourceResolverTests.cs

4
src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadControlEventHandlerTestFixture.cs

@ -46,11 +46,9 @@ namespace PythonBinding.Tests.Designer @@ -46,11 +46,9 @@ namespace PythonBinding.Tests.Designer
}
}
[TestFixtureSetUp]
public new void SetUpFixture()
public override void BeforeSetUpFixture()
{
base.ComponentCreator.SetEventPropertyDescriptor(new MockPropertyDescriptor("abc", "Button2KeyDown", true));
base.SetUpFixture();
}
public Button GetButton()

4
src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadEventHandlerTestFixture.cs

@ -36,11 +36,9 @@ namespace PythonBinding.Tests.Designer @@ -36,11 +36,9 @@ namespace PythonBinding.Tests.Designer
}
}
[TestFixtureSetUp]
public new void SetUpFixture()
public override void BeforeSetUpFixture()
{
base.ComponentCreator.SetEventPropertyDescriptor(new MockPropertyDescriptor("abc", "TestFormLoad", true));
base.SetUpFixture();
}
public EventDescriptor GetLoadEventDescriptor()

8
src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadFormTestFixtureBase.cs

@ -31,6 +31,7 @@ namespace PythonBinding.Tests.Designer @@ -31,6 +31,7 @@ namespace PythonBinding.Tests.Designer
[TestFixtureSetUp]
public void SetUpFixture()
{
BeforeSetUpFixture();
PythonComponentWalker walker = new PythonComponentWalker(componentCreator);
form = walker.CreateComponent(PythonCode) as Form;
}
@ -41,6 +42,13 @@ namespace PythonBinding.Tests.Designer @@ -41,6 +42,13 @@ namespace PythonBinding.Tests.Designer
form.Dispose();
}
/// <summary>
/// Called at the start of SetUpFixture method before anything is setup.
/// </summary>
public virtual void BeforeSetUpFixture()
{
}
/// <summary>
/// Gets the python code that will be loaded.
/// </summary>

2
src/AddIns/Misc/ResourceToolkit/Test/CSharp/BclNRefactoryResourceResolverTests.cs

@ -282,7 +282,7 @@ class A @@ -282,7 +282,7 @@ class A
{
ResourceResolveResult rrr = Resolve(CodeLocalCRMDeferredInitUsingApplyResources, 8, 20, null);
TestHelper.CheckReference(rrr, "A", null, "A", "A.B");
Assert.That(rrr, Is.InstanceOfType(typeof(ResourcePrefixResolveResult)));
Assert.That(rrr, Is.InstanceOf(typeof(ResourcePrefixResolveResult)));
ResourcePrefixResolveResult rprr = (ResourcePrefixResolveResult)rrr;
Assert.That(rprr.Prefix, Is.EqualTo("$this"), "Resource key prefix not detected correctly.");
}

Loading…
Cancel
Save