refactor(mocks): use file-scoped types for generated implementation details

TUnit.Mocks.SourceGenerator.Tests/Snapshots/GenerateMock_Attribute_With_Concrete_Class.verified.txt

@@ -3,34 +3,7 @@
 
 namespace TUnit.Mocks.Generated
 {
-    internal static class MyServicePartialMockFactory
-    {
-        [global::System.Runtime.CompilerServices.ModuleInitializer]
-        internal static void Register()
-        {
-            global::TUnit.Mocks.MockRegistry.RegisterFactory<global::MyService>(Create);
-        }
-
-        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 MyServiceMockImpl(engine);
-            engine.Raisable = impl;
-            var mock = new global::TUnit.Mocks.Mock<global::MyService>(impl, engine);
-            return mock;
-        }
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-// <auto-generated/>
-#nullable enable
-
-namespace TUnit.Mocks.Generated
-{
-    internal sealed class MyServiceMockImpl : global::MyService, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
+    file sealed class MyServiceMockImpl : global::MyService, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
     {
         private readonly global::TUnit.Mocks.MockEngine<global::MyService> _engine;
 
@@ -66,6 +39,24 @@ namespace TUnit.Mocks.Generated
             throw new global::System.InvalidOperationException($"No event named '{eventName}' exists on this mock.");
         }
     }
+
+    file static class MyServicePartialMockFactory
+    {
+        [global::System.Runtime.CompilerServices.ModuleInitializer]
+        internal static void Register()
+        {
+            global::TUnit.Mocks.MockRegistry.RegisterFactory<global::MyService>(Create);
+        }
+
+        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 MyServiceMockImpl(engine);
+            engine.Raisable = impl;
+            var mock = new global::TUnit.Mocks.Mock<global::MyService>(impl, engine);
+            return mock;
+        }
+    }
 }
 
 

TUnit.Mocks.SourceGenerator.Tests/Snapshots/Generic_Interface_Extension_Discovery.verified.txt

@@ -26,35 +26,7 @@ namespace TUnit.Mocks.Generated
 
 namespace TUnit.Mocks.Generated
 {
-    internal static class IRepository_string_MockFactory
-    {
-        [global::System.Runtime.CompilerServices.ModuleInitializer]
-        internal static void Register()
-        {
-            global::TUnit.Mocks.MockRegistry.RegisterFactory<global::IRepository<string>>(Create);
-        }
-
-        internal static global::TUnit.Mocks.Mock<global::IRepository<string>> Create(global::TUnit.Mocks.MockBehavior behavior, object[] constructorArgs)
-        {
-            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);
-            engine.Raisable = impl;
-            var mock = new IRepository_string_Mock(impl, engine);
-            return mock;
-        }
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-// <auto-generated/>
-#nullable enable
-
-namespace TUnit.Mocks.Generated
-{
-    internal sealed class IRepository_string_MockImpl : global::IRepository<string>, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
+    file 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;
 
@@ -82,6 +54,25 @@ namespace TUnit.Mocks.Generated
             throw new global::System.InvalidOperationException($"No event named '{eventName}' exists on this mock.");
         }
     }
+
+    file static class IRepository_string_MockFactory
+    {
+        [global::System.Runtime.CompilerServices.ModuleInitializer]
+        internal static void Register()
+        {
+            global::TUnit.Mocks.MockRegistry.RegisterFactory<global::IRepository<string>>(Create);
+        }
+
+        internal static global::TUnit.Mocks.Mock<global::IRepository<string>> Create(global::TUnit.Mocks.MockBehavior behavior, object[] constructorArgs)
+        {
+            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);
+            engine.Raisable = impl;
+            var mock = new IRepository_string_Mock(impl, engine);
+            return mock;
+        }
+    }
 }
 
 
@@ -286,7 +277,7 @@ namespace TUnit.Mocks
         {
             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.Mock.Of<global::IRepository<string>>(behavior);
             }
         }
     }

TUnit.Mocks.SourceGenerator.Tests/Snapshots/Interface_Inheriting_Multiple_Interfaces.verified.txt

