Skip to content

BugFix: WorkItemAttribute not extracted #749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
6 commits merged into from
Dec 8, 2020
+17 −4
Merged

BugFix: WorkItemAttribute not extracted #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
50b57d7
Fixed WorkItem Id not being read bug
Dec 3, 2020
0c511ea
Added comment to trigger CI build
Dec 3, 2020
4a77001
Removed comment to trigger CI build
Dec 3, 2020
6e9f101
Removed second newline
Dec 3, 2020
66d9158
Removed Array Suffix from Variable Name
fl3pp Dec 5, 2020
82c303a
Fixed bug and added test
fl3pp Dec 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Adapter/MSTest.CoreAdapter/Discovery/TypeEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,10 @@ internal UnitTestElement GetTestFromMethod(MethodInfo method, bool isDeclaredInT
testElement.Description = descriptionAttribute.Description;
}

var workItemAttributeArray = this.reflectHelper.GetCustomAttributes(method, typeof(WorkItemAttribute)) as WorkItemAttribute[];
if (workItemAttributeArray != null)
var workItemAttributes = this.reflectHelper.GetCustomAttributes(method, typeof(WorkItemAttribute)).Cast<WorkItemAttribute>().ToArray();
if (workItemAttributes.Any())
{
testElement.WorkItemIds = workItemAttributeArray.Select(x => x.Id.ToString()).ToArray();
testElement.WorkItemIds = workItemAttributes.Select(x => x.Id.ToString()).ToArray();
}

// Get Deployment items if any.
Expand Down
15 changes: 14 additions & 1 deletion test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Discovery/TypeEnumeratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,13 +440,26 @@ public void GetTestFromMethodShouldSetWorkItemIds()
this.SetupTestClassAndTestMethods(isValidTestClass: true, isValidTestMethod: true, isMethodFromSameAssembly: true);
TypeEnumerator typeEnumerator = this.GetTypeEnumeratorInstance(typeof(DummyTestClass), "DummyAssemblyName");
var methodInfo = typeof(DummyTestClass).GetMethod("MethodWithVoidReturnType");
this.mockReflectHelper.Setup(rh => rh.GetCustomAttributes(methodInfo, typeof(UTF.WorkItemAttribute))).Returns(new UTF.WorkItemAttribute[] { new UTF.WorkItemAttribute(123), new UTF.WorkItemAttribute(345) });
this.mockReflectHelper.Setup(rh => rh.GetCustomAttributes(methodInfo, typeof(UTF.WorkItemAttribute))).Returns(new Attribute[] { new UTF.WorkItemAttribute(123), new UTF.WorkItemAttribute(345) });

var testElement = typeEnumerator.GetTestFromMethod(methodInfo, true, this.warnings);

CollectionAssert.AreEqual(new string[] { "123", "345" }, testElement.WorkItemIds);
}

[TestMethod]
public void GetTestFromMethodShouldSetWorkItemIdsToNullIfNotAny()
{
this.SetupTestClassAndTestMethods(isValidTestClass: true, isValidTestMethod: true, isMethodFromSameAssembly: true);
TypeEnumerator typeEnumerator = this.GetTypeEnumeratorInstance(typeof(DummyTestClass), "DummyAssemblyName");
var methodInfo = typeof(DummyTestClass).GetMethod("MethodWithVoidReturnType");
this.mockReflectHelper.Setup(rh => rh.GetCustomAttributes(methodInfo, typeof(UTF.WorkItemAttribute))).Returns(new Attribute[0]);

var testElement = typeEnumerator.GetTestFromMethod(methodInfo, true, this.warnings);

Assert.IsNull(testElement.WorkItemIds);
}

[TestMethod]
public void GetTestFromMethodShouldSetCssIteration()
{
Expand Down