pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix InvalidCastException in Unit Tests addin when a field has an attribute.

pull/23/head
Matt Ward 14 years ago
parent
30fea3c7d0
commit
5787807130
4 changed files with 165 additions and 118 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/AddIns/Analysis/UnitTesting/Src/NUnitTestFramework.cs
  2. 152
      src/AddIns/Analysis/UnitTesting/Test/Frameworks/NUnitTestFrameworkIsTestMemberTests.cs
  3. 109
      src/AddIns/Analysis/UnitTesting/Test/Frameworks/NUnitTestFrameworkIsTestMethodTests.cs
  4. 2
      src/AddIns/Analysis/UnitTesting/Test/UnitTesting.Tests.csproj

20
src/AddIns/Analysis/UnitTesting/Src/NUnitTestFramework.cs
Unescape View File

@ -18,7 +18,7 @@ namespace ICSharpCode.UnitTesting @@ -18,7 +18,7 @@ namespace ICSharpCode.UnitTesting
{
if (project != null) {
foreach (ProjectItem projectItem in project.Items) {
ReferenceProjectItem referenceProjectItem = projectItem as ReferenceProjectItem;
var referenceProjectItem = projectItem as ReferenceProjectItem;
if (IsNUnitFrameworkAssemblyReference(referenceProjectItem)) {
return true;
}
@ -75,16 +75,20 @@ namespace ICSharpCode.UnitTesting @@ -75,16 +75,20 @@ namespace ICSharpCode.UnitTesting
/// </summary>
public bool IsTestMember(IMember member)
{
if (member == null) {
return false;
var method = member as IMethod;
if (method != null) {
return IsTestMethod(method);
}
StringComparer nameComparer = GetNameComparer(member.DeclaringType);
return false;
}
bool IsTestMethod(IMethod method)
{
var nameComparer = GetNameComparer(method.DeclaringType);
if (nameComparer != null) {
NUnitTestAttributeName testAttribute = new NUnitTestAttributeName("Test", nameComparer);
foreach (IAttribute attribute in member.Attributes) {
var testAttribute = new NUnitTestAttributeName("Test", nameComparer);
foreach (IAttribute attribute in method.Attributes) {
if (testAttribute.IsEqual(attribute)) {
IMethod method = (IMethod)member;
if (method.Parameters.Count == 0) {
return true;
}

152
src/AddIns/Analysis/UnitTesting/Test/Frameworks/NUnitTestFrameworkIsTestMemberTests.cs
Unescape View File

@ -0,0 +1,152 @@ @@ -0,0 +1,152 @@
// 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 ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.UnitTesting;
using NUnit.Framework;
using System;
using System.Collections.Generic;
using UnitTesting.Tests.Utils;
namespace UnitTesting.Tests.Frameworks
{
[TestFixture]
public class NUnitTestFrameworkIsTestMemberTests
{
NUnitTestFramework testFramework;
void CreateTestFramework()
{
testFramework = new NUnitTestFramework();
}
[Test]
public void IsTestMember_MethodHasNoAttributes_ReturnsFalse()
{
CreateTestFramework();
MockMethod mockMethod = MockMethod.CreateMockMethodWithoutAnyAttributes();
bool result = testFramework.IsTestMember(mockMethod);
Assert.IsFalse(result);
}
[Test]
public void IsTestMember_MethodHasTestAttributeWithoutAttributePart_ReturnsTrue()
{
CreateTestFramework();
MockAttribute testAttribute = new MockAttribute("Test");
MockMethod mockMethod = MockMethod.CreateMockMethodWithAttribute(testAttribute);
bool result = testFramework.IsTestMember(mockMethod);
Assert.IsTrue(result);
}
[Test]
public void IsTestMember_MethodHasTestAttributeAttribute_ReturnsTrue()
{
CreateTestFramework();
MockAttribute testAttribute = new MockAttribute("TestAttribute");
MockMethod mockMethod = MockMethod.CreateMockMethodWithAttribute(testAttribute);
bool result = testFramework.IsTestMember(mockMethod);
Assert.IsTrue(result);
}
[Test]
public void IsTestMember_MethodHasFullyQualifiedNUnitTestAttribute_ReturnsTrue()
{
CreateTestFramework();
MockAttribute testAttribute = new MockAttribute("NUnit.Framework.TestAttribute");
MockMethod mockMethod = MockMethod.CreateMockMethodWithAttribute(testAttribute);
bool result = testFramework.IsTestMember(mockMethod);
Assert.IsTrue(result);
}
[Test]
public void IsTestMember_MethodIsNull_ReturnsFalse()
{
CreateTestFramework();
bool result = testFramework.IsTestMember(null);
Assert.IsFalse(result);
}
[Test]
public void IsTestMember_ProjectContentLanguageHasNullNameComparer_ReturnsFalse()
{
CreateTestFramework();
MockClass mockClass = MockClass.CreateMockClassWithoutAnyAttributes();
mockClass.MockProjectContent.Language = new LanguageProperties(null);
var mockMethod = new MockMethod(mockClass);
mockMethod.Attributes.Add(new MockAttribute("Test"));
bool result = testFramework.IsTestMember(mockMethod);
Assert.IsFalse(result);
}
/// <summary>
/// Even if the project is null the method should be
/// flagged as a TestMethod.
/// </summary>
[Test]
public void IsTestMember_ProjectIsNull_ReturnsTrue()
{
CreateTestFramework();
var testAttribute = new MockAttribute("Test");
MockMethod mockMethod = MockMethod.CreateMockMethodWithAttribute(testAttribute);
MockProjectContent mockProjectContent = (MockProjectContent)mockMethod.DeclaringType.ProjectContent;
mockProjectContent.Project = null;
bool result = testFramework.IsTestMember(mockMethod);
Assert.IsTrue(result);
}
[Test]
public void IsTestMember_MethodHasNullLanguage_ReturnsFalse()
{
CreateTestFramework();
MockClass mockClass = MockClass.CreateMockClassWithoutAnyAttributes();
mockClass.MockProjectContent.Language = null;
var mockMethod = new MockMethod(mockClass);
bool result = testFramework.IsTestMember(mockMethod);
Assert.IsFalse(result);
}
[Test]
public void IsTestMember_MethodHasParameters_ReturnsFalse()
{
CreateTestFramework();
var testAttribute = new MockAttribute("Test");
MockMethod mockMethod = MockMethod.CreateMockMethodWithAttribute(testAttribute);
var mockParameter = new MockParameter();
mockMethod.Parameters.Add(mockParameter);
bool result = testFramework.IsTestMember(mockMethod);
Assert.IsFalse(result);
}
[Test]
public void IsTestMember_FieldHasOneAttribute_ReturnsFalseAndDoesNotThrowInvalidCastException()
{
CreateTestFramework();
MockClass mockClass = MockClass.CreateMockClassWithoutAnyAttributes();
var field = new DefaultField(mockClass, "MyField");
var testAttribute = new MockAttribute("Test");
field.Attributes.Add(testAttribute);
bool result = testFramework.IsTestMember(field);
Assert.IsFalse(result);
}
}
}

109
src/AddIns/Analysis/UnitTesting/Test/Frameworks/NUnitTestFrameworkIsTestMethodTests.cs
Unescape View File

@ -1,109 +0,0 @@ @@ -1,109 +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 ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.UnitTesting;
using NUnit.Framework;
using System;
using System.Collections.Generic;
using UnitTesting.Tests.Utils;
namespace UnitTesting.Tests.Frameworks
{
[TestFixture]
public class NUnitTestFrameworkIsTestMethodTests
{
NUnitTestFramework testFramework;
[SetUp]
public void Init()
{
testFramework = new NUnitTestFramework();
}
[Test]
public void IsTestMethodReturnsFalseWhenMethodHasNoAttributes()
{
MockMethod mockMethod = MockMethod.CreateMockMethodWithoutAnyAttributes();
Assert.IsFalse(testFramework.IsTestMember(mockMethod));
}
[Test]
public void IsTestMethodReturnsTrueWhenMethodHasTestAttributeWithoutAttributePart()
{
MockAttribute testAttribute = new MockAttribute("Test");
MockMethod mockMethod = MockMethod.CreateMockMethodWithAttribute(testAttribute);
Assert.IsTrue(testFramework.IsTestMember(mockMethod));
}
[Test]
public void IsTestMethodReturnsTrueWhenMethodHasTestAttributeAttribute()
{
MockAttribute testAttribute = new MockAttribute("TestAttribute");
MockMethod mockMethod = MockMethod.CreateMockMethodWithAttribute(testAttribute);
Assert.IsTrue(testFramework.IsTestMember(mockMethod));
}
[Test]
public void IsTestMethodReturnsTrueWhenMethodHasFullyQualifiedNUnitTestAttribute()
{
MockAttribute testAttribute = new MockAttribute("NUnit.Framework.TestAttribute");
MockMethod mockMethod = MockMethod.CreateMockMethodWithAttribute(testAttribute);
Assert.IsTrue(testFramework.IsTestMember(mockMethod));
}
[Test]
public void IsTestMethodReturnsFalseWhenMethodIsNull()
{
Assert.IsFalse(testFramework.IsTestMember(null));
}
[Test]
public void IsTestMethodReturnsFalseWhenProjectContentLanguageHasNullNameComparer()
{
MockClass mockClass = MockClass.CreateMockClassWithoutAnyAttributes();
mockClass.MockProjectContent.Language = new LanguageProperties(null);
MockMethod mockMethod = new MockMethod(mockClass);
mockMethod.Attributes.Add(new MockAttribute("Test"));
Assert.IsFalse(testFramework.IsTestMember(mockMethod));
}
/// <summary>
/// Even if the project is null the method should be
/// flagged as a TestMethod.
/// </summary>
[Test]
public void IsTestMethodReturnsTrueWhenProjectIsNull()
{
MockAttribute testAttribute = new MockAttribute("Test");
MockMethod mockMethod = MockMethod.CreateMockMethodWithAttribute(testAttribute);
MockProjectContent mockProjectContent = (MockProjectContent)mockMethod.DeclaringType.ProjectContent;
mockProjectContent.Project = null;
Assert.IsTrue(testFramework.IsTestMember(mockMethod));
}
[Test]
public void IsTestMethodReturnsFalseWhenMethodHasNullLanguage()
{
MockClass mockClass = MockClass.CreateMockClassWithoutAnyAttributes();
mockClass.MockProjectContent.Language = null;
MockMethod mockMethod = new MockMethod(mockClass);
Assert.IsFalse(testFramework.IsTestMember(mockMethod));
}
[Test]
public void IsTestMethodReturnsFalseWhenMethodHasHasParameters()
{
MockAttribute testAttribute = new MockAttribute("Test");
MockMethod mockMethod = MockMethod.CreateMockMethodWithAttribute(testAttribute);
MockParameter mockParameter = new MockParameter();
mockMethod.Parameters.Add(mockParameter);
Assert.IsFalse(testFramework.IsTestMember(mockMethod));
}
}
}

2
src/AddIns/Analysis/UnitTesting/Test/UnitTesting.Tests.csproj
Unescape View File

@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
<Compile Include="Frameworks\NUnitConsoleExeSelectedTestFixture.cs" />
<Compile Include="Frameworks\NUnitConsoleProcessStartInfoTestFixture.cs" />
<Compile Include="Frameworks\NUnitTestFrameworkIsTestClassTests.cs" />
<Compile Include="Frameworks\NUnitTestFrameworkIsTestMethodTests.cs" />
<Compile Include="Frameworks\NUnitTestFrameworkIsTestMemberTests.cs" />
<Compile Include="Frameworks\NUnitTestFrameworkIsTestProjectTests.cs" />
<Compile Include="Frameworks\NUnitTestResultFailureTestFixture.cs" />
<Compile Include="Frameworks\RegisteredTestFrameworksTests.cs" />

Write Preview
Loading…
Cancel
Save