@@ -31,35 +31,7 @@ namespace TUnit.Mocks.Generated
 
 namespace TUnit.Mocks.Generated
 {
-    internal static class IReadWriterMockFactory
-    {
-        [global::System.Runtime.CompilerServices.ModuleInitializer]
-        internal static void Register()
-        {
-            global::TUnit.Mocks.MockRegistry.RegisterFactory<global::IReadWriter>(Create);
-        }
-
-        internal static global::TUnit.Mocks.Mock<global::IReadWriter> Create(global::TUnit.Mocks.MockBehavior behavior, object[] constructorArgs)
-        {
-            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 IReadWriterMockImpl(engine);
-            engine.Raisable = impl;
-            var mock = new IReadWriterMock(impl, engine);
-            return mock;
-        }
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-// <auto-generated/>
-#nullable enable
-
-namespace TUnit.Mocks.Generated
-{
-    internal sealed class IReadWriterMockImpl : global::IReadWriter, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
+    file sealed class IReadWriterMockImpl : global::IReadWriter, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
     {
         private readonly global::TUnit.Mocks.MockEngine<global::IReadWriter> _engine;
 
@@ -92,6 +64,25 @@ namespace TUnit.Mocks.Generated
             throw new global::System.InvalidOperationException($"No event named '{eventName}' exists on this mock.");
         }
     }
+
+    file static class IReadWriterMockFactory
+    {
+        [global::System.Runtime.CompilerServices.ModuleInitializer]
+        internal static void Register()
+        {
+            global::TUnit.Mocks.MockRegistry.RegisterFactory<global::IReadWriter>(Create);
+        }
+
+        internal static global::TUnit.Mocks.Mock<global::IReadWriter> Create(global::TUnit.Mocks.MockBehavior behavior, object[] constructorArgs)
+        {
+            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 IReadWriterMockImpl(engine);
+            engine.Raisable = impl;
+            var mock = new IReadWriterMock(impl, engine);
+            return mock;
+        }
+    }
 }
 
 
@@ -215,7 +206,7 @@ namespace TUnit.Mocks
         {
             public static global::TUnit.Mocks.Generated.IReadWriterMock Mock(global::TUnit.Mocks.MockBehavior behavior = global::TUnit.Mocks.MockBehavior.Loose)
             {
-                return (global::TUnit.Mocks.Generated.IReadWriterMock)global::TUnit.Mocks.Generated.IReadWriterMockFactory.Create(behavior, []);
+                return (global::TUnit.Mocks.Generated.IReadWriterMock)global::TUnit.Mocks.Mock.Of<global::IReadWriter>(behavior);
             }
         }
     }

TUnit.Mocks.SourceGenerator.Tests/Snapshots/Interface_With_Async_Methods.verified.txt

@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #nullable enable
 
 namespace TUnit.Mocks.Generated
