Refactor hook methods to share unified HookMethod base class

- Created abstract HookMethod base record with all shared properties
- StaticHookMethod and InstanceHookMethod now inherit from HookMethod
- Simplified HookRegisteredContext to work with single HookMethod type
- Reduced EventReceiverOrchestrator hook processing from 15 lines to 3
- Simplified HookCollectionService hook registration logic
- Hook event receivers now only need to handle HookMethod instead of both types
Co-authored-by: Tom Longhurst <thomhurst@users.noreply.github.com>

Author: claude[bot]

TUnit.Core/Contexts/HookRegisteredContext.cs

@@ -7,13 +7,10 @@ namespace TUnit.Core;
 /// </summary>
 publicclassHookRegisteredContext
 {
-privatereadonlyobject_hookMethod;
-privatereadonlystring_hookName;
 privateTimeSpan?_timeout;
 
-publicStaticHookMethod?StaticHookMethod=>_hookMethodasStaticHookMethod;
-publicInstanceHookMethod?InstanceHookMethod=>_hookMethodasInstanceHookMethod;
-publicstringHookName=>_hookName;
+publicHookMethodHookMethod{get;}
+publicstringHookName=>HookMethod.Name;
 
 /// <summary>
 /// Gets or sets the timeout for this hook
@@ -24,15 +21,8 @@ public TimeSpan? Timeout
 set=>_timeout=value;
 }
 
-publicHookRegisteredContext(StaticHookMethodhookMethod)
+publicHookRegisteredContext(HookMethodhookMethod)
 {
-_hookMethod=hookMethod;
-_hookName=hookMethod.Name;
-}
-
-publicHookRegisteredContext(InstanceHookMethodhookMethod)
-{
-_hookMethod=hookMethod;
-_hookName=hookMethod.Name;
+HookMethod=hookMethod;
 }
 }

TUnit.Core/Hooks/HookMethod.cs

@@ -1,20 +1,37 @@
-namespaceTUnit.Core.Hooks;
+usingSystem.Diagnostics.CodeAnalysis;
+usingSystem.Reflection;
+usingTUnit.Core.Extensions;
+usingTUnit.Core.Interfaces;
 
