Skip to content

fix(mocks): skip non-virtual 'new' methods when discovering mockable members #5330

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
thomhurst merged 3 commits into from
Mar 31, 2026
Merged

fix(mocks): skip non-virtual 'new' methods when discovering mockable members #5330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fe6cdb
fix(mocks): skip non-virtual 'new' methods when discovering mockable …
thomhurst Mar 31, 2026
6768bd4
review: add event raise test, remove unused raise helpers
thomhurst Mar 31, 2026
f209189
review: replace -1 sentinel with int?, add indexer handling
thomhurst Mar 31, 2026
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
108 changes: 84 additions & 24 deletions TUnit.Mocks.SourceGenerator/Discovery/MemberDiscovery.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static (EquatableArray<MockMemberModel> Methods, EquatableArray<MockMembe
var events = new List<MockEventModel>();

var seenMethods = new HashSet<string>();
var seenProperties = new Dictionary<string, int>();
var seenProperties = new Dictionary<string, int?>();
var seenEvents = new HashSet<string>();

int memberIdCounter = 0;
Expand Down Expand Up @@ -72,7 +72,10 @@ public static (EquatableArray<MockMemberModel> Methods, EquatableArray<MockMembe
var key = $"P:{property.Name}";
if (seenProperties.TryGetValue(key, out var existingIndex))
{
MergePropertyAccessors(properties, existingIndex, property, ref memberIdCounter);
if (existingIndex.HasValue)
{
MergePropertyAccessors(properties, existingIndex.Value, property, ref memberIdCounter);
}
}
else
{
Expand All @@ -88,7 +91,10 @@ public static (EquatableArray<MockMemberModel> Methods, EquatableArray<MockMembe
var key = $"I:[{paramTypes}]";
if (seenProperties.TryGetValue(key, out var existingIndex))
{
MergePropertyAccessors(properties, existingIndex, indexer, ref memberIdCounter);
if (existingIndex.HasValue)
{
MergePropertyAccessors(properties, existingIndex.Value, indexer, ref memberIdCounter);
}
}
else
{
Expand Down Expand Up @@ -129,7 +135,7 @@ public static (EquatableArray<MockMemberModel> Methods, EquatableArray<MockMembe
var events = new List<MockEventModel>();

var seenMethods = new HashSet<string>();
var seenProperties = new Dictionary<string, int>();
var seenProperties = new Dictionary<string, int?>();
var seenEvents = new HashSet<string>();

int memberIdCounter = 0;
Expand Down Expand Up @@ -171,7 +177,10 @@ public static (EquatableArray<MockMemberModel> Methods, EquatableArray<MockMembe
var key = $"P:{property.Name}";
if (seenProperties.TryGetValue(key, out var existingIndex))
{
MergePropertyAccessors(properties, existingIndex, property, ref memberIdCounter);
if (existingIndex.HasValue)
{
MergePropertyAccessors(properties, existingIndex.Value, property, ref memberIdCounter);
}
}
else
{
Expand All @@ -187,7 +196,10 @@ public static (EquatableArray<MockMemberModel> Methods, EquatableArray<MockMembe
var key = $"I:[{paramTypes}]";
if (seenProperties.TryGetValue(key, out var existingIndex))
{
MergePropertyAccessors(properties, existingIndex, indexer, ref memberIdCounter);
if (existingIndex.HasValue)
{
MergePropertyAccessors(properties, existingIndex.Value, indexer, ref memberIdCounter);
}
}
else
{
Expand Down Expand Up @@ -223,7 +235,7 @@ private static void ProcessClassMembers(
List<MockMemberModel> properties,
List<MockEventModel> events,
HashSet<string> seenMethods,
Dictionary<string, int> seenProperties,
Dictionary<string, int?> seenProperties,
HashSet<string> seenEvents,
ref int memberIdCounter)
{
Expand Down Expand Up @@ -252,40 +264,88 @@ private static void ProcessClassMembers(
// (e.g., internal virtual methods from external assemblies like Azure SDK)
if (isExternalType && !IsMemberAccessibleFromExternal(member, compilationAssembly!, hasInternalAccess)) continue;

// Non-virtual members are recorded in the seen-sets (but not collected) so that
// base virtuals hidden by 'new' in a derived class are not emitted as overrides.
switch (member)
{
case IMethodSymbol method when method.MethodKind == MethodKind.Ordinary
&& (method.IsAbstract || method.IsVirtual || method.IsOverride):
case IMethodSymbol method when method.MethodKind == MethodKind.Ordinary:
{
var key = GetMethodKey(method);
if (!seenMethods.Add(key)) continue;

methods.Add(CreateMethodModel(method, ref memberIdCounter, null));
if (method.IsAbstract || method.IsVirtual || method.IsOverride)
{
if (!seenMethods.Add(key)) continue;
methods.Add(CreateMethodModel(method, ref memberIdCounter, null));
}
else
{
seenMethods.Add(key);
}
break;
}

case IPropertySymbol property when !property.IsIndexer
&& (property.IsAbstract || property.IsVirtual || property.IsOverride):
case IPropertySymbol property when !property.IsIndexer:
{
var key = $"P:{property.Name}";
if (seenProperties.TryGetValue(key, out var existingIndex))
if (property.IsAbstract || property.IsVirtual || property.IsOverride)
{
MergePropertyAccessors(properties, existingIndex, property, ref memberIdCounter);
if (seenProperties.TryGetValue(key, out var existingIndex))
{
if (existingIndex.HasValue)
{
MergePropertyAccessors(properties, existingIndex.Value, property, ref memberIdCounter);
}
}
else
{
seenProperties[key] = properties.Count;
properties.Add(CreatePropertyModel(property, ref memberIdCounter, null));
}
}
else
else if (!seenProperties.ContainsKey(key))
{
seenProperties[key] = properties.Count;
properties.Add(CreatePropertyModel(property, ref memberIdCounter, null));
seenProperties[key] = null;
}
break;
}

case IEventSymbol evt when evt.IsAbstract || evt.IsVirtual || evt.IsOverride:
case IPropertySymbol indexer when indexer.IsIndexer:
{
var key = $"E:{evt.Name}";
if (!seenEvents.Add(key)) continue;
var paramTypes = string.Join(',', indexer.Parameters.Select(p => p.Type.GetFullyQualifiedName()));
var key = $"I:[{paramTypes}]";
if (indexer.IsAbstract || indexer.IsVirtual || indexer.IsOverride)
{
if (seenProperties.TryGetValue(key, out var existingIndex))
{
if (existingIndex.HasValue)
{
MergePropertyAccessors(properties, existingIndex.Value, indexer, ref memberIdCounter);
}
}
else
{
seenProperties[key] = properties.Count;
properties.Add(CreateIndexerModel(indexer, ref memberIdCounter, null));
}
}
else if (!seenProperties.ContainsKey(key))
{
seenProperties[key] = null;
}
break;
}

events.Add(CreateEventModel(evt, null));
case IEventSymbol evt:
{
var key = $"E:{evt.Name}";
if (evt.IsAbstract || evt.IsVirtual || evt.IsOverride)
{
if (!seenEvents.Add(key)) continue;
events.Add(CreateEventModel(evt, null));
}
else
{
seenEvents.Add(key);
}
break;
}
}
Expand Down Expand Up @@ -752,7 +812,7 @@ private static void CollectStaticAbstractMember(
List<MockMemberModel> properties,
List<MockEventModel> events,
HashSet<string> seenMethods,
Dictionary<string, int> seenProperties,
Dictionary<string, int?> seenProperties,
HashSet<string> seenEvents,
ref int memberIdCounter)
{
Expand Down
Loading
Loading