Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Krüger <mikkrg@microsoft.com>2018-12-07 12:05:57 +0300
committerMike Krüger <mikkrg@microsoft.com>2018-12-10 15:48:52 +0300
commit737e87d6d03cd6a49841924306660169d33fecb9 (patch)
tree08d7883f94844f2e276ede60d225a160a2a1dbcc /main/src/addins/MonoDevelop.UnitTesting
parent7ea797cc8e9f0dec5319f4a79c1f0126dfa8c805 (diff)
Fixes VSTS Bug 729387: [Feedback] Broken text editor unit test
integration ("Unit test [name] could not be loaded") https://devdiv.visualstudio.com/DevDiv/_workitems/edit/723605 TestID is not arbitrary or optional. It's the fully qualified test name in the source code.
Diffstat (limited to 'main/src/addins/MonoDevelop.UnitTesting')
-rw-r--r--main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestNamespaceTestGroup.cs2
-rw-r--r--main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestTestClass.cs7
-rw-r--r--main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs2
3 files changed, 6 insertions, 5 deletions
diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestNamespaceTestGroup.cs b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestNamespaceTestGroup.cs
index c0de605ff3..60c1c951a0 100644
--- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestNamespaceTestGroup.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestNamespaceTestGroup.cs
@@ -67,7 +67,7 @@ namespace MonoDevelop.UnitTesting.VsTest
string childNamespace = VsTestTest.GetChildNamespace (FixtureTypeNamespace);
if (string.IsNullOrEmpty (childNamespace)) {
if (currentClass == null || currentClass.FixtureTypeName != VsTestTest.FixtureTypeName) {
- currentClass = new VsTestTestClass (testRunner, Project, VsTestTest.FixtureTypeName);
+ currentClass = new VsTestTestClass (testRunner, Project, VsTestTest);
Tests.Add (currentClass);
}
currentClass.Tests.Add (VsTestTest);
diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestTestClass.cs b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestTestClass.cs
index f008443107..5d36816915 100644
--- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestTestClass.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestTestClass.cs
@@ -37,12 +37,13 @@ namespace MonoDevelop.UnitTesting.VsTest
public Project Project { get; private set; }
IVsTestTestRunner testRunner;
- public VsTestTestClass (IVsTestTestRunner testRunner, Project project, string name)
- : base (name)
+ public VsTestTestClass (IVsTestTestRunner testRunner, Project project, VsTestUnitTest vsTestUnit)
+ : base (vsTestUnit.FixtureTypeName)
{
this.Project = project;
this.testRunner = testRunner;
- FixtureTypeName = name;
+ FixtureTypeName = vsTestUnit.FixtureTypeName;
+ TestId = string.IsNullOrEmpty (vsTestUnit.FixtureTypeNamespace) ? FixtureTypeName : vsTestUnit.FixtureTypeNamespace + "." + FixtureTypeName;
}
protected override UnitTestResult OnRun (TestContext testContext)
diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs
index e78a0a9903..0d13dda33c 100644
--- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs
@@ -59,7 +59,7 @@ namespace MonoDevelop.UnitTesting.VsTest
void Init ()
{
- TestId = test.Id.ToString ();
+ TestId = test.FullyQualifiedName;
if (!string.IsNullOrEmpty (test.CodeFilePath))
sourceCodeLocation = new SourceCodeLocation (test.CodeFilePath, test.LineNumber, 0);
else {