diff --git a/TUnit.Core/Attributes/TestData/AsyncDataSourceGeneratorAttribute.cs b/TUnit.Core/Attributes/TestData/AsyncDataSourceGeneratorAttribute.cs index 8045badda6..f1d7601aee 100644 --- a/TUnit.Core/Attributes/TestData/AsyncDataSourceGeneratorAttribute.cs +++ b/TUnit.Core/Attributes/TestData/AsyncDataSourceGeneratorAttribute.cs @@ -7,12 +7,9 @@ public abstract class AsyncDataSourceGeneratorAttribute<[DynamicallyAccessedMemb { protected abstract IAsyncEnumerable>> GenerateDataSourcesAsync(DataGeneratorMetadata dataGeneratorMetadata); - public sealed override async IAsyncEnumerable>> GetTypedDataRowsAsync(DataGeneratorMetadata dataGeneratorMetadata) + public sealed override IAsyncEnumerable>> GetTypedDataRowsAsync(DataGeneratorMetadata dataGeneratorMetadata) { - await foreach (var generateDataSource in GenerateDataSourcesAsync(dataGeneratorMetadata)) - { - yield return generateDataSource; - } + return GenerateDataSourcesAsync(dataGeneratorMetadata); } } @@ -25,12 +22,9 @@ public abstract class AsyncDataSourceGeneratorAttribute< { protected abstract IAsyncEnumerable>> GenerateDataSourcesAsync(DataGeneratorMetadata dataGeneratorMetadata); - public sealed override async IAsyncEnumerable>> GetTypedDataRowsAsync(DataGeneratorMetadata dataGeneratorMetadata) + public sealed override IAsyncEnumerable>> GetTypedDataRowsAsync(DataGeneratorMetadata dataGeneratorMetadata) { - await foreach (var generateDataSource in GenerateDataSourcesAsync(dataGeneratorMetadata)) - { - yield return generateDataSource; - } + return GenerateDataSourcesAsync(dataGeneratorMetadata); } } @@ -45,12 +39,9 @@ public abstract class AsyncDataSourceGeneratorAttribute< { protected abstract IAsyncEnumerable>> GenerateDataSourcesAsync(DataGeneratorMetadata dataGeneratorMetadata); - public sealed override async IAsyncEnumerable>> GetTypedDataRowsAsync(DataGeneratorMetadata dataGeneratorMetadata) + public sealed override IAsyncEnumerable>> GetTypedDataRowsAsync(DataGeneratorMetadata dataGeneratorMetadata) { - await foreach (var generateDataSource in GenerateDataSourcesAsync(dataGeneratorMetadata)) - { - yield return generateDataSource; - } + return GenerateDataSourcesAsync(dataGeneratorMetadata); } } @@ -67,12 +58,9 @@ public abstract class AsyncDataSourceGeneratorAttribute< { protected abstract IAsyncEnumerable>> GenerateDataSourcesAsync(DataGeneratorMetadata dataGeneratorMetadata); - public override async IAsyncEnumerable>> GetTypedDataRowsAsync(DataGeneratorMetadata dataGeneratorMetadata) + public override IAsyncEnumerable>> GetTypedDataRowsAsync(DataGeneratorMetadata dataGeneratorMetadata) { - await foreach (var generateDataSource in GenerateDataSourcesAsync(dataGeneratorMetadata)) - { - yield return generateDataSource; - } + return GenerateDataSourcesAsync(dataGeneratorMetadata); } } @@ -91,11 +79,8 @@ public abstract class AsyncDataSourceGeneratorAttribute< { protected abstract IAsyncEnumerable>> GenerateDataSourcesAsync(DataGeneratorMetadata dataGeneratorMetadata); - public override async IAsyncEnumerable>> GetTypedDataRowsAsync(DataGeneratorMetadata dataGeneratorMetadata) + public override IAsyncEnumerable>> GetTypedDataRowsAsync(DataGeneratorMetadata dataGeneratorMetadata) { - await foreach (var generateDataSource in GenerateDataSourcesAsync(dataGeneratorMetadata)) - { - yield return generateDataSource; - } + return GenerateDataSourcesAsync(dataGeneratorMetadata); } } diff --git a/TUnit.Core/Attributes/TestData/AsyncUntypedDataSourceSourceGeneratorAttribute.cs b/TUnit.Core/Attributes/TestData/AsyncUntypedDataSourceSourceGeneratorAttribute.cs index 033f74c33f..88ae04b9c0 100644 --- a/TUnit.Core/Attributes/TestData/AsyncUntypedDataSourceSourceGeneratorAttribute.cs +++ b/TUnit.Core/Attributes/TestData/AsyncUntypedDataSourceSourceGeneratorAttribute.cs @@ -10,14 +10,11 @@ public abstract class AsyncUntypedDataSourceGeneratorAttribute : Attribute, IAsy protected abstract IAsyncEnumerable>> GenerateDataSourcesAsync(DataGeneratorMetadata dataGeneratorMetadata); - public async IAsyncEnumerable>> GenerateAsync(DataGeneratorMetadata dataGeneratorMetadata) + public IAsyncEnumerable>> GenerateAsync(DataGeneratorMetadata dataGeneratorMetadata) { // Data source initialization is now handled externally by DataSourceInitializer // This follows SRP - the attribute is only responsible for generating data, not initialization - await foreach (var generateDataSource in GenerateDataSourcesAsync(dataGeneratorMetadata)) - { - yield return generateDataSource; - } + return GenerateDataSourcesAsync(dataGeneratorMetadata); } public IAsyncEnumerable>> GetDataRowsAsync(DataGeneratorMetadata dataGeneratorMetadata) diff --git a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet10_0.verified.txt b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet10_0.verified.txt index 40d0c07e34..771e4b26fe 100644 --- a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet10_0.verified.txt +++ b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet10_0.verified.txt @@ -140,7 +140,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override sealed .<<.>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } [(.Class | .Method, AllowMultiple=true)] @@ -148,7 +147,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.<>>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override sealed .<<.<>>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } [(.Class | .Method, AllowMultiple=true)] @@ -156,7 +154,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.<>>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override sealed .<<.<>>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } [(.Class | .Method, AllowMultiple=true)] @@ -164,7 +161,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.<>>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override .<<.<>>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } [(.Class | .Method, AllowMultiple=true)] @@ -172,7 +168,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.<>>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override .<<.<>>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } public class AsyncEvent @@ -195,7 +190,6 @@ namespace { protected AsyncUntypedDataSourceGeneratorAttribute() { } public virtual bool SkipIfEmpty { get; set; } - [.(typeof(.AsyncUntypedDataSourceGeneratorAttribute.d__5))] public .<<.>> GenerateAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } protected abstract .<<.>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); public .<<.>> GetDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } diff --git a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet8_0.verified.txt b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet8_0.verified.txt index 9fb37db4dd..d1fb7c0a3f 100644 --- a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet8_0.verified.txt +++ b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet8_0.verified.txt @@ -140,7 +140,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override sealed .<<.>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } [(.Class | .Method, AllowMultiple=true)] @@ -148,7 +147,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.<>>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override sealed .<<.<>>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } [(.Class | .Method, AllowMultiple=true)] @@ -156,7 +154,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.<>>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override sealed .<<.<>>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } [(.Class | .Method, AllowMultiple=true)] @@ -164,7 +161,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.<>>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override .<<.<>>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } [(.Class | .Method, AllowMultiple=true)] @@ -172,7 +168,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.<>>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override .<<.<>>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } public class AsyncEvent @@ -195,7 +190,6 @@ namespace { protected AsyncUntypedDataSourceGeneratorAttribute() { } public virtual bool SkipIfEmpty { get; set; } - [.(typeof(.AsyncUntypedDataSourceGeneratorAttribute.d__5))] public .<<.>> GenerateAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } protected abstract .<<.>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); public .<<.>> GetDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } diff --git a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet9_0.verified.txt b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet9_0.verified.txt index 993b818cff..0c1d2db153 100644 --- a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet9_0.verified.txt +++ b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet9_0.verified.txt @@ -140,7 +140,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override sealed .<<.>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } [(.Class | .Method, AllowMultiple=true)] @@ -148,7 +147,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.<>>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override sealed .<<.<>>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } [(.Class | .Method, AllowMultiple=true)] @@ -156,7 +154,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.<>>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override sealed .<<.<>>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } [(.Class | .Method, AllowMultiple=true)] @@ -164,7 +161,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.<>>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override .<<.<>>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } [(.Class | .Method, AllowMultiple=true)] @@ -172,7 +168,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.<>>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override .<<.<>>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } public class AsyncEvent @@ -195,7 +190,6 @@ namespace { protected AsyncUntypedDataSourceGeneratorAttribute() { } public virtual bool SkipIfEmpty { get; set; } - [.(typeof(.AsyncUntypedDataSourceGeneratorAttribute.d__5))] public .<<.>> GenerateAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } protected abstract .<<.>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); public .<<.>> GetDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } diff --git a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.Net4_7.verified.txt b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.Net4_7.verified.txt index 2d5ec6f128..56031f16d2 100644 --- a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.Net4_7.verified.txt +++ b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.Net4_7.verified.txt @@ -137,7 +137,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override sealed .<<.>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } [(.Class | .Method, AllowMultiple=true)] @@ -145,7 +144,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.<>>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override sealed .<<.<>>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } [(.Class | .Method, AllowMultiple=true)] @@ -153,7 +151,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.<>>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override sealed .<<.<>>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } [(.Class | .Method, AllowMultiple=true)] @@ -161,7 +158,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.<>>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override .<<.<>>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } [(.Class | .Method, AllowMultiple=true)] @@ -169,7 +165,6 @@ namespace { protected AsyncDataSourceGeneratorAttribute() { } protected abstract .<<.<>>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); - [.(typeof(.AsyncDataSourceGeneratorAttribute.d__1))] public override .<<.<>>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } } public class AsyncEvent @@ -192,7 +187,6 @@ namespace { protected AsyncUntypedDataSourceGeneratorAttribute() { } public virtual bool SkipIfEmpty { get; set; } - [.(typeof(.AsyncUntypedDataSourceGeneratorAttribute.d__5))] public .<<.>> GenerateAsync(.DataGeneratorMetadata dataGeneratorMetadata) { } protected abstract .<<.>> GenerateDataSourcesAsync(.DataGeneratorMetadata dataGeneratorMetadata); public .<<.>> GetDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { }