From 4b964b54ede9c12741dbf2388a2abad734992cd7 Mon Sep 17 00:00:00 2001 From: Tomasz Tretkowski Date: Sat, 22 Oct 2011 15:06:31 +0200 Subject: [PATCH] Fixed unit test and MockTestFramework class to correctly return test members only for given class. --- ...tClassIsTestMethodUsesTestFrameworksTestFixture.cs | 11 +++++------ .../UnitTesting/Test/Utils/MockTestFramework.cs | 3 ++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/AddIns/Analysis/UnitTesting/Test/Project/TestClassIsTestMethodUsesTestFrameworksTestFixture.cs b/src/AddIns/Analysis/UnitTesting/Test/Project/TestClassIsTestMethodUsesTestFrameworksTestFixture.cs index d14aa38a27..5759cc912d 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Project/TestClassIsTestMethodUsesTestFrameworksTestFixture.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Project/TestClassIsTestMethodUsesTestFrameworksTestFixture.cs @@ -24,19 +24,18 @@ namespace UnitTesting.Tests.Project { mockTestClass = MockClass.CreateMockClassWithoutAnyAttributes(); mockTestClass.FullyQualifiedName = "DerivedClass"; - testMethod = new MockMethod(mockTestClass, "myTestMethod"); mockTestClass.Methods.Add(testMethod); - baseClassTestMethod = new MockMethod(mockTestClass, "myBaseTestMethod"); - - testFrameworks = new MockRegisteredTestFrameworks(); - testFrameworks.AddTestMember(testMethod); - testFrameworks.AddTestMember(baseClassTestMethod); mockBaseTestClass = MockClass.CreateMockClassWithoutAnyAttributes(); mockBaseTestClass.FullyQualifiedName = "BaseClass"; mockBaseTestClass.Methods.Add(baseClassTestMethod); + baseClassTestMethod = new MockMethod(mockBaseTestClass, "myBaseTestMethod"); + testFrameworks = new MockRegisteredTestFrameworks(); + testFrameworks.AddTestMember(testMethod); + testFrameworks.AddTestMember(baseClassTestMethod); + mockTestClass.AddBaseClass(mockBaseTestClass); testClass = new TestClass(mockTestClass, testFrameworks); diff --git a/src/AddIns/Analysis/UnitTesting/Test/Utils/MockTestFramework.cs b/src/AddIns/Analysis/UnitTesting/Test/Utils/MockTestFramework.cs index 9f9c043672..91cf66a5af 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Utils/MockTestFramework.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Utils/MockTestFramework.cs @@ -2,6 +2,7 @@ // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; +using System.Linq; using System.Collections.Generic; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Project; @@ -32,7 +33,7 @@ namespace UnitTesting.Tests.Utils } public IEnumerable GetTestMembersFor(IClass @class) { - return testMembers; + return testMembers.Where(member => member.DeclaringType == @class); } public IMember IsTestMemberParameterUsed {