-publicclassHookMethod
+namespaceTUnit.Core.Hooks;
+
+#if !DEBUG
+[System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+#endif
+publicabstractrecordHookMethod
 {
-publicStaticHookMethod?StaticHookMethod{get;}
-publicInstanceHookMethod?InstanceHookMethod{get;}
+publicrequiredMethodMetadataMethodInfo{get;init;}
+
+[field:AllowNull,MaybeNull]
+publicstringName=>field??=$"{ClassType.Name}.{MethodInfo.Name}({string.Join(", ",MethodInfo.Parameters.Select(x =>x.Name))})";
+
+publicabstractTypeClassType{get;}
+publicvirtualAssembly?Assembly=>ClassType?.Assembly;
+
+[field:AllowNull,MaybeNull]
+publicIEnumerable<Attribute>Attributes=>field??=MethodInfo.GetCustomAttributes();
+
+publicTAttribute?GetAttribute<TAttribute>()whereTAttribute:Attribute=>Attributes.OfType<TAttribute>().FirstOrDefault();
 
-publicHookMethod(InstanceHookMethodinstanceHookMethod)
-{
-InstanceHookMethod=instanceHookMethod;
-}
+/// <summary>
+/// Gets the timeout for this hook method. This will be set during hook registration
+/// by the event receiver infrastructure, falling back to the default 5-minute timeout.
+/// </summary>
+publicTimeSpan?Timeout{get;internalset;}=TimeSpan.FromMinutes(5);
 
-publicHookMethod(StaticHookMethodstaticHookMethod)
-{
-StaticHookMethod=staticHookMethod;
-}
+publicrequiredIHookExecutorHookExecutor{get;init;}
 
-publicstaticimplicitoperatorHookMethod(InstanceHookMethodinstanceHookMethod)=>new(instanceHookMethod);
-publicstaticimplicitoperatorHookMethod(StaticHookMethodstaticHookMethod)=>new(staticHookMethod);
+publicrequiredintOrder{get;init;}
+
+publicrequiredintRegistrationIndex{get;init;}
 }

TUnit.Core/Hooks/InstanceHookMethod.cs

@@ -8,31 +8,10 @@ namespace TUnit.Core.Hooks;
 #if !DEBUG
 [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
 #endif
-publicrecordInstanceHookMethod:IExecutableHook<TestContext>
+publicrecordInstanceHookMethod:HookMethod,IExecutableHook<TestContext>
 {
 [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods)]
-publicrequiredTypeClassType{get;init;}
-publicAssemblyAssembly=>ClassType.Assembly;
-publicrequiredMethodMetadataMethodInfo{get;init;}
-
-[field:AllowNull,MaybeNull]
-publicstringName=>field??=$"{ClassType.Name}.{MethodInfo.Name}({string.Join(", ",MethodInfo.Parameters.Select(x =>x.Name))})";
-
-[field:AllowNull,MaybeNull]publicIEnumerable<Attribute>Attributes=>field??=MethodInfo.GetCustomAttributes();
-
-publicTAttribute?GetAttribute<TAttribute>()whereTAttribute:Attribute=>Attributes.OfType<TAttribute>().FirstOrDefault();
-
-/// <summary>
-/// Gets or sets the timeout for this hook method. This will be set during hook registration
-/// by the event receiver infrastructure, falling back to the default 5-minute timeout.
-/// </summary>
-publicTimeSpan?Timeout{get;internalset;}=TimeSpan.FromMinutes(5);
-
-publicrequiredIHookExecutorHookExecutor{get;init;}
-
-publicrequiredintOrder{get;init;}
-
-publicrequiredintRegistrationIndex{get;init;}
+publicoverrideTypeClassType{get;init;}
 
 publicFunc<object,TestContext,CancellationToken,ValueTask>?Body{get;init;}
 

TUnit.Core/Hooks/StaticHookMethod.cs

@@ -17,32 +17,9 @@ public abstract record StaticHookMethod<T> : StaticHookMethod, IExecutableHook<T
 #if !DEBUG
 [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
 #endif
-publicabstractrecordStaticHookMethod
+publicabstractrecordStaticHookMethod:HookMethod
 {
-publicrequiredMethodMetadataMethodInfo{get;init;}
-
-[field:AllowNull,MaybeNull]
-publicstringName=>field??=$"{MethodInfo.Class.Type.Name}.{MethodInfo.Name}({string.Join(", ",MethodInfo.Parameters.Select(x =>x.Name))})";
-
-publicTypeClassType=>MethodInfo.Class.Type;
-publicAssembly?Assembly=>ClassType?.Assembly;
-
-[field:AllowNull,MaybeNull]
-publicIEnumerable<Attribute>Attributes=>field??=MethodInfo.GetCustomAttributes();
-
-publicTAttribute?GetAttribute<TAttribute>()whereTAttribute:Attribute=>Attributes.OfType<TAttribute>().FirstOrDefault();
-
-/// <summary>
-/// Gets the timeout for this hook method. This will be set during hook registration
-/// by the event receiver infrastructure, falling back to the default 5-minute timeout.
-/// </summary>
-publicTimeSpan?Timeout{get;internalset;}=TimeSpan.FromMinutes(5);
-
-publicrequiredIHookExecutorHookExecutor{get;init;}
-
-publicrequiredintOrder{get;init;}
-
-publicrequiredintRegistrationIndex{get;init;}
+publicoverrideTypeClassType=>MethodInfo.Class.Type;
 
 publicrequiredstringFilePath{get;init;}
 

TUnit.Engine/Services/EventReceiverOrchestrator.cs

@@ -200,22 +200,7 @@ public async ValueTask InvokeTestDiscoveryEventReceiversAsync(TestContext contex
 publicasyncValueTaskInvokeHookRegistrationEventReceiversAsync(HookRegisteredContexthookContext,CancellationTokencancellationToken)
 {
 // Get event receivers from the hook method's attributes
-IEnumerable<Attribute>attributes;
-
-if(hookContext.StaticHookMethod!=null)
-{
-attributes=hookContext.StaticHookMethod.Attributes;
-}
-elseif(hookContext.InstanceHookMethod!=null)
-{
-attributes=hookContext.InstanceHookMethod.Attributes;
-}
-else
-{
-return;// No hook method to process
-}
-
-vareventReceivers=attributes
+vareventReceivers=hookContext.HookMethod.Attributes
 .OfType<IHookRegisteredEventReceiver>()
 .OrderBy(r =>r.Order)
 .ToList();

TUnit.Engine/Services/HookCollectionService.cs

@@ -28,7 +28,7 @@ public HookCollectionService(EventReceiverOrchestrator eventReceiverOrchestrator
 _eventReceiverOrchestrator=eventReceiverOrchestrator;
 }
 
-privateasyncTaskProcessHookRegistrationAsync(objecthookMethod,CancellationTokencancellationToken=default)
+privateasyncTaskProcessHookRegistrationAsync(HookMethodhookMethod,CancellationTokencancellationToken=default)
 {
 // Only process each hook once
 if(!_processedHooks.TryAdd(hookMethod,true))
@@ -38,20 +38,7 @@ private async Task ProcessHookRegistrationAsync(object hookMethod, CancellationT
 
 try
 {
-HookRegisteredContextcontext;
-
-if(hookMethodisStaticHookMethodstaticHook)
-{
-context=newHookRegisteredContext(staticHook);
-}
-elseif(hookMethodisInstanceHookMethodinstanceHook)
-{
-context=newHookRegisteredContext(instanceHook);
-}
-else
-{
-return;// Unknown hook type
-}
+varcontext=newHookRegisteredContext(hookMethod);
 
 await_eventReceiverOrchestrator.InvokeHookRegistrationEventReceiversAsync(context,cancellationToken);
 }