Skip to content

feat(mocks): shorter, more readable generated mock type names #5334

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 2 commits into from
Apr 1, 2026
Merged

feat(mocks): shorter, more readable generated mock type names #5334

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
03df55f
feat(mocks): use shorter, more readable generated mock type names
thomhurst Apr 1, 2026
a05d547
refactor(mocks): extract SanitizeIdentifier and StripGlobalPrefix hel…
thomhurst Apr 1, 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
8 changes: 4 additions & 4 deletions ...s.SourceGenerator.Tests/Snapshots/GenerateMock_Attribute_With_Concrete_Class.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace TUnit.Mocks.Generated
{
internal static class MyService_PartialMockFactory
internal static class MyServicePartialMockFactory
{
[global::System.Runtime.CompilerServices.ModuleInitializer]
internal static void Register()
Expand All @@ -14,7 +14,7 @@ namespace TUnit.Mocks.Generated
private static global::TUnit.Mocks.Mock<global::MyService> Create(global::TUnit.Mocks.MockBehavior behavior, object[] constructorArgs)
{
var engine = new global::TUnit.Mocks.MockEngine<global::MyService>(behavior);
var impl = new MyService_MockImpl(engine);
var impl = new MyServiceMockImpl(engine);
engine.Raisable = impl;
var mock = new global::TUnit.Mocks.Mock<global::MyService>(impl, engine);
return mock;
Expand All @@ -30,14 +30,14 @@ namespace TUnit.Mocks.Generated

namespace TUnit.Mocks.Generated
{
internal sealed class MyService_MockImpl : global::MyService, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
internal sealed class MyServiceMockImpl : global::MyService, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
{
private readonly global::TUnit.Mocks.MockEngine<global::MyService> _engine;

[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
global::TUnit.Mocks.IMock? global::TUnit.Mocks.IMockObject.MockWrapper { get; set; }

internal MyService_MockImpl(global::TUnit.Mocks.MockEngine<global::MyService> engine) : base()
internal MyServiceMockImpl(global::TUnit.Mocks.MockEngine<global::MyService> engine) : base()
{
_engine = engine;
}
Expand Down
18 changes: 9 additions & 9 deletions ....Mocks.SourceGenerator.Tests/Snapshots/Generic_Interface_Extension_Discovery.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

namespace TUnit.Mocks.Generated
{
public sealed class IRepository_string__Mock : global::TUnit.Mocks.Mock<global::IRepository<string>>, global::IRepository<string>
public sealed class IRepository_string_Mock : global::TUnit.Mocks.Mock<global::IRepository<string>>, global::IRepository<string>
{
[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
internal IRepository_string__Mock(global::IRepository<string> mockObject, global::TUnit.Mocks.MockEngine<global::IRepository<string>> engine)
internal IRepository_string_Mock(global::IRepository<string> mockObject, global::TUnit.Mocks.MockEngine<global::IRepository<string>> engine)
: base(mockObject, engine) { }

string global::IRepository<string>.GetById(int id) => Object.GetById(id);
Expand All @@ -26,7 +26,7 @@ namespace TUnit.Mocks.Generated

namespace TUnit.Mocks.Generated
{
internal static class IRepository_string__MockFactory
internal static class IRepository_string_MockFactory
{
[global::System.Runtime.CompilerServices.ModuleInitializer]
internal static void Register()
Expand All @@ -38,9 +38,9 @@ namespace TUnit.Mocks.Generated
{
if (constructorArgs.Length > 0) throw new global::System.ArgumentException($"Interface mock 'global::IRepository<string>' does not support constructor arguments, but {constructorArgs.Length} were provided.");
var engine = new global::TUnit.Mocks.MockEngine<global::IRepository<string>>(behavior);
var impl = new IRepository_string__MockImpl(engine);
var impl = new IRepository_string_MockImpl(engine);
engine.Raisable = impl;
var mock = new IRepository_string__Mock(impl, engine);
var mock = new IRepository_string_Mock(impl, engine);
return mock;
}
}
Expand All @@ -54,14 +54,14 @@ namespace TUnit.Mocks.Generated

namespace TUnit.Mocks.Generated
{
internal sealed class IRepository_string__MockImpl : global::IRepository<string>, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
internal sealed class IRepository_string_MockImpl : global::IRepository<string>, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
{
private readonly global::TUnit.Mocks.MockEngine<global::IRepository<string>> _engine;

[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
global::TUnit.Mocks.IMock? global::TUnit.Mocks.IMockObject.MockWrapper { get; set; }

internal IRepository_string__MockImpl(global::TUnit.Mocks.MockEngine<global::IRepository<string>> engine)
internal IRepository_string_MockImpl(global::TUnit.Mocks.MockEngine<global::IRepository<string>> engine)
{
_engine = engine;
}
Expand Down Expand Up @@ -284,9 +284,9 @@ namespace TUnit.Mocks
{
extension(global::IRepository<string>)
{
public static global::TUnit.Mocks.Generated.IRepository_string__Mock Mock(global::TUnit.Mocks.MockBehavior behavior = global::TUnit.Mocks.MockBehavior.Loose)
public static global::TUnit.Mocks.Generated.IRepository_string_Mock Mock(global::TUnit.Mocks.MockBehavior behavior = global::TUnit.Mocks.MockBehavior.Loose)
{
return (global::TUnit.Mocks.Generated.IRepository_string__Mock)global::TUnit.Mocks.Generated.IRepository_string__MockFactory.Create(behavior, []);
return (global::TUnit.Mocks.Generated.IRepository_string_Mock)global::TUnit.Mocks.Generated.IRepository_string_MockFactory.Create(behavior, []);
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions ...cks.SourceGenerator.Tests/Snapshots/Interface_Inheriting_Multiple_Interfaces.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

namespace TUnit.Mocks.Generated
{
public sealed class IReadWriter_Mock : global::TUnit.Mocks.Mock<global::IReadWriter>, global::IReadWriter
public sealed class IReadWriterMock : global::TUnit.Mocks.Mock<global::IReadWriter>, global::IReadWriter
{
[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
internal IReadWriter_Mock(global::IReadWriter mockObject, global::TUnit.Mocks.MockEngine<global::IReadWriter> engine)
internal IReadWriterMock(global::IReadWriter mockObject, global::TUnit.Mocks.MockEngine<global::IReadWriter> engine)
: base(mockObject, engine) { }

void global::IReadWriter.Flush()
Expand All @@ -31,7 +31,7 @@ namespace TUnit.Mocks.Generated

namespace TUnit.Mocks.Generated
{
internal static class IReadWriter_MockFactory
internal static class IReadWriterMockFactory
{
[global::System.Runtime.CompilerServices.ModuleInitializer]
internal static void Register()
Expand All @@ -43,9 +43,9 @@ namespace TUnit.Mocks.Generated
{
if (constructorArgs.Length > 0) throw new global::System.ArgumentException($"Interface mock 'global::IReadWriter' does not support constructor arguments, but {constructorArgs.Length} were provided.");
var engine = new global::TUnit.Mocks.MockEngine<global::IReadWriter>(behavior);
var impl = new IReadWriter_MockImpl(engine);
var impl = new IReadWriterMockImpl(engine);
engine.Raisable = impl;
var mock = new IReadWriter_Mock(impl, engine);
var mock = new IReadWriterMock(impl, engine);
return mock;
}
}
Expand All @@ -59,14 +59,14 @@ namespace TUnit.Mocks.Generated

namespace TUnit.Mocks.Generated
{
internal sealed class IReadWriter_MockImpl : global::IReadWriter, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
internal sealed class IReadWriterMockImpl : global::IReadWriter, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
{
private readonly global::TUnit.Mocks.MockEngine<global::IReadWriter> _engine;

[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
global::TUnit.Mocks.IMock? global::TUnit.Mocks.IMockObject.MockWrapper { get; set; }

internal IReadWriter_MockImpl(global::TUnit.Mocks.MockEngine<global::IReadWriter> engine)
internal IReadWriterMockImpl(global::TUnit.Mocks.MockEngine<global::IReadWriter> engine)
{
_engine = engine;
}
Expand Down Expand Up @@ -213,9 +213,9 @@ namespace TUnit.Mocks
{
extension(global::IReadWriter)
{
public static global::TUnit.Mocks.Generated.IReadWriter_Mock Mock(global::TUnit.Mocks.MockBehavior behavior = global::TUnit.Mocks.MockBehavior.Loose)
public static global::TUnit.Mocks.Generated.IReadWriterMock Mock(global::TUnit.Mocks.MockBehavior behavior = global::TUnit.Mocks.MockBehavior.Loose)
{
return (global::TUnit.Mocks.Generated.IReadWriter_Mock)global::TUnit.Mocks.Generated.IReadWriter_MockFactory.Create(behavior, []);
return (global::TUnit.Mocks.Generated.IReadWriterMock)global::TUnit.Mocks.Generated.IReadWriterMockFactory.Create(behavior, []);
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions TUnit.Mocks.SourceGenerator.Tests/Snapshots/Interface_With_Async_Methods.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

namespace TUnit.Mocks.Generated
{
public sealed class IAsyncService_Mock : global::TUnit.Mocks.Mock<global::IAsyncService>, global::IAsyncService
public sealed class IAsyncServiceMock : global::TUnit.Mocks.Mock<global::IAsyncService>, global::IAsyncService
{
[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
internal IAsyncService_Mock(global::IAsyncService mockObject, global::TUnit.Mocks.MockEngine<global::IAsyncService> engine)
internal IAsyncServiceMock(global::IAsyncService mockObject, global::TUnit.Mocks.MockEngine<global::IAsyncService> engine)
: base(mockObject, engine) { }

global::System.Threading.Tasks.Task<string> global::IAsyncService.GetValueAsync(string key) => Object.GetValueAsync(key);
Expand All @@ -27,7 +27,7 @@ namespace TUnit.Mocks.Generated

namespace TUnit.Mocks.Generated
{
internal static class IAsyncService_MockFactory
internal static class IAsyncServiceMockFactory
{
[global::System.Runtime.CompilerServices.ModuleInitializer]
internal static void Register()
Expand All @@ -39,9 +39,9 @@ namespace TUnit.Mocks.Generated
{
if (constructorArgs.Length > 0) throw new global::System.ArgumentException($"Interface mock 'global::IAsyncService' does not support constructor arguments, but {constructorArgs.Length} were provided.");
var engine = new global::TUnit.Mocks.MockEngine<global::IAsyncService>(behavior);
var impl = new IAsyncService_MockImpl(engine);
var impl = new IAsyncServiceMockImpl(engine);
engine.Raisable = impl;
var mock = new IAsyncService_Mock(impl, engine);
var mock = new IAsyncServiceMock(impl, engine);
return mock;
}
}
Expand All @@ -55,14 +55,14 @@ namespace TUnit.Mocks.Generated

namespace TUnit.Mocks.Generated
{
internal sealed class IAsyncService_MockImpl : global::IAsyncService, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
internal sealed class IAsyncServiceMockImpl : global::IAsyncService, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
{
private readonly global::TUnit.Mocks.MockEngine<global::IAsyncService> _engine;

[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
global::TUnit.Mocks.IMock? global::TUnit.Mocks.IMockObject.MockWrapper { get; set; }

internal IAsyncService_MockImpl(global::TUnit.Mocks.MockEngine<global::IAsyncService> engine)
internal IAsyncServiceMockImpl(global::TUnit.Mocks.MockEngine<global::IAsyncService> engine)
{
_engine = engine;
}
Expand Down Expand Up @@ -526,9 +526,9 @@ namespace TUnit.Mocks
{
extension(global::IAsyncService)
{
public static global::TUnit.Mocks.Generated.IAsyncService_Mock Mock(global::TUnit.Mocks.MockBehavior behavior = global::TUnit.Mocks.MockBehavior.Loose)
public static global::TUnit.Mocks.Generated.IAsyncServiceMock Mock(global::TUnit.Mocks.MockBehavior behavior = global::TUnit.Mocks.MockBehavior.Loose)
{
return (global::TUnit.Mocks.Generated.IAsyncService_Mock)global::TUnit.Mocks.Generated.IAsyncService_MockFactory.Create(behavior, []);
return (global::TUnit.Mocks.Generated.IAsyncServiceMock)global::TUnit.Mocks.Generated.IAsyncServiceMockFactory.Create(behavior, []);
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions TUnit.Mocks.SourceGenerator.Tests/Snapshots/Interface_With_Events.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

namespace TUnit.Mocks.Generated
{
public sealed class INotifier_Mock : global::TUnit.Mocks.Mock<global::INotifier>, global::INotifier
public sealed class INotifierMock : global::TUnit.Mocks.Mock<global::INotifier>, global::INotifier
{
[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
internal INotifier_Mock(global::INotifier mockObject, global::TUnit.Mocks.MockEngine<global::INotifier> engine)
internal INotifierMock(global::INotifier mockObject, global::TUnit.Mocks.MockEngine<global::INotifier> engine)
: base(mockObject, engine) { }

void global::INotifier.Notify(string message)
Expand Down Expand Up @@ -57,7 +57,7 @@ namespace TUnit.Mocks.Generated

namespace TUnit.Mocks.Generated
{
internal static class INotifier_MockFactory
internal static class INotifierMockFactory
{
[global::System.Runtime.CompilerServices.ModuleInitializer]
internal static void Register()
Expand All @@ -69,9 +69,9 @@ namespace TUnit.Mocks.Generated
{
if (constructorArgs.Length > 0) throw new global::System.ArgumentException($"Interface mock 'global::INotifier' does not support constructor arguments, but {constructorArgs.Length} were provided.");
var engine = new global::TUnit.Mocks.MockEngine<global::INotifier>(behavior);
var impl = new INotifier_MockImpl(engine);
var impl = new INotifierMockImpl(engine);
engine.Raisable = impl;
var mock = new INotifier_Mock(impl, engine);
var mock = new INotifierMock(impl, engine);
return mock;
}
}
Expand All @@ -85,14 +85,14 @@ namespace TUnit.Mocks.Generated

namespace TUnit.Mocks.Generated
{
internal sealed class INotifier_MockImpl : global::INotifier, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
internal sealed class INotifierMockImpl : global::INotifier, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
{
private readonly global::TUnit.Mocks.MockEngine<global::INotifier> _engine;

[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
global::TUnit.Mocks.IMock? global::TUnit.Mocks.IMockObject.MockWrapper { get; set; }

internal INotifier_MockImpl(global::TUnit.Mocks.MockEngine<global::INotifier> engine)
internal INotifierMockImpl(global::TUnit.Mocks.MockEngine<global::INotifier> engine)
{
_engine = engine;
}
Expand Down Expand Up @@ -246,9 +246,9 @@ namespace TUnit.Mocks
{
extension(global::INotifier)
{
public static global::TUnit.Mocks.Generated.INotifier_Mock Mock(global::TUnit.Mocks.MockBehavior behavior = global::TUnit.Mocks.MockBehavior.Loose)
public static global::TUnit.Mocks.Generated.INotifierMock Mock(global::TUnit.Mocks.MockBehavior behavior = global::TUnit.Mocks.MockBehavior.Loose)
{
return (global::TUnit.Mocks.Generated.INotifier_Mock)global::TUnit.Mocks.Generated.INotifier_MockFactory.Create(behavior, []);
return (global::TUnit.Mocks.Generated.INotifierMock)global::TUnit.Mocks.Generated.INotifierMockFactory.Create(behavior, []);
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions TUnit.Mocks.SourceGenerator.Tests/Snapshots/Interface_With_Generic_Methods.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

namespace TUnit.Mocks.Generated
{
public sealed class IRepository_Mock : global::TUnit.Mocks.Mock<global::IRepository>, global::IRepository
public sealed class IRepositoryMock : global::TUnit.Mocks.Mock<global::IRepository>, global::IRepository
{
[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
internal IRepository_Mock(global::IRepository mockObject, global::TUnit.Mocks.MockEngine<global::IRepository> engine)
internal IRepositoryMock(global::IRepository mockObject, global::TUnit.Mocks.MockEngine<global::IRepository> engine)
: base(mockObject, engine) { }

T global::IRepository.GetById<T>(int id) where T : class => Object.GetById<T>(id);
Expand All @@ -28,7 +28,7 @@ namespace TUnit.Mocks.Generated

namespace TUnit.Mocks.Generated
{
internal static class IRepository_MockFactory
internal static class IRepositoryMockFactory
{
[global::System.Runtime.CompilerServices.ModuleInitializer]
internal static void Register()
Expand All @@ -40,9 +40,9 @@ namespace TUnit.Mocks.Generated
{
if (constructorArgs.Length > 0) throw new global::System.ArgumentException($"Interface mock 'global::IRepository' does not support constructor arguments, but {constructorArgs.Length} were provided.");
var engine = new global::TUnit.Mocks.MockEngine<global::IRepository>(behavior);
var impl = new IRepository_MockImpl(engine);
var impl = new IRepositoryMockImpl(engine);
engine.Raisable = impl;
var mock = new IRepository_Mock(impl, engine);
var mock = new IRepositoryMock(impl, engine);
return mock;
}
}
Expand All @@ -56,14 +56,14 @@ namespace TUnit.Mocks.Generated

namespace TUnit.Mocks.Generated
{
internal sealed class IRepository_MockImpl : global::IRepository, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
internal sealed class IRepositoryMockImpl : global::IRepository, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
{
private readonly global::TUnit.Mocks.MockEngine<global::IRepository> _engine;

[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
global::TUnit.Mocks.IMock? global::TUnit.Mocks.IMockObject.MockWrapper { get; set; }

internal IRepository_MockImpl(global::TUnit.Mocks.MockEngine<global::IRepository> engine)
internal IRepositoryMockImpl(global::TUnit.Mocks.MockEngine<global::IRepository> engine)
{
_engine = engine;
}
Expand Down Expand Up @@ -154,9 +154,9 @@ namespace TUnit.Mocks
{
extension(global::IRepository)
{
public static global::TUnit.Mocks.Generated.IRepository_Mock Mock(global::TUnit.Mocks.MockBehavior behavior = global::TUnit.Mocks.MockBehavior.Loose)
public static global::TUnit.Mocks.Generated.IRepositoryMock Mock(global::TUnit.Mocks.MockBehavior behavior = global::TUnit.Mocks.MockBehavior.Loose)
{
return (global::TUnit.Mocks.Generated.IRepository_Mock)global::TUnit.Mocks.Generated.IRepository_MockFactory.Create(behavior, []);
return (global::TUnit.Mocks.Generated.IRepositoryMock)global::TUnit.Mocks.Generated.IRepositoryMockFactory.Create(behavior, []);
}
}
}
Expand Down
Loading
Loading