diff options
Diffstat (limited to 'main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs')
| -rw-r--r-- | main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs | 17 |
1 files changed, 4 insertions, 13 deletions
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..64af96eb9e 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs @@ -91,7 +91,6 @@ namespace MonoDevelop.UnitTesting.VsTest sourceCodeLocation = new SourceCodeLocation (source.SourceTree.FilePath, line.StartLinePosition.Line, line.StartLinePosition.Character); }).Ignore (); } - int index = test.FullyQualifiedName.LastIndexOf ('.'); if (index > 0) { FixtureTypeName = test.FullyQualifiedName.Substring (0, index); @@ -107,18 +106,10 @@ namespace MonoDevelop.UnitTesting.VsTest FixtureTypeNamespace = string.Empty; FixtureTypeName = string.Empty; } - - int openBraceIndex = test.DisplayName.IndexOf ('('); - if (openBraceIndex == -1) { - index = test.DisplayName.LastIndexOf ('.'); - } else { - index = test.DisplayName.LastIndexOf ('.', openBraceIndex); - } - - if (index > 0) { - name = test.DisplayName.Substring (index + 1); - } else { - name = test.DisplayName; + name = test.DisplayName; + var obsoletePrefix = string.IsNullOrEmpty (FixtureTypeNamespace) ? FixtureTypeName : FixtureTypeNamespace + "." + FixtureTypeName; + if (test.DisplayName.StartsWith(obsoletePrefix, StringComparison.Ordinal) && test.DisplayName [obsoletePrefix.Length] == '.') { + name = test.DisplayName.Substring (obsoletePrefix.Length + 1); } } |