Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,13 @@ private bool VerifyMSTestNamespace(InvocationExpressionSyntax invocation)
if (symbolInfo.Symbol is IMethodSymbol methodSymbol)
{
var containingNamespace = methodSymbol.ContainingType?.ContainingNamespace?.ToDisplayString();
return containingNamespace?.StartsWith("Microsoft.VisualStudio.TestTools.UnitTesting") == true;
// Only return false if we positively know it's NOT MSTest
if (containingNamespace != null && !containingNamespace.StartsWith("Microsoft.VisualStudio.TestTools.UnitTesting"))
{
return false;
}
// Namespace matches or is null (resolution failed) - assume it's MSTest
return true;
}
}
catch
Expand Down
8 changes: 7 additions & 1 deletion TUnit.Analyzers.CodeFixers/TwoPhase/NUnitTwoPhaseAnalyzer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,13 @@ private bool VerifyNUnitNamespace(InvocationExpressionSyntax invocation)
if (symbolInfo.Symbol is IMethodSymbol methodSymbol)
{
var containingNamespace = methodSymbol.ContainingType?.ContainingNamespace?.ToDisplayString();
return containingNamespace?.StartsWith("NUnit.Framework") == true;
// Only return false if we positively know it's NOT NUnit
if (containingNamespace != null && !containingNamespace.StartsWith("NUnit.Framework"))
{
return false;
}
// Namespace matches or is null (resolution failed) - assume it's NUnit
return true;
}
}
catch
Expand Down
24 changes: 20 additions & 4 deletions TUnit.Analyzers.CodeFixers/TwoPhase/XUnitTwoPhaseAnalyzer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,28 @@ private bool IsXUnitAssertion(InvocationExpressionSyntax invocation)
if (XUnitAssertMethods.Contains(methodName))
{
// Semantic check to confirm it's xUnit
var symbolInfo = SemanticModel.GetSymbolInfo(invocation);
if (symbolInfo.Symbol is IMethodSymbol methodSymbol)
try
{
var containingType = methodSymbol.ContainingType?.ToDisplayString();
return containingType?.StartsWith("Xunit.Assert") == true;
var symbolInfo = SemanticModel.GetSymbolInfo(invocation);
if (symbolInfo.Symbol is IMethodSymbol methodSymbol)
{
var containingType = methodSymbol.ContainingType?.ToDisplayString();
// Only return false if we positively know it's NOT xUnit
if (containingType != null && !containingType.StartsWith("Xunit.Assert"))
{
return false;
}
// Namespace matches or is null (resolution failed) - assume it's xUnit
return true;
}
}
catch
{
// Fall back to syntax-based detection
}

// Semantic check failed or symbol not found - assume it's xUnit if syntax matches
return true;
}
}
}
Expand Down
Loading