@@ -27,35 +27,7 @@ namespace TUnit.Mocks.Generated
 
 namespace TUnit.Mocks.Generated
 {
-    internal static class IAsyncServiceMockFactory
-    {
-        [global::System.Runtime.CompilerServices.ModuleInitializer]
-        internal static void Register()
-        {
-            global::TUnit.Mocks.MockRegistry.RegisterFactory<global::IAsyncService>(Create);
-        }
-
-        internal static global::TUnit.Mocks.Mock<global::IAsyncService> Create(global::TUnit.Mocks.MockBehavior behavior, object[] constructorArgs)
-        {
-            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 IAsyncServiceMockImpl(engine);
-            engine.Raisable = impl;
-            var mock = new IAsyncServiceMock(impl, engine);
-            return mock;
-        }
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-// <auto-generated/>
-#nullable enable
-
-namespace TUnit.Mocks.Generated
-{
-    internal sealed class IAsyncServiceMockImpl : global::IAsyncService, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
+    file sealed class IAsyncServiceMockImpl : global::IAsyncService, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
     {
         private readonly global::TUnit.Mocks.MockEngine<global::IAsyncService> _engine;
 
@@ -145,6 +117,25 @@ namespace TUnit.Mocks.Generated
             throw new global::System.InvalidOperationException($"No event named '{eventName}' exists on this mock.");
         }
     }
+
+    file static class IAsyncServiceMockFactory
+    {
+        [global::System.Runtime.CompilerServices.ModuleInitializer]
+        internal static void Register()
+        {
+            global::TUnit.Mocks.MockRegistry.RegisterFactory<global::IAsyncService>(Create);
+        }
+
+        internal static global::TUnit.Mocks.Mock<global::IAsyncService> Create(global::TUnit.Mocks.MockBehavior behavior, object[] constructorArgs)
+        {
+            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 IAsyncServiceMockImpl(engine);
+            engine.Raisable = impl;
+            var mock = new IAsyncServiceMock(impl, engine);
+            return mock;
+        }
+    }
 }
 
 
@@ -542,7 +533,7 @@ namespace TUnit.Mocks
         {
             public static global::TUnit.Mocks.Generated.IAsyncServiceMock Mock(global::TUnit.Mocks.MockBehavior behavior = global::TUnit.Mocks.MockBehavior.Loose)
             {
-                return (global::TUnit.Mocks.Generated.IAsyncServiceMock)global::TUnit.Mocks.Generated.IAsyncServiceMockFactory.Create(behavior, []);
+                return (global::TUnit.Mocks.Generated.IAsyncServiceMock)global::TUnit.Mocks.Mock.Of<global::IAsyncService>(behavior);
             }
         }
     }

TUnit.Mocks.SourceGenerator.Tests/Snapshots/Interface_With_Events.verified.txt

@@ -57,35 +57,7 @@ namespace TUnit.Mocks.Generated
 
 namespace TUnit.Mocks.Generated
 {
-    internal static class INotifierMockFactory
-    {
-        [global::System.Runtime.CompilerServices.ModuleInitializer]
-        internal static void Register()
-        {
-            global::TUnit.Mocks.MockRegistry.RegisterFactory<global::INotifier>(Create);
-        }
-
-        internal static global::TUnit.Mocks.Mock<global::INotifier> Create(global::TUnit.Mocks.MockBehavior behavior, object[] constructorArgs)
-        {
-            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 INotifierMockImpl(engine);
-            engine.Raisable = impl;
-            var mock = new INotifierMock(impl, engine);
-            return mock;
-        }
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-// <auto-generated/>
-#nullable enable
-
-namespace TUnit.Mocks.Generated
-{
-    internal sealed class INotifierMockImpl : global::INotifier, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
+    file sealed class INotifierMockImpl : global::INotifier, global::TUnit.Mocks.IRaisable, global::TUnit.Mocks.IMockObject
     {
         private readonly global::TUnit.Mocks.MockEngine<global::INotifier> _engine;
 
@@ -129,6 +101,25 @@ namespace TUnit.Mocks.Generated
             }
         }
     }
+
+    file static class INotifierMockFactory
+    {
+        [global::System.Runtime.CompilerServices.ModuleInitializer]
+        internal static void Register()
+        {
+            global::TUnit.Mocks.MockRegistry.RegisterFactory<global::INotifier>(Create);
+        }
+
+        internal static global::TUnit.Mocks.Mock<global::INotifier> Create(global::TUnit.Mocks.MockBehavior behavior, object[] constructorArgs)
+        {
+            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 INotifierMockImpl(engine);
+            engine.Raisable = impl;
+            var mock = new INotifierMock(impl, engine);
+            return mock;
+        }
+    }
 }
 
 
@@ -248,7 +239,7 @@ namespace TUnit.Mocks
         {
             public static global::TUnit.Mocks.Generated.INotifierMock Mock(global::TUnit.Mocks.MockBehavior behavior = global::TUnit.Mocks.MockBehavior.Loose)
             {
-                return (global::TUnit.Mocks.Generated.INotifierMock)global::TUnit.Mocks.Generated.INotifierMockFactory.Create(behavior, []);
+                return (global::TUnit.Mocks.Generated.INotifierMock)global::TUnit.Mocks.Mock.Of<global::INotifier>(behavior);
             }
         }
     }