Skip to content

fix: exception in codefix of explicit mock behavior #701

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
rjmurillo merged 2 commits into from
Aug 4, 2025
Merged

fix: exception in codefix of explicit mock behavior #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
876bf45
Fix exception in codefix of explicit mock behavior
Youssef1313 Aug 2, 2025
6a333aa
Update tests/Moq.Analyzers.Test/SetExplicitMockBehaviorCodeFixTests.cs
Youssef1313 Aug 2, 2025
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
8 changes: 4 additions & 4 deletions src/CodeFixes/SyntaxGeneratorExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ public static SyntaxNode InsertArguments(this SyntaxGenerator generator, SyntaxN
return invocation.WithArgumentList(SyntaxFactory.ArgumentList(arguments));
}

if (syntax is ObjectCreationExpressionSyntax creation)
if (syntax is BaseObjectCreationExpressionSyntax creation)
{
SeparatedSyntaxList<ArgumentSyntax> arguments = creation.ArgumentList?.Arguments ?? [];
arguments = arguments.InsertRange(index, items.OfType<ArgumentSyntax>());
return creation.WithArgumentList(SyntaxFactory.ArgumentList(arguments));
}

throw new ArgumentException($"Must be of type {nameof(InvocationExpressionSyntax)} or {nameof(ObjectCreationExpressionSyntax)} but is of type {syntax.GetType().Name}", nameof(syntax));
throw new ArgumentException($"Must be of type {nameof(InvocationExpressionSyntax)} or {nameof(BaseObjectCreationExpressionSyntax)} but is of type {syntax.GetType().Name}", nameof(syntax));
}

public static SyntaxNode ReplaceArgument(this SyntaxGenerator generator, IOperation operation, int index, SyntaxNode item)
Expand All @@ -59,13 +59,13 @@ public static SyntaxNode ReplaceArgument(this SyntaxGenerator generator, SyntaxN
return invocation.WithArgumentList(SyntaxFactory.ArgumentList(arguments));
}

if (syntax is ObjectCreationExpressionSyntax creation)
if (syntax is BaseObjectCreationExpressionSyntax creation)
{
SeparatedSyntaxList<ArgumentSyntax> arguments = creation.ArgumentList?.Arguments ?? [];
arguments = arguments.RemoveAt(index).Insert(index, argument);
return creation.WithArgumentList(SyntaxFactory.ArgumentList(arguments));
}

throw new ArgumentException($"Must be of type {nameof(InvocationExpressionSyntax)} or {nameof(ObjectCreationExpressionSyntax)} but is of type {syntax.GetType().Name}", nameof(syntax));
throw new ArgumentException($"Must be of type {nameof(InvocationExpressionSyntax)} or {nameof(BaseObjectCreationExpressionSyntax)} but is of type {syntax.GetType().Name}", nameof(syntax));
}
}
22 changes: 21 additions & 1 deletion tests/Moq.Analyzers.Test/SetExplicitMockBehaviorCodeFixTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,26 @@ public static IEnumerable<object[]> TestData()
],
}.WithNamespaces().WithMoqReferenceAssemblyGroups();

IEnumerable<object[]> mockConstructorsWithTargetTypedNew = new object[][]
{
[
"""Mock<ISample> mock = {|Moq1400:new()|};""",
"""Mock<ISample> mock = new(MockBehavior.Loose);""",
],
[
"""Mock<ISample> mock = {|Moq1400:new(MockBehavior.Default)|};""",
"""Mock<ISample> mock = new(MockBehavior.Loose);""",
],
[
"""Mock<ISample> mock = new(MockBehavior.Loose);""",
"""Mock<ISample> mock = new(MockBehavior.Loose);""",
],
[
"""Mock<ISample> mock = new(MockBehavior.Strict);""",
"""Mock<ISample> mock = new(MockBehavior.Strict);""",
],
}.WithNamespaces().WithMoqReferenceAssemblyGroups();

IEnumerable<object[]> mockConstructorsWithExpressions = new object[][]
{
[
Expand Down Expand Up @@ -89,7 +109,7 @@ public static IEnumerable<object[]> TestData()
],
}.WithNamespaces().WithNewMoqReferenceAssemblyGroups();

return mockConstructors.Union(mockConstructorsWithExpressions).Union(fluentBuilders).Union(mockRepositories);
return mockConstructors.Union(mockConstructorsWithTargetTypedNew).Union(mockConstructorsWithExpressions).Union(fluentBuilders).Union(mockRepositories);
}

[Theory]
Expand Down
